Merge remote-tracking branch 'freeradius/v3.0.x' into tr-upgrade

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

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index 9b1203b..35a4526 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -179,8 +179,7 @@ ATTRIBUTE   Home-Server-Pool                        1111    string
 
 ATTRIBUTE      FreeRADIUS-Client-IP-Address            1120    ipaddr
 ATTRIBUTE      FreeRADIUS-Client-IPv6-Address          1121    ipv6addr
-ATTRIBUTE      FreeRADIUS-Client-IP-Prefix             1150    ipv4prefix
-ATTRIBUTE      FreeRADIUS-Client-IPv6-Prefix           1151    ipv6prefix
+# The rest of the FreeRADIUS-Client-* attributes are at 1150...
 
 ATTRIBUTE      FreeRADIUS-Client-Require-MA            1122    integer
 
@@ -225,10 +224,11 @@ ATTRIBUTE MS-CHAP-New-NT-Password                 1137    octets
 
 ATTRIBUTE      Stripped-User-Domain                    1138    string
 ATTRIBUTE      Called-Station-SSID                     1139    string
-ATTRIBUTE      Cache-TTL                               1140    integer
+ATTRIBUTE      Cache-TTL                               1140    signed
 ATTRIBUTE      Cache-Status-Only                       1141    integer
 ATTRIBUTE      Cache-Merge                             1142    integer
 ATTRIBUTE      Cache-Entry-Hits                        1143    integer
+ATTRIBUTE      Cache-Read-Only                         1144    integer
 
 VALUE  Cache-Status-Only               no                      0
 VALUE  Cache-Status-Only               yes                     1
@@ -236,17 +236,36 @@ VALUE     Cache-Status-Only               yes                     1
 VALUE  Cache-Merge                     no                      0
 VALUE  Cache-Merge                     yes                     1
 
-#      More dynamic client attributes
-
-ATTRIBUTE      FreeRADIUS-Client-Src-IP-Address        1143    ipaddr
-ATTRIBUTE      FreeRADIUS-Client-Src-IPv6-Address      1144    ipv6addr
+VALUE  Cache-Read-Only                 no                      0
+VALUE  Cache-Read-Only                 yes                     1
 
 ATTRIBUTE      OTP-Challenge                           1145    string
 ATTRIBUTE      EAP-Session-Id                          1146    octets
+ATTRIBUTE      Chbind-Response-Code                    1147    integer
+
+ATTRIBUTE      Chbind-Response-Code                    1147    integer
+
+VALUE  Chbind-Response-Code            success                 2
+VALUE  Chbind-Response-Code            failure                 3
+
+#      For EAP channel binding
+
+ATTRIBUTE      Chbind-Response-Code                    1147    integer
+
+VALUE  Chbind-Response-Code            success                 2
+VALUE  Chbind-Response-Code            failure                 3
 
 ATTRIBUTE      Acct-Input-Octets64                     1148    integer64
 ATTRIBUTE      Acct-Output-Octets64                    1149    integer64
 
+ATTRIBUTE      FreeRADIUS-Client-IP-Prefix             1150    ipv4prefix
+ATTRIBUTE      FreeRADIUS-Client-IPv6-Prefix           1151    ipv6prefix
+ATTRIBUTE      FreeRADIUS-Response-Delay               1152    integer
+ATTRIBUTE      FreeRADIUS-Client-Src-IP-Address        1153    ipaddr
+ATTRIBUTE      FreeRADIUS-Client-Src-IPv6-Address      1154    ipv6addr
+
+ATTRIBUTE      REST-HTTP-Header                        1160    string
+
 #
 #      Range:  1200-1279
 #              EAP-SIM (and other EAP type) weirdness.
@@ -292,6 +311,7 @@ ATTRIBUTE   EAP-Sim-Algo-Version                    1216    integer
 #
 #  egrep VALUE dictionary.freeradius.internal  | grep EAP-Type | awk '{print "ATTRIBUTE EAP-Type-" $3 " " 1280+$4 " octets"}' > foo;./format.pl foo
 #
+ATTRIBUTE      EAP-Type-Base                           1280    octets
 ATTRIBUTE      EAP-Type-VALUE                          1280    octets
 ATTRIBUTE      EAP-Type-None                           1280    octets
 ATTRIBUTE      EAP-Type-Identity                       1281    octets
@@ -356,6 +376,7 @@ ATTRIBUTE   EAP-Type-MS-CHAP-V2                     1306    octets
 #
 
 # these are PW_EAP_SIM_X + 1536
+ATTRIBUTE      EAP_Sim-Base                            1536    octets
 ATTRIBUTE      EAP-Sim-RAND                            1537    octets
 ATTRIBUTE      EAP-Sim-PADDING                         1542    octets
 ATTRIBUTE      EAP-Sim-NONCE_MT                        1543    octets
@@ -486,7 +507,9 @@ ATTRIBUTE   TLS-Cert-Issuer                         1912    string
 ATTRIBUTE      TLS-Cert-Subject                        1913    string
 ATTRIBUTE      TLS-Cert-Common-Name                    1914    string
 ATTRIBUTE      TLS-Cert-Subject-Alt-Name-Email         1915    string
-# 1916 - 1919: reserved for future cert attributes
+ATTRIBUTE      TLS-Cert-Subject-Alt-Name-Dns           1916    string
+ATTRIBUTE      TLS-Cert-Subject-Alt-Name-Upn           1917    string
+# 1918 - 1919: reserved for future cert attributes
 ATTRIBUTE      TLS-Client-Cert-Serial                  1920    string
 ATTRIBUTE      TLS-Client-Cert-Expiration              1921    string
 ATTRIBUTE      TLS-Client-Cert-Issuer                  1922    string
@@ -498,8 +521,11 @@ ATTRIBUTE  TLS-Client-Cert-X509v3-Extended-Key-Usage 1927  string
 ATTRIBUTE      TLS-Client-Cert-X509v3-Subject-Key-Identifier 1928      string
 ATTRIBUTE      TLS-Client-Cert-X509v3-Authority-Key-Identifier 1929    string
 ATTRIBUTE      TLS-Client-Cert-X509v3-Basic-Constraints 1930   string
+ATTRIBUTE      TLS-Client-Cert-Subject-Alt-Name-Dns    1931    string
+ATTRIBUTE      TLS-Client-Cert-Subject-Alt-Name-Upn    1932    string
+ATTRIBUTE      TLS-PSK-Identity                        1933    string
 
-# 1931 - 1939: reserved for future cert attributes
+# 1934 - 1939: reserved for future cert attributes
 
 #
 #      Range:  1940-2099
@@ -539,7 +565,13 @@ ATTRIBUTE  SoH-MS-Windows-Health-Status            2120    string
 ATTRIBUTE      SoH-MS-Health-Other                     2129    string
 
 #
-#      Range:  2200-2999
+#      Range:  2200-2219
+#              Utilities bundled with the server
+#
+ATTRIBUTE      Radclient-Test-Name                     2200    string
+
+#
+#      Range:  2220-2999
 #              Free
 #
 #      Range:  3000-3999