clean up dictionary to remove unused attributes

diff --git a/doc/schemas/ldap/openldap/freeradius.schema b/doc/schemas/ldap/openldap/freeradius.schema
index f66192ad0b4affc062f4ba3c171b6edd065619d1..cb86cf54605fec5c81117384afa8bea9b9fda426 100644 (file)
--- a/doc/schemas/ldap/openldap/freeradius.schema
+++ b/doc/schemas/ldap/openldap/freeradius.schema
@@ -295,14 +295,7 @@ attributetype ( 1.3.6.1.4.1.11344.4.1.2.1.50
        SINGLE-VALUE
  )
 
-attributetype ( 1.3.6.1.4.1.11344.4.1.2.1.51
-       NAME 'radiusReplicateToRealm'
-       DESC 'control.Replicate-To-Realm'
-       EQUALITY caseIgnoreMatch
-       SUBSTR caseIgnoreSubstringsMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-       SINGLE-VALUE
- )
+# 51 was Replicate-To-Realm, now deleted
 
 attributetype ( 1.3.6.1.4.1.11344.4.1.2.1.52
        NAME 'radiusRealm'

diff --git a/raddb/mods-config/files/authorize b/raddb/mods-config/files/authorize
index 8a22c7fc3cfb152ab9ab0e559bf7ae1533ea0c5b..94279f98304779c76c1de94b018c63de44d3c4d8 100644 (file)
--- a/raddb/mods-config/files/authorize
+++ b/raddb/mods-config/files/authorize
@@ -149,27 +149,11 @@
 
 #
 # Default for PPP: dynamic IP address, PPP mode, VJ-compression.
-# NOTE: we do not use Hint = "PPP", since PPP might also be auto-detected
-#      by the terminal server in which case there may not be a "P" suffix.
-#      The terminal server sends "Framed-Protocol = PPP" for auto PPP.
 #
 DEFAULT        Framed-Protocol == PPP
        Framed-Protocol = PPP,
        Framed-Compression = Van-Jacobson-TCP-IP
 
-#
-# Default for CSLIP: dynamic IP address, SLIP mode, VJ-compression.
-#
-DEFAULT        Hint == "CSLIP"
-       Framed-Protocol = SLIP,
-       Framed-Compression = Van-Jacobson-TCP-IP
-
-#
-# Default for SLIP: dynamic IP address, SLIP mode.
-#
-DEFAULT        Hint == "SLIP"
-       Framed-Protocol = SLIP
-
 #
 # Last default: rlogin to our main server.
 #

diff --git a/share/dictionary/freeradius/dictionary.freeradius.internal b/share/dictionary/freeradius/dictionary.freeradius.internal
index 0a84f3b565c0f33db5a65e22b5584952a9b33477..56f95c1557961276fc57726a734209930f147427 100644 (file)
--- a/share/dictionary/freeradius/dictionary.freeradius.internal
+++ b/share/dictionary/freeradius/dictionary.freeradius.internal
@@ -21,7 +21,7 @@ FLAGS internal
 #      These attributes CAN go in the reply item list.
 ATTRIBUTE      Fall-Through                            500     bool
 ATTRIBUTE      Relax-Filter                            501     bool
-ATTRIBUTE      Next-Shortest-Prefix            502     bool
+ATTRIBUTE      Next-Shortest-Prefix                    502     bool
 #
 # Exec-Program and Exec-Program-Wait are no longer supported in v4.
 #
@@ -58,13 +58,6 @@ ATTRIBUTE    Session-State                           5       group
 #
 ATTRIBUTE      Protocol                                11      integer
 ATTRIBUTE      Auth-Type                               12      integer
-#ATTRIBUTE     Autz-Type                               13      integer
-#ATTRIBUTE     Acct-Type                               14      integer
-#ATTRIBUTE     Session-Type                            15      integer
-#ATTRIBUTE     Post-Auth-Type                          16      integer
-#ATTRIBUTE     Pre-Proxy-Type                          17      integer
-#ATTRIBUTE     Post-Proxy-Type                         18      integer
-#ATTRIBUTE     Pre-Acct-Type                           19      integer
 
 #
 #      Range:  20 - 49
@@ -72,7 +65,7 @@ ATTRIBUTE     Auth-Type                               12      integer
 #
 ATTRIBUTE      Load-Balance-Key                        20      string
 ATTRIBUTE      Proxy-To-Realm                          21      string
-ATTRIBUTE      Replicate-To-Realm                      22      string
+# 22 - was Replicate-To-Realm
 ATTRIBUTE      Virtual-Server                          23      string virtual
 ATTRIBUTE      Module-Return-Code                      24      integer virtual
 
@@ -139,16 +132,6 @@ ATTRIBUTE  Packet-Original-Timestamp               56      date
 ATTRIBUTE      Huntgroup-Name                          101     string
 ATTRIBUTE      Simultaneous-Use                        102     integer
 ATTRIBUTE      Strip-User-Name                         103     integer
-ATTRIBUTE      Hint                                    104     string
-ATTRIBUTE      Send-Disconnect-Request                 105     integer
-
-VALUE  Send-Disconnect-Request         No                      0
-VALUE  Send-Disconnect-Request         Yes                     1
-
-ATTRIBUTE      Send-CoA-Request                        106     integer
-
-VALUE  Send-CoA-Request                No                      0
-VALUE  Send-CoA-Request                Yes                     1
 
 #      Range:  1000-2000
 #              Policy attributes
@@ -193,7 +176,7 @@ ATTRIBUTE   NTLM-User-Name                          1042    string
 ATTRIBUTE      MS-CHAP-User-Name                       1043    string
 
 ATTRIBUTE      Time-Of-Day                             1089    string
-ATTRIBUTE      Inner-Tunnel-User-Name                  1102    string
+
 ATTRIBUTE      SQL-Table-Name                          1110    string
 ATTRIBUTE      Home-Server-Pool                        1111    string
 ATTRIBUTE      Result-Status                           1112    string
@@ -301,77 +284,10 @@ ATTRIBUTE Inner-Realm-Name                        1252    string
 ATTRIBUTE      Request-Lifetime                        1253    integer
 
 #
-#      Range:  1254 - 1279
+#      Range:  1254 - 1699
 #              Unused
 #
 
-#
-#      Range:  1280 - 1535
-#              EAP-type specific attributes
-#
-#  egrep VALUE dictionary.freeradius.internal | grep EAP-Type | awk '{print "ATTRIBUTE EAP-Type-" $3 " " 1280+$4 " octets"}' > foo;./format.pl foo freeradius.dictionary.internal
-#
-ATTRIBUTE      EAP-Type-Base                           1280    octets
-ATTRIBUTE      EAP-Type-VALUE                          1280    octets
-ATTRIBUTE      EAP-Type-None                           1280    octets
-ATTRIBUTE      EAP-Type-Identity                       1281    octets
-ATTRIBUTE      EAP-Type-Notification                   1282    octets
-ATTRIBUTE      EAP-Type-NAK                            1283    octets
-ATTRIBUTE      EAP-Type-MD5-Challenge                  1284    octets
-ATTRIBUTE      EAP-Type-One-Time-Password              1285    octets
-ATTRIBUTE      EAP-Type-Generic-Token-Card             1286    octets
-ATTRIBUTE      EAP-Type-RSA-Public-Key                 1289    octets
-ATTRIBUTE      EAP-Type-DSS-Unilateral                 1290    octets
-ATTRIBUTE      EAP-Type-KEA                            1291    octets
-ATTRIBUTE      EAP-Type-KEA-Validate                   1292    octets
-ATTRIBUTE      EAP-Type-EAP-TLS                        1293    octets
-ATTRIBUTE      EAP-Type-Defender-Token                 1294    octets
-ATTRIBUTE      EAP-Type-RSA-SecurID-EAP                1295    octets
-ATTRIBUTE      EAP-Type-Arcot-Systems-EAP              1296    octets
-ATTRIBUTE      EAP-Type-Cisco-LEAP                     1297    octets
-ATTRIBUTE      EAP-Type-Nokia-IP-Smart-Card            1298    octets
-ATTRIBUTE      EAP-Type-SIM                            1298    octets
-ATTRIBUTE      EAP-Type-SRP-SHA1                       1299    octets
-ATTRIBUTE      EAP-Type-EAP-TTLS                       1301    octets
-ATTRIBUTE      EAP-Type-Remote-Access-Service          1302    octets
-ATTRIBUTE      EAP-Type-AKA                            1303    octets
-ATTRIBUTE      EAP-Type-EAP-3Com-Wireless              1304    octets
-ATTRIBUTE      EAP-Type-PEAP                           1305    octets
-ATTRIBUTE      EAP-Type-MS-EAP-Authentication          1306    octets
-ATTRIBUTE      EAP-Type-MAKE                           1307    octets
-ATTRIBUTE      EAP-Type-CRYPTOCard                     1308    octets
-ATTRIBUTE      EAP-Type-EAP-MSCHAP-V2                  1309    octets
-ATTRIBUTE      EAP-Type-DynamID                        1310    octets
-ATTRIBUTE      EAP-Type-Rob-EAP                        1311    octets
-ATTRIBUTE      EAP-Type-SecurID-EAP                    1312    octets
-ATTRIBUTE      EAP-Type-MS-Authentication-TLV          1313    octets
-ATTRIBUTE      EAP-Type-SentriNET                      1314    octets
-ATTRIBUTE      EAP-Type-EAP-Actiontec-Wireless         1315    octets
-ATTRIBUTE      EAP-Type-Cogent-Biomentric-EAP          1316    octets
-ATTRIBUTE      EAP-Type-AirFortress-EAP                1317    octets
-ATTRIBUTE      EAP-Type-EAP-HTTP-Digest                1318    octets
-ATTRIBUTE      EAP-Type-SecuriSuite-EAP                1319    octets
-ATTRIBUTE      EAP-Type-DeviceConnect-EAP              1320    octets
-ATTRIBUTE      EAP-Type-EAP-SPEKE                      1321    octets
-ATTRIBUTE      EAP-Type-EAP-MOBAC                      1322    octets
-ATTRIBUTE      EAP-Type-EAP-FAST                       1323    octets
-ATTRIBUTE      EAP-Type-Zonelabs                       1324    octets
-ATTRIBUTE      EAP-Type-EAP-Link                       1325    octets
-ATTRIBUTE      EAP-Type-EAP-PAX                        1326    octets
-ATTRIBUTE      EAP-Type-EAP-PSK                        1327    octets
-ATTRIBUTE      EAP-Type-EAP-SAKE                       1328    octets
-ATTRIBUTE      EAP-Type-EAP-IKEv2                      1329    octets
-ATTRIBUTE      EAP-Type-EAP-AKA-Prime                  1330    octets
-ATTRIBUTE      EAP-Type-EAP-GPSK                       1331    octets
-ATTRIBUTE      EAP-Type-EAP-PWD                        1332    octets
-ATTRIBUTE      EAP-Type-EAP-EVEv1                      1333    octets
-ATTRIBUTE      EAP-Type-PT                             1334    octets
-ATTRIBUTE      EAP-Type-TEAP                           1335    octets
-
-ATTRIBUTE      EAP-Type-Microsoft-MS-CHAPv2            1306    octets
-ATTRIBUTE      EAP-Type-Cisco-MS-CHAPv2                1309    octets
-ATTRIBUTE      EAP-Type-MS-CHAP-V2                     1306    octets
-
 #
 #      Range: 1700-1899
 #              Temporary attributes, for local storage.