Removed duplicate VALUE names

diff --git a/share/dictionary b/share/dictionary
index 6813c01..8407497 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -179,6 +179,7 @@ ATTRIBUTE   ARAP-Challenge-Response 84      string  # 10 octets
 ATTRIBUTE      Acct-Interim-Interval   85      integer
 ATTRIBUTE      NAS-Port-Id             87      string
 ATTRIBUTE      Framed-Pool             88      string
+ATTRIBUTE      Originating-Line-Info   94      string
 ATTRIBUTE      NAS-IPv6-Address        95      ipv6addr
 ATTRIBUTE      Framed-Interface-Id     96      ifid
 ATTRIBUTE      Framed-IPv6-Prefix      97      octets # ipv6prefix
@@ -627,6 +628,9 @@ VALUE               Post-Auth-Type          Local                   0
 VALUE          Fall-Through            No                      0
 VALUE          Fall-Through            Yes                     1
 
+#VALUE         Strip-User-Name         No                      0
+#VALUE         Strip-User-Name         Yes                     1
+
 VALUE          Packet-Type     Access-Request                  1
 VALUE          Packet-Type     Access-Accept                   2
 VALUE          Packet-Type     Access-Reject                   3
@@ -642,16 +646,6 @@ VALUE              Packet-Type     Status-Server                   12
 VALUE          Packet-Type     Status-Client                   13
 
 #
-#  Defined in RFC 2882
-#
-VALUE          Packet-Type     Disconnect-Request              40
-VALUE          Packet-Type     Disconnect-ACK                  41
-VALUE          Packet-Type     Disconnect-NAK                  42
-VALUE          Packet-Type     CoA-Request                     43
-VALUE          Packet-Type     CoA-ACK                         44
-VALUE          Packet-Type     CoA-NAK                         45
-
-#
 #      The following packet types are described in RFC 2882,
 #      but they are NOT part of the RADIUS standard.  Instead,
 #      they are informational about vendor-specific extensions
@@ -713,7 +707,6 @@ VALUE               EAP-Type        RSA-Public-Key          9
 VALUE          EAP-Type        DSS-Unilateral          10
 VALUE          EAP-Type        KEA                     11
 VALUE          EAP-Type        KEA-Validate            12
-VALUE          EAP-Type        KEA                     11
 VALUE          EAP-Type        EAP-TLS                 13
 VALUE          EAP-Type        Defender-Token          14
 VALUE          EAP-Type        RSA-SecurID-EAP         15

diff --git a/share/dictionary.ascend b/share/dictionary.ascend
index 36b4406..088f3f2 100644 (file)
--- a/share/dictionary.ascend
+++ b/share/dictionary.ascend
@@ -582,10 +582,12 @@ VALUE             Ascend-Bridge           Bridge-Yes              1
 VALUE                  Ascend-TS-Idle-Mode     TS-Idle-None            0
 VALUE          Ascend-TS-Idle-Mode     TS-Idle-Input           1
 VALUE                  Ascend-TS-Idle-Mode     TS-Idle-Input-Output    2
+
 VALUE          Ascend-Send-Auth        Send-Auth-None          0
 VALUE          Ascend-Send-Auth        Send-Auth-PAP           1
 VALUE          Ascend-Send-Auth        Send-Auth-CHAP          2
 VALUE          Ascend-Send-Auth        Send-Auth-MS-CHAP       3
+
 VALUE          Ascend-Link-Compression Link-Comp-None          0
 VALUE          Ascend-Link-Compression Link-Comp-Stac          1
 VALUE          Ascend-Link-Compression Link-Comp-Stac-Draft-9  2
@@ -702,10 +704,13 @@ VALUE             Ascend-Event-Type       Ascend-ColdStart        1
 VALUE          Ascend-Event-Type       Ascend-Session-Event    2
 VALUE          Ascend-BACP-Enable      BACP-No                 0
 VALUE          Ascend-BACP-Enable      BACP-Yes                1
+
 VALUE          Ascend-Dialout-Allowed  Dialout-Not-Allowed     0
 VALUE          Ascend-Dialout-Allowed  Dialout-Allowed         1
+
 VALUE          Ascend-Shared-Profile-Enable    Shared-Profile-No       0
 VALUE          Ascend-Shared-Profile-Enable    Shared-Profile-Yes      1
+
 VALUE          Ascend-Temporary-Rtes   Temp-Rtes-No            0
 VALUE          Ascend-Temporary-Rtes   Temp-Rtes-Yes           1
 
@@ -977,26 +982,15 @@ VALUE     Ascend-Numbering-Plan-ID                Private-Numbering-Plan  9
 VALUE  Ascend-Numbering-Plan-ID                Unknown-Numbering-Plan  0
 VALUE  Ascend-PPPoE-Enable             PPPoE-No        0
 VALUE  Ascend-PPPoE-Enable             PPPoE-Yes       1
-VALUE  Ascend-PW-Lifetime              Lifetime-In-Days        0
-VALUE  Ascend-PW-Warntime              Days-Of-Warning 0
 VALUE  Ascend-Port-Redir-Protocol              Ascend-Proto-TCP        6
 VALUE  Ascend-Port-Redir-Protocol              Ascend-Proto-UDP        17
 VALUE  Ascend-Private-Route-Required           Required-No     0
 VALUE  Ascend-Private-Route-Required           Required-Yes    1
-VALUE  Ascend-Require-Auth             Not-Require-Auth        0
-VALUE  Ascend-Require-Auth             Require-Auth    1
 VALUE  Ascend-Route-Appletalk          Route-Appletalk-No      0
 VALUE  Ascend-Route-Appletalk          Route-Appletalk-Yes     1
-VALUE  Ascend-Route-IP         Route-IP-No     0
-VALUE  Ascend-Route-IP         Route-IP-Yes    1
-VALUE  Ascend-Route-IPX                Route-IPX-No    0
-VALUE  Ascend-Route-IPX                Route-IPX-Yes   1
 VALUE  Ascend-SVC-Enabled              Ascend-SVC-Enabled-No   0
 VALUE  Ascend-SVC-Enabled              Ascend-SVC-Enabled-Yes  1
-VALUE  Ascend-Send-Auth                Send-Auth-CHAP  2
-VALUE  Ascend-Send-Auth                Send-Auth-MS-CHAP       3
-VALUE  Ascend-Send-Auth                Send-Auth-None  0
-VALUE  Ascend-Send-Auth                Send-Auth-PAP   1
+
 VALUE  Ascend-Service-Type             Ascend-Service-Type-ATM 20
 VALUE  Ascend-Service-Type             Ascend-Service-Type-Combinet    7
 VALUE  Ascend-Service-Type             Ascend-Service-Type-EuRaw       9
@@ -1031,22 +1025,10 @@ VALUE   Ascend-Session-Type             Ascend-Session-G729     5
 VALUE  Ascend-Session-Type             Ascend-Session-RT24     8
 VALUE  Ascend-Session-Type             Ascend-Session-Unknown  1
 VALUE  Ascend-Session-Type             Ascend-Session-Unused   0
-VALUE  Ascend-Shared-Profile-Enable            Shared-Profile-No       0
-VALUE  Ascend-Shared-Profile-Enable            Shared-Profile-Yes      1
-VALUE  Ascend-Source-IP-Check          Source-IP-Check-No      0
-VALUE  Ascend-Source-IP-Check          Source-IP-Check-Yes     1
-VALUE  Ascend-TS-Idle-Mode             TS-Idle-Input   1
-VALUE  Ascend-TS-Idle-Mode             TS-Idle-Input-Output    2
-VALUE  Ascend-TS-Idle-Mode             TS-Idle-None    0
-VALUE  Ascend-Token-Immediate          Tok-Imm-No      0
-VALUE  Ascend-Token-Immediate          Tok-Imm-Yes     1
+
 VALUE  Ascend-Tunneling-Protocol               ATMP-Tunnel     0
 VALUE  Ascend-Tunneling-Protocol               VTP-Tunnel      1
-VALUE  Ascend-User-Acct-Base           Base-10 0
-VALUE  Ascend-User-Acct-Base           Base-16 1
-VALUE  Ascend-User-Acct-Type           Ascend-User-Acct-None   0
-VALUE  Ascend-User-Acct-Type           Ascend-User-Acct-User   1
-VALUE  Ascend-User-Acct-Type           Ascend-User-Acct-User-Default   2
+
 VALUE  Ascend-X25-Pad-X3-Profile               CC_SSP  4
 VALUE  Ascend-X25-Pad-X3-Profile               CC_TSP  5
 VALUE  Ascend-X25-Pad-X3-Profile               CRT     0

diff --git a/share/dictionary.usr b/share/dictionary.usr
index 3f7e84f..ec93978 100644 (file)
--- a/share/dictionary.usr
+++ b/share/dictionary.usr
@@ -1254,12 +1254,16 @@ VALUE   USR-Request-Type                        Access-Accept           2
 VALUE  USR-Request-Type                        Access-Reject           3
 VALUE  USR-Request-Type                        Accounting-Request      4
 VALUE  USR-Request-Type                        Accounting-Response     5
+# The next three non standard packet types are used by
+# US Robotics Security/Accounting Server
 VALUE  USR-Request-Type                        Access-Password-Change  7
 VALUE  USR-Request-Type                        Access-Password-Ack     8
 VALUE  USR-Request-Type                        Access-Password-Reject  9
 VALUE  USR-Request-Type                        Access-Challenge        11
 VALUE  USR-Request-Type                        Status-Server           12
 VALUE  USR-Request-Type                        Status-Client           13
+# Non standard packet types used by NetServer to implement
+# resource management and NAS reboot conditions
 VALUE  USR-Request-Type                        Resource-Free-Request   21
 VALUE  USR-Request-Type                        Resource-Free-Response  22
 VALUE  USR-Request-Type                        Resource-Query-Request  23
@@ -1267,16 +1271,10 @@ VALUE   USR-Request-Type                        Resource-Query-Response 24
 VALUE  USR-Request-Type                        Disconnect-User         25
 VALUE  USR-Request-Type                        NAS-Reboot-Request      26
 VALUE  USR-Request-Type                        NAS-Reboot-Response     27
+# This value is used for Tacacs Plus translation
 VALUE  USR-Request-Type                        Tacacs-Message          253
 VALUE  USR-Request-Type                        Reserved                255
 
-VALUE  USR-PW_Framed_Routing_V2                Off                     0
-VALUE  USR-PW_Framed_Routing_V2                On                      1
-
-VALUE  USR-Syslog-Tap                          Off                     0
-VALUE  USR-Syslog-Tap                          Raw                     1
-VALUE  USR-Syslog-Tap                          Framed                  2
-
 VALUE  USR-Speed-Of-Connection                 Auto                    0
 VALUE  USR-Speed-Of-Connection                 56                      1
 VALUE  USR-Speed-Of-Connection                 64                      2
@@ -1340,32 +1338,6 @@ VALUE    USR-Callback-Type                       ANI                     2
 VALUE  USR-Callback-Type                       Static                  3
 VALUE  USR-Callback-Type                       Dynamic                 4
 
-VALUE  USR-Request-Type                        Access-Request          1
-VALUE  USR-Request-Type                        Access-Accept           2
-VALUE  USR-Request-Type                        Access-Reject           3
-VALUE  USR-Request-Type                        Accounting-Request      4
-VALUE  USR-Request-Type                        Accounting-Response     5
-# The next three non standard packet types are used by
-# US Robotics Security/Accounting Server
-VALUE  USR-Request-Type                        Access-Password-Change  7
-VALUE  USR-Request-Type                        Access-Password-Ack     8
-VALUE  USR-Request-Type                        Access-Password-Reject  9
-VALUE  USR-Request-Type                        Access-Challenge        11
-VALUE  USR-Request-Type                        Status-Server           12
-VALUE  USR-Request-Type                        Status-Client           13
-# Non standard packet types used by NetServer to implement
-# resource management and NAS reboot conditions
-VALUE  USR-Request-Type                        Resource-Free-Request   21
-VALUE  USR-Request-Type                        Resource-Free-Response  22
-VALUE  USR-Request-Type                        Resource-Query-Request  23
-VALUE  USR-Request-Type                        Resource-Query-Response 24
-VALUE  USR-Request-Type                        Disconnect-User         25
-VALUE  USR-Request-Type                        NAS-Reboot-Request      26
-VALUE  USR-Request-Type                        NAS-Reboot-Response     27
-# This value is used for Tacacs Plus translation
-VALUE  USR-Request-Type                        Tacacs-Message          253
-VALUE  USR-Request-Type                        Reserved                255
-
 VALUE  USR-NAS-Type                            3Com-NMC                0
 VALUE  USR-NAS-Type                            3Com-NETServer          1
 VALUE  USR-NAS-Type                            3Com-HiPerArc           2
@@ -1385,4 +1357,5 @@ VALUE     USR-Auth-Mode                           Auth-Netware            6
 VALUE  USR-Auth-Mode                           Auth-Skey               7
 VALUE  USR-Auth-Mode                           Auth-EAP-Proxy          8
 VALUE  USR-Auth-Mode                           Auth-UNIX-Crypt         9
+
 END-VENDOR USR