Use the correct numbers in the dictionary files.

The attributes in the file are ordered for a reason, so that
typos like this can't happen.  Having random arrangements of
numbers makes it impossible to track what's going where

diff --git a/share/dictionary.freeradius.internal b/share/dictionary.freeradius.internal
index cdaf51c..ed529c6 100644 (file)
--- a/share/dictionary.freeradius.internal
+++ b/share/dictionary.freeradius.internal
@@ -179,10 +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
-ATTRIBUTE      FreeRADIUS-Client-Src-IP-Address        1152    ipaddr
-ATTRIBUTE      FreeRADIUS-Client-Src-IPv6-Address      1153    ipv6addr
+# The rest of the FreeRADIUS-Client-* attributes are at 1150...
 
 ATTRIBUTE      FreeRADIUS-Client-Require-MA            1122    integer
 
@@ -248,9 +245,11 @@ ATTRIBUTE  EAP-Session-Id                          1146    octets
 ATTRIBUTE      Acct-Input-Octets64                     1148    integer64
 ATTRIBUTE      Acct-Output-Octets64                    1149    integer64
 
-# 1150 and 1151 are defined above, as FreeRADIUS-Client-...
-
+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
 
 #
 #      Range:  1200-1279

diff --git a/src/include/radius.h b/src/include/radius.h
index 4116d40..184b02d 100644 (file)
--- a/src/include/radius.h
+++ b/src/include/radius.h
@@ -247,8 +247,6 @@ typedef enum {
 #define PW_HOME_SERVER_POOL            1111
 #define PW_FREERADIUS_CLIENT_IP_ADDRESS                1120
 #define PW_FREERADIUS_CLIENT_IPV6_ADDRESS      1121
-#define PW_FREERADIUS_CLIENT_IP_PREFIX         1150
-#define PW_FREERADIUS_CLIENT_IPV6_PREFIX       1151
 #define PW_RECV_COA_TYPE               1131
 #define PW_SEND_COA_TYPE               1132
 #define PW_MSCHAP_PASSWORD             1133
@@ -258,6 +256,8 @@ typedef enum {
 #define PW_OTP_CHALLENGE               1145
 #define PW_EAP_SESSION_ID              1146
 
+#define PW_FREERADIUS_CLIENT_IP_PREFIX         1150
+#define PW_FREERADIUS_CLIENT_IPV6_PREFIX       1151
 #define PW_FREERADIUS_RESPONSE_DELAY   1152
 #define PW_FREERADIUS_CLIENT_SRC_IP_ADDRESS    1153
 #define PW_FREERADIUS_CLIENT_SRC_IPV6_ADDRESS  1154