Removed/updated attributes with duplicate names

diff --git a/share/dictionary b/share/dictionary
index 8996973..b60fa4b 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -287,7 +287,7 @@ ATTRIBUTE   EAP-Type-GTC            1286    string
 ATTRIBUTE      EAP-Type-TLS            1297    octets
 ATTRIBUTE       EAP-Type-SIM            1298   octets
 ATTRIBUTE      EAP-Type-LEAP           1301    octets
-ATTRIBUTE      EAP-Type-SIM            1302    octets
+ATTRIBUTE      EAP-Type-SIM2           1302    octets
 ATTRIBUTE      EAP-Type-TTLS           1305    octets
 ATTRIBUTE      EAP-Type-PEAP           1309    octets
 

diff --git a/share/dictionary.3gpp2 b/share/dictionary.3gpp2
index e26b49a..890847e 100644 (file)
--- a/share/dictionary.3gpp2
+++ b/share/dictionary.3gpp2
@@ -88,9 +88,11 @@ ATTRIBUTE    3GPP2-Service-Option-Profile    74      octets
 
 # the following don't contain subtypes
 ATTRIBUTE      3GPP2-DNS-Update-Required       75      integer
-ATTRIBUTE      3GPP2-Always-On                 76      integer
+
+# Is this 76 or 78?  Check...
+#ATTRIBUTE     3GPP2-Always-On                 76      integer
 # 77 ?
-ATTRIBUTE      3GPP2-Always-On                 78      integer
+#ATTRIBUTE     3GPP2-Always-On                 78      integer
 ATTRIBUTE      3GPP2-Foreign-Agent-Address     79      ipaddr
 ATTRIBUTE      3GPP2-Last-User-Activity-Time   80      integer
 ATTRIBUTE      3GPP2-MN-AAA-Removal-Indication 81      integer

diff --git a/share/dictionary.alcatel b/share/dictionary.alcatel
index 786a0cc..c1b166d 100644 (file)
--- a/share/dictionary.alcatel
+++ b/share/dictionary.alcatel
@@ -14,7 +14,7 @@ VENDOR          Alcatel         3041
 ATTRIBUTE       AAT-Client-Primary-DNS          5       ipaddr          Alcatel
 ATTRIBUTE       AAT-Client-Primary-WINS-NBNS    6       ipaddr          Alcatel
 ATTRIBUTE       AAT-Client-Secondary-WINS-NBNS  7       ipaddr          Alcatel
-ATTRIBUTE       AAT-Client-Primary-DNS          8       ipaddr          Alcatel
+#ATTRIBUTE       AAT-Client-Primary-DNS          8       ipaddr          Alcatel
 ATTRIBUTE       AAT-PPP-Address                 9       ipaddr          Alcatel
 ATTRIBUTE       AAT-ATM-Direct                  21      string          Alcatel
 ATTRIBUTE       AAT-IP-TOS                      22      integer         Alcatel

diff --git a/share/dictionary.compat b/share/dictionary.compat
index 4ec6035..e644ec6 100644 (file)
--- a/share/dictionary.compat
+++ b/share/dictionary.compat
@@ -27,8 +27,6 @@ VALUE         Service-Type            Dialback-Framed-User    4
 #
 #      For compatibility with MERIT users files.
 #
-ATTRIBUTE      NAS-Port                5       integer
-ATTRIBUTE      Login-Host              14      ipaddr
 ATTRIBUTE      Login-Callback-Number   19      string
 ATTRIBUTE      Framed-Callback-Id      20      string
 ATTRIBUTE      Client-Port-DNIS        30      string

diff --git a/share/dictionary.freeradius b/share/dictionary.freeradius
index 330c6ff..2b347b5 100644 (file)
--- a/share/dictionary.freeradius
+++ b/share/dictionary.freeradius
@@ -12,6 +12,6 @@ VENDOR                FreeRADIUS      11344
 
 BEGIN-VENDOR FreeRADIUS
 
-ATTRIBUTE      Freeradius-Proxied-To           1       ipaddr
+ATTRIBUTE      FreeRADIUS-Proxied-To           1       ipaddr
 
 END-VENDOR FreeRADIUS

diff --git a/share/dictionary.redback b/share/dictionary.redback
index 6b299d7..a9aacab 100644 (file)
--- a/share/dictionary.redback
+++ b/share/dictionary.redback
@@ -205,7 +205,7 @@ VALUE       LAC-Real-Port-Type      NAS-PORT-TYPE-PPPOE             60
 ATTRIBUTE      Client_DNS_Pri                  1       ipaddr          Redback
 ATTRIBUTE      Client_DNS_Sec                  2       ipaddr          Redback
 ATTRIBUTE      DHCP_Max_Leases                 3       integer         Redback
-ATTRIBUTE      Context-Name                    4       string          Redback
+ATTRIBUTE      Context_Name                    4       string          Redback
 ATTRIBUTE      Bridge_Group                    5       string          Redback
 ATTRIBUTE      BG_Aging_Time                   6       string          Redback
 ATTRIBUTE      BG_Path_Cost                    7       string          Redback