Pulled fix from branch_1_1

[freeradius.git] / share / dictionary.freeradius.internal

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index f6b9aaa..7acc63c 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -56,11 +56,14 @@ ATTRIBUTE   EAP-Type                                1018    integer
 ATTRIBUTE      EAP-TLS-Require-Client-Cert             1019    integer
 ATTRIBUTE      EAP-Id                                  1020    integer
 ATTRIBUTE      EAP-Code                                1021    integer
-ATTRIBUTE      EAP-MD5-Password                        1022    string
+# Attribute 1022 unused, was EAP-MD5-Password, which was
+# used only be radeapclient.  It's been replaced by Cleartext-Password
 ATTRIBUTE      PEAP-Version                            1023    integer
+ATTRIBUTE      Client-Shortname                        1024    string
+ATTRIBUTE      Load-Balance-Key                        1025    string
 
 #
-#      Range:  1023-1028
+#      Range:  1025-1028
 #              unused
 #
 ATTRIBUTE      User-Category                           1029    string
@@ -121,11 +124,13 @@ ATTRIBUTE Cache-No-Caching                        1091    string
 ATTRIBUTE      Cache-Delete-Cache                      1092    string
 ATTRIBUTE      SHA-Password                            1093    octets
 ATTRIBUTE      SSHA-Password                           1094    octets
+ATTRIBUTE      SHA1-Password                           1093    octets
+ATTRIBUTE      SSHA1-Password                          1094    octets
 ATTRIBUTE      MD5-Password                            1095    octets
 ATTRIBUTE      SMD5-Password                           1096    octets
 ATTRIBUTE      Packet-Src-IPv6-Address                 1097    ipv6addr
 ATTRIBUTE      Packet-Dst-IPv6-Address                 1098    ipv6addr
-ATTRIBUTE      Server-Identity                         1099    string
+ATTRIBUTE      Virtual-Server                          1099    string
 ATTRIBUTE      Cleartext-Password                      1100    string
 ATTRIBUTE      Password-With-Header                    1101    string
 
@@ -283,6 +288,7 @@ VALUE       Auth-Type                       CHAP                    1025
 # ldap module.
 VALUE  Auth-Type                       PAM                     1027
 VALUE  Auth-Type                       MS-CHAP                 1028
+VALUE  Auth-Type                       MSCHAP                  1028
 VALUE  Auth-Type                       Kerberos                1029
 VALUE  Auth-Type                       CRAM                    1030
 VALUE  Auth-Type                       NS-MTA-MD5              1031
@@ -350,18 +356,16 @@ VALUE     Packet-Type                     Terminate-Session       31
 VALUE  Packet-Type                     Password-Expired        32
 VALUE  Packet-Type                     Event-Request           33
 VALUE  Packet-Type                     Event-Response          34
+
+#      RFC 3576 allocates packet types 40-45
+
 VALUE  Packet-Type                     Disconnect-Request      40
 VALUE  Packet-Type                     Disconnect-ACK          41
 VALUE  Packet-Type                     Disconnect-NAK          42
-
-# Old names, if no one uses them, they should be deleted.
-VALUE  Packet-Type                     CoF-Request             43
-VALUE  Packet-Type                     CoF-ACK                 44
-VALUE  Packet-Type                     CoF-NAK                 45
-
 VALUE  Packet-Type                     CoA-Request             43
 VALUE  Packet-Type                     CoA-ACK                 44
 VALUE  Packet-Type                     CoA-NAK                 45
+
 VALUE  Packet-Type                     IP-Address-Allocate     50
 VALUE  Packet-Type                     IP-Address-Release      51
 
@@ -380,6 +384,11 @@ VALUE      Response-Packet-Type            Status-Server           12
 VALUE  Response-Packet-Type            Status-Client           13
 
 #
+#  Special value
+#
+VALUE  Response-Packet-Type            Do-Not-Respond          256
+
+#
 #      EAP Sub-types, inside of Request and Response packets
 #
 #      http://www.iana.org/assignments/ppp-numbers