From: Arran Cudbard-Bell Date: Mon, 15 Oct 2018 20:30:09 +0000 (-0400) Subject: Split dictionaries into protocol dictionary folders X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3415db5c08bca489380e5990c79fb04ee2ef151;p=thirdparty%2Ffreeradius-server.git Split dictionaries into protocol dictionary folders --- diff --git a/share/Makefile b/scripts/dict/Makefile similarity index 100% rename from share/Makefile rename to scripts/dict/Makefile diff --git a/share/attrnew.pl b/scripts/dict/attrnew.pl similarity index 100% rename from share/attrnew.pl rename to scripts/dict/attrnew.pl diff --git a/share/attrsort.pl b/scripts/dict/attrsort.pl similarity index 100% rename from share/attrsort.pl rename to scripts/dict/attrsort.pl diff --git a/share/backref.pl b/scripts/dict/backref.pl similarity index 100% rename from share/backref.pl rename to scripts/dict/backref.pl diff --git a/share/dct2fr b/scripts/dict/dct2fr similarity index 100% rename from share/dct2fr rename to scripts/dict/dct2fr diff --git a/share/format.pl b/scripts/dict/format.pl similarity index 100% rename from share/format.pl rename to scripts/dict/format.pl diff --git a/share/dictionary/dhcpv4/dictionary b/share/dictionary/dhcpv4/dictionary new file mode 100644 index 00000000000..de609b96f39 --- /dev/null +++ b/share/dictionary/dhcpv4/dictionary @@ -0,0 +1,32 @@ +# -*- text -*- +# Copyright (C) 2015 The FreeRADIUS Server project and contributors +############################################################################## +# +# DHCP dictionary. +# +# http://www.iana.org/assignments/bootp-dhcp-parameters +# +# Also http://www.networksorcery.com/enp/protocol/bootp/options.htm +# +# http://www.bind9.net/rfc-dhcp +# +# $Id$ +# +############################################################################## + +# +# +# The vendor codes are 2 octets, because we need 256 numbers +# for the base DHCP options, PLUS a few for the DHCP headers, +# which aren't in option format. +# +# On top of that, a number of options are really TLV's. +# We need to be able to understand them, too. +# +PROTOCOL DHCPv4 2 +BEGIN-PROTOCOL DHCPv4 + +# Fixme should be broken out into separate RFCs +$INCLUDE dictionary.rfc2131 + +END-PROTOCOL DHCPv4 diff --git a/share/dictionary.dhcpv4 b/share/dictionary/dhcpv4/dictionary.rfc2131 similarity index 98% rename from share/dictionary.dhcpv4 rename to share/dictionary/dhcpv4/dictionary.rfc2131 index 2c7766407d3..dd467b44c69 100644 --- a/share/dictionary.dhcpv4 +++ b/share/dictionary/dhcpv4/dictionary.rfc2131 @@ -2,7 +2,7 @@ # Copyright (C) 2015 The FreeRADIUS Server project and contributors ############################################################################## # -# DHCP to RADIUS gateway dictionary. +# DHCP dictionary. # # http://www.iana.org/assignments/bootp-dhcp-parameters # @@ -15,11 +15,6 @@ ############################################################################## # - -# This is really Apollo's number, but since they're out of business, -# I don't think they'll be needing this. -# -# HP owns the Apollo assets, but let's not worry about that. # # The vendor codes are 2 octets, because we need 256 numbers # for the base DHCP options, PLUS a few for the DHCP headers, @@ -28,11 +23,7 @@ # On top of that, a number of options are really TLV's. # We need to be able to understand them, too. # -VENDOR DHCP 54 - -BEGIN-VENDOR DHCP - -FLAGS internal +FLAGS internal ATTRIBUTE DHCP-Opcode 256 byte VALUE DHCP-Opcode Client-Message 1 @@ -173,6 +164,7 @@ ATTRIBUTE DHCP-IP-Address-Lease-Time 51 integer ATTRIBUTE DHCP-Overload 52 byte ATTRIBUTE DHCP-Message-Type 53 byte +VALUE DHCP-Message-Type DHCP-Do-Not-Respond 0 VALUE DHCP-Message-Type DHCP-Discover 1 VALUE DHCP-Message-Type DHCP-Offer 2 VALUE DHCP-Message-Type DHCP-Request 3 @@ -189,8 +181,6 @@ VALUE DHCP-Message-Type DHCP-Lease-Active 13 VALUE DHCP-Message-Type DHCP-Bulk-Lease-Query 14 VALUE DHCP-Message-Type DHCP-Lease-Query-Done 15 -VALUE DHCP-Message-Type DHCP-Do-Not-Respond 255 - ATTRIBUTE DHCP-DHCP-Server-Identifier 54 ipaddr # Array of 1-byte numbers indicating which options the client @@ -339,8 +329,8 @@ ATTRIBUTE DHCP-Call-Server-IP-address 129 octets ATTRIBUTE DHCP-Ethernet-Interface 130 octets ATTRIBUTE DHCP-Vendor-Discrimination-Str 130 octets ATTRIBUTE DHCP-Remote-Stats-Svr-IP-Address 131 octets -ATTRIBUTE DHCP-IEEE-802dot1Q-VLAN-ID 132 octets -ATTRIBUTE DHCP-IEEE-802dot1P-L2-Priority 133 octets +ATTRIBUTE DHCP-IEEE-802.1P-VLAN-ID 132 octets +ATTRIBUTE DHCP-IEEE-802.1Q-L2-Priority 133 octets ATTRIBUTE DHCP-Diffserv-Code-Point 134 octets ATTRIBUTE DHCP-HTTP-Proxy 135 octets @@ -570,5 +560,3 @@ VALUE DHCP-Parameter-Request-List DHCP-IEEE-802.1P-VLAN-ID 132 VALUE DHCP-Parameter-Request-List DHCP-IEEE-802.1Q-L2-Priority 133 VALUE DHCP-Parameter-Request-List DHCP-Diffserv-Code-Point 134 VALUE DHCP-Parameter-Request-List DHCP-HTTP-Proxy 135 - -END-VENDOR DHCP diff --git a/share/dictionary/dhcpv6/dictionary b/share/dictionary/dhcpv6/dictionary new file mode 100644 index 00000000000..f8f20fdc09d --- /dev/null +++ b/share/dictionary/dhcpv6/dictionary @@ -0,0 +1,32 @@ +# -*- text -*- +# Copyright (C) 2015 The FreeRADIUS Server project and contributors +############################################################################## +# +# DHCP dictionary. +# +# http://www.iana.org/assignments/bootp-dhcp-parameters +# +# Also http://www.networksorcery.com/enp/protocol/bootp/options.htm +# +# http://www.bind9.net/rfc-dhcp +# +# $Id$ +# +############################################################################## + +# +# +# The vendor codes are 2 octets, because we need 256 numbers +# for the base DHCP options, PLUS a few for the DHCP headers, +# which aren't in option format. +# +# On top of that, a number of options are really TLV's. +# We need to be able to understand them, too. +# +PROTOCOL DHCPv6 3 +BEGIN-PROTOCOL DHCPv6 + +# Fixme should be broken out into separate RFCs +$INCLUDE dictionary.dhcpv6 + +END-PROTOCOL DHCPv6 diff --git a/share/dictionary.dhcpv6 b/share/dictionary/dhcpv6/dictionary.dhcpv6 similarity index 100% rename from share/dictionary.dhcpv6 rename to share/dictionary/dhcpv6/dictionary.dhcpv6 diff --git a/share/dictionary/eap/aka/dictionary b/share/dictionary/eap/aka/dictionary new file mode 100644 index 00000000000..1f59027b35d --- /dev/null +++ b/share/dictionary/eap/aka/dictionary @@ -0,0 +1,17 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# Protocol dictionary for EAP-AKA +# +# +PROTOCOL EAP-AKA 102 +BEGIN-PROTOCOL EAP-AKA + +$INCLDUE dictionary.freeradius +$INCLUDE dictionary.rfc4187 +$INCLUDE dictionary.rfc5448 +$INCLUDE dictionary.rfc7458 +$INCLUDE dictionary.3gpp-ts24.139 +$INCLUDE dictionary.3gpp-ts24.302 + +END-PROTOCOL EAP-AKA diff --git a/share/dictionary/eap/aka/dictionary.3gpp-ts24.139 b/share/dictionary/eap/aka/dictionary.3gpp-ts24.139 new file mode 100644 index 00000000000..d1bc026e231 --- /dev/null +++ b/share/dictionary/eap/aka/dictionary.3gpp-ts24.139 @@ -0,0 +1,11 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# EAP-AKA attributes defined by 3gpp-ts24.139 +# + +# +# Skippable-Attributes +# +ATTRIBUTE EAP-AKA-RQSI-Ind 142 octets +ATTRIBUTE EAP-AKA-RQSI-Res 143 octets diff --git a/share/dictionary/eap/aka/dictionary.3gpp-ts24.302 b/share/dictionary/eap/aka/dictionary.3gpp-ts24.302 new file mode 100644 index 00000000000..3dcd906f2ca --- /dev/null +++ b/share/dictionary/eap/aka/dictionary.3gpp-ts24.302 @@ -0,0 +1,16 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# EAP-AKA attributes defined by 3gpp-ts24.302 +# + +# +# Skippable-Attributes +# +ATTRIBUTE EAP-AKA-IPMS-Ind 137 octets +ATTRIBUTE EAP-AKA-IPMS-Res 138 octets +ATTRIBUTE EAP-AKA-Tust-Ind 139 octets +ATTRIBUTE EAP-AKA-Short-Name-For-Network 140 octets +ATTRIBUTE EAP-AKA-Full-Name-For-Network 141 octets + +ATTRIBUTE EAP-AKA-Twan-Conn-Mode 144 octets diff --git a/share/dictionary/eap/aka/dictionary.freeradius b/share/dictionary/eap/aka/dictionary.freeradius new file mode 100644 index 00000000000..f5d79e187c5 --- /dev/null +++ b/share/dictionary/eap/aka/dictionary.freeradius @@ -0,0 +1,28 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# Attributes needed by FreeRADIUS internally +# + +# +# Internal (Non-Protocol) attributes +# +FLAGS internal +ATTRIBUTE EAP-AKA-Subtype 256 integer + +VALUE EAP-AKA-Subtype AKA-Challenge 1 +VALUE EAP-AKA-Subtype AKA-Authentication-Reject 2 +VALUE EAP-AKA-Subtype AKA-Synchronization-Failure 4 +VALUE EAP-AKA-Subtype AKA-Identity 5 +VALUE EAP-AKA-Subtype AKA-Notification 12 +VALUE EAP-AKA-Subtype AKA-Reauthentication 13 +VALUE EAP-AKA-Subtype AKA-Client-Error 14 + +ATTRIBUTE EAP-AKA-HMAC 257 string +ATTRIBUTE EAP-AKA-Key 258 octets +ATTRIBUTE EAP-AKA-Extra 259 octets + +ATTRIBUTE EAP-AKA-XRES 260 octets +ATTRIBUTE EAP-AKA-CK 261 octets +ATTRIBUTE EAP-AKA-IK 262 octets +ATTRIBUTE EAP-AKA-AUTHN 263 octets diff --git a/share/dictionary.eap.aka b/share/dictionary/eap/aka/dictionary.rfc4187 similarity index 92% rename from share/dictionary.eap.aka rename to share/dictionary/eap/aka/dictionary.rfc4187 index 5269caeaf9c..7969b90ee90 100644 --- a/share/dictionary.eap.aka +++ b/share/dictionary/eap/aka/dictionary.rfc4187 @@ -28,7 +28,10 @@ ATTRIBUTE EAP-AKA-Identity 14 string ATTRIBUTE EAP-AKA-Fullauth-ID-Req 17 bool ATTRIBUTE EAP-AKA-Client-Error-Code 22 short -VALUE EAP-AKA-Client-Error-Code Unable-To-Process-Packet 0 +VALUE EAP-AKA-Client-Error-Code Unable-To-Process-Packet 0 +VALUE EAP-AKA-Client-Error-Code Unsupported-Version 1 +VALUE EAP-AKA-Client-Error-Code Insufficient-Challenges 2 +VALUE EAP-AKA-Client-Error-Code RANDS-Not-Fresh 3 ATTRIBUTE EAP-AKA-KDF-Input 23 string ATTRIBUTE EAP-AKA-KDF 24 short diff --git a/share/dictionary/eap/aka/dictionary.rfc5448 b/share/dictionary/eap/aka/dictionary.rfc5448 new file mode 100644 index 00000000000..cbf78ee1f14 --- /dev/null +++ b/share/dictionary/eap/aka/dictionary.rfc5448 @@ -0,0 +1,11 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# EAP-AKA attributes defined by rfc5448 +# + +# +# Non-Skippable attributes +# +ATTRIBUTE EAP-AKA-KDF-Input 23 string +ATTRIBUTE EAP-AKA-KDF 24 short diff --git a/share/dictionary/eap/aka/dictionary.rfc7458 b/share/dictionary/eap/aka/dictionary.rfc7458 new file mode 100644 index 00000000000..958c7df51a1 --- /dev/null +++ b/share/dictionary/eap/aka/dictionary.rfc7458 @@ -0,0 +1,15 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# EAP-AKA attributes defined by rfc7458 +# + +# +# Skippable-Attributes +# +ATTRIBUTE EAP-AKA-Virtual-Network-ID 145 octets +ATTRIBUTE EAP-AKA-Virtual-Network-Req 146 octets +ATTRIBUTE EAP-AKA-Connectivity-Type 147 octets +ATTRIBUTE EAP-AKA-Handover-Indication 148 octets +ATTRIBUTE EAP-AKA-Handover-Session-ID 149 octets +ATTRIBUTE EAP-AKA-MN-Serial-ID 150 octets diff --git a/share/dictionary/eap/sim/dictionary b/share/dictionary/eap/sim/dictionary new file mode 100644 index 00000000000..04f59910fa3 --- /dev/null +++ b/share/dictionary/eap/sim/dictionary @@ -0,0 +1,17 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# Protocol dictionary for EAP-SIM +# +# +PROTOCOL EAP-SIM 101 +BEGIN-PROTOCOL EAP-SIM + +$INCLDUE dictionary.freeradius +$INCLUDE dictionary.rfc4187 +$INCLUDE dictionary.rfc5448 +$INCLUDE dictionary.rfc7458 +$INCLUDE dictionary.3gpp-ts24.139 +$INCLUDE dictionary.3gpp-ts24.302 + +END-PROTOCOL EAP-SIM diff --git a/share/dictionary/eap/sim/dictionary.3gpp-ts24.139 b/share/dictionary/eap/sim/dictionary.3gpp-ts24.139 new file mode 100644 index 00000000000..d72cc7d5ba4 --- /dev/null +++ b/share/dictionary/eap/sim/dictionary.3gpp-ts24.139 @@ -0,0 +1,11 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# EAP-SIM attributes defined by 3gpp-ts24.139 +# + +# +# Skippable-Attributes +# +ATTRIBUTE EAP-SIM-RQSI-Ind 142 octets +ATTRIBUTE EAP-SIM-RQSI-Res 143 octets diff --git a/share/dictionary/eap/sim/dictionary.3gpp-ts24.302 b/share/dictionary/eap/sim/dictionary.3gpp-ts24.302 new file mode 100644 index 00000000000..7b7b58a0a44 --- /dev/null +++ b/share/dictionary/eap/sim/dictionary.3gpp-ts24.302 @@ -0,0 +1,16 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# EAP-SIM attributes defined by 3gpp-ts24.302 +# + +# +# Skippable-Attributes +# +ATTRIBUTE EAP-SIM-IPMS-Ind 137 octets +ATTRIBUTE EAP-SIM-IPMS-Res 138 octets +ATTRIBUTE EAP-SIM-Tust-Ind 139 octets +ATTRIBUTE EAP-SIM-Short-Name-For-Network 140 octets +ATTRIBUTE EAP-SIM-Full-Name-For-Network 141 octets + +ATTRIBUTE EAP-SIM-Twan-Conn-Mode 144 octets diff --git a/share/dictionary/eap/sim/dictionary.freeradius b/share/dictionary/eap/sim/dictionary.freeradius new file mode 100644 index 00000000000..0d89cd08f46 --- /dev/null +++ b/share/dictionary/eap/sim/dictionary.freeradius @@ -0,0 +1,25 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# Attributes needed by FreeRADIUS internally +# + +# +# Internal (Non-Protocol) attributes +# +FLAGS internal +ATTRIBUTE EAP-SIM-Subtype 256 integer + +VALUE EAP-SIM-Subtype SIM-Start 10 +VALUE EAP-SIM-Subtype SIM-Challenge 11 +VALUE EAP-SIM-Subtype SIM-Notification 12 +VALUE EAP-SIM-Subtype SIM-Reauthentication 13 +VALUE EAP-SIM-Subtype SIM-Client-Error 14 + +ATTRIBUTE EAP-SIM-HMAC 257 string +ATTRIBUTE EAP-SIM-Key 258 octets +ATTRIBUTE EAP-SIM-Extra 259 octets + +ATTRIBUTE EAP-SIM-SRES 1222 octets +ATTRIBUTE EAP-SIM-KC 1223 octets +ATTRIBUTE EAP-SIM-State 1224 integer \ No newline at end of file diff --git a/share/dictionary.eap.sim b/share/dictionary/eap/sim/dictionary.rfc4187 similarity index 98% rename from share/dictionary.eap.sim rename to share/dictionary/eap/sim/dictionary.rfc4187 index 7dc615be228..09c5fdcd115 100644 --- a/share/dictionary.eap.sim +++ b/share/dictionary/eap/sim/dictionary.rfc4187 @@ -2,9 +2,10 @@ # Copyright (C) 2016 The FreeRADIUS Server project and contributors ############################################################################## # -# EAP-SIM Protocol attributes +# EAP-SIM attributes defined by rfc4187 # ############################################################################## + # # Non-Skippable attributes # @@ -23,7 +24,6 @@ VALUE EAP-SIM-Notification Success 32768 ATTRIBUTE EAP-SIM-Any-ID-Req 13 bool ATTRIBUTE EAP-SIM-Identity 14 string ATTRIBUTE EAP-SIM-Version-List 15 short array - ATTRIBUTE EAP-SIM-Selected-Version 16 short ATTRIBUTE EAP-SIM-Fullauth-ID-Req 17 bool ATTRIBUTE EAP-SIM-Client-Error-Code 22 short diff --git a/share/dictionary/eap/sim/dictionary.rfc5448 b/share/dictionary/eap/sim/dictionary.rfc5448 new file mode 100644 index 00000000000..c1a52fc1a30 --- /dev/null +++ b/share/dictionary/eap/sim/dictionary.rfc5448 @@ -0,0 +1,11 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# EAP-SIM attributes defined by rfc5448 +# + +# +# Non-Skippable attributes +# +ATTRIBUTE EAP-SIM-KDF-Input 24 octets +ATTRIBUTE EAP-SIM-KDF 25 octets diff --git a/share/dictionary/eap/sim/dictionary.rfc7458 b/share/dictionary/eap/sim/dictionary.rfc7458 new file mode 100644 index 00000000000..e6be69d730e --- /dev/null +++ b/share/dictionary/eap/sim/dictionary.rfc7458 @@ -0,0 +1,15 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# EAP-SIM attributes defined by rfc7458 +# + +# +# Skippable-Attributes +# +ATTRIBUTE EAP-SIM-Virtual-Network-ID 145 octets +ATTRIBUTE EAP-SIM-Virtual-Network-Req 146 octets +ATTRIBUTE EAP-SIM-Connectivity-Type 147 octets +ATTRIBUTE EAP-SIM-Handover-Indication 148 octets +ATTRIBUTE EAP-SIM-Handover-Session-ID 149 octets +ATTRIBUTE EAP-SIM-MN-Serial-ID 150 octets diff --git a/share/dictionary/ethernet/dictionary b/share/dictionary/ethernet/dictionary new file mode 100644 index 00000000000..6c9af7cf587 --- /dev/null +++ b/share/dictionary/ethernet/dictionary @@ -0,0 +1,23 @@ +# -*- text -*- +# Copyright (C) 2018 The FreeRADIUS Server project and contributors +############################################################################## +# +# $Id$ +# +############################################################################## + +# +# +# The vendor codes are 2 octets, because we need 256 numbers +# for the base DHCP options, PLUS a few for the DHCP headers, +# which aren't in option format. +# +# On top of that, a number of options are really TLV's. +# We need to be able to understand them, too. +# +PROTOCOL Ethernet 4 +BEGIN-PROTOCOL Ethernet + +$INCLUDE dictionary.ethernet + +END-PROTOCOL Ethernet diff --git a/share/dictionary.ethernet b/share/dictionary/ethernet/dictionary.ethernet similarity index 100% rename from share/dictionary.ethernet rename to share/dictionary/ethernet/dictionary.ethernet diff --git a/share/dictionary/freeradius/dictionary b/share/dictionary/freeradius/dictionary new file mode 100644 index 00000000000..6b945990d08 --- /dev/null +++ b/share/dictionary/freeradius/dictionary @@ -0,0 +1,9 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# Master dictionary file +# +# $Id$ +# + +$INCLUDE dictionary.freeradius.internal diff --git a/share/dictionary.freeradius.internal b/share/dictionary/freeradius/dictionary.freeradius.internal similarity index 99% rename from share/dictionary.freeradius.internal rename to share/dictionary/freeradius/dictionary.freeradius.internal index c61fe405660..2e7c2212e75 100644 --- a/share/dictionary.freeradius.internal +++ b/share/dictionary/freeradius/dictionary.freeradius.internal @@ -35,7 +35,7 @@ ATTRIBUTE Relax-Filter 501 bool # # # Non-Protocol Attributes -# These attributes are usedly by the server +# These attributes are used internally by the server # # Fixme - Should be attribute 1 when this becomes a separate dictionary diff --git a/share/dictionary b/share/dictionary/radius/dictionary similarity index 96% rename from share/dictionary rename to share/dictionary/radius/dictionary index be9244f4d8e..3f00271cad5 100644 --- a/share/dictionary +++ b/share/dictionary/radius/dictionary @@ -59,6 +59,9 @@ # 7 = 1 (integer encoding) # +PROTOCOL RADIUS 1 +BEGIN-PROTOCOL RADIUS + # # Include compatibility dictionary for older users file. Move # this directive to the end of this file if you want to see the @@ -192,7 +195,6 @@ $INCLUDE dictionary.extreme $INCLUDE dictionary.f5 $INCLUDE dictionary.fdxtended $INCLUDE dictionary.freeradius -$INCLUDE dictionary.freeradius.snmp $INCLUDE dictionary.freeswitch $INCLUDE dictionary.fortinet $INCLUDE dictionary.foundry @@ -299,15 +301,4 @@ $INCLUDE dictionary.zeus $INCLUDE dictionary.zte $INCLUDE dictionary.zyxel -# -# This should be auto-loaded in the future. -# -$INCLUDE dictionary.arp -$INCLUDE dictionary.vqp -$INCLUDE dictionary.dhcpv4 - -# -# And finally the server internal attributes. -# These are attributes which NEVER go into a RADIUS packet. -# -$INCLUDE dictionary.freeradius.internal +END-PROTOCOL RADIUS diff --git a/share/dictionary.3com b/share/dictionary/radius/dictionary.3com similarity index 100% rename from share/dictionary.3com rename to share/dictionary/radius/dictionary.3com diff --git a/share/dictionary.3gpp b/share/dictionary/radius/dictionary.3gpp similarity index 100% rename from share/dictionary.3gpp rename to share/dictionary/radius/dictionary.3gpp diff --git a/share/dictionary.3gpp2 b/share/dictionary/radius/dictionary.3gpp2 similarity index 100% rename from share/dictionary.3gpp2 rename to share/dictionary/radius/dictionary.3gpp2 diff --git a/share/dictionary.acc b/share/dictionary/radius/dictionary.acc similarity index 100% rename from share/dictionary.acc rename to share/dictionary/radius/dictionary.acc diff --git a/share/dictionary.acme b/share/dictionary/radius/dictionary.acme similarity index 100% rename from share/dictionary.acme rename to share/dictionary/radius/dictionary.acme diff --git a/share/dictionary.actelis b/share/dictionary/radius/dictionary.actelis similarity index 100% rename from share/dictionary.actelis rename to share/dictionary/radius/dictionary.actelis diff --git a/share/dictionary.adtran b/share/dictionary/radius/dictionary.adtran similarity index 100% rename from share/dictionary.adtran rename to share/dictionary/radius/dictionary.adtran diff --git a/share/dictionary.aerohive b/share/dictionary/radius/dictionary.aerohive similarity index 100% rename from share/dictionary.aerohive rename to share/dictionary/radius/dictionary.aerohive diff --git a/share/dictionary.airespace b/share/dictionary/radius/dictionary.airespace similarity index 100% rename from share/dictionary.airespace rename to share/dictionary/radius/dictionary.airespace diff --git a/share/dictionary.alcatel b/share/dictionary/radius/dictionary.alcatel similarity index 100% rename from share/dictionary.alcatel rename to share/dictionary/radius/dictionary.alcatel diff --git a/share/dictionary.alcatel-lucent.aaa b/share/dictionary/radius/dictionary.alcatel-lucent.aaa similarity index 100% rename from share/dictionary.alcatel-lucent.aaa rename to share/dictionary/radius/dictionary.alcatel-lucent.aaa diff --git a/share/dictionary.alcatel.esam b/share/dictionary/radius/dictionary.alcatel.esam similarity index 100% rename from share/dictionary.alcatel.esam rename to share/dictionary/radius/dictionary.alcatel.esam diff --git a/share/dictionary.alcatel.sr b/share/dictionary/radius/dictionary.alcatel.sr similarity index 99% rename from share/dictionary.alcatel.sr rename to share/dictionary/radius/dictionary.alcatel.sr index 9fe1cb1ae8e..ca57ea828f6 100644 --- a/share/dictionary.alcatel.sr +++ b/share/dictionary/radius/dictionary.alcatel.sr @@ -24,6 +24,7 @@ VALUE Timetra-Access both 3 ATTRIBUTE Timetra-Home-Directory 2 string ATTRIBUTE Timetra-Restrict-To-Home 3 integer + ATTRIBUTE Timetra-Profile 4 string ATTRIBUTE Timetra-Default-Action 5 integer diff --git a/share/dictionary.alteon b/share/dictionary/radius/dictionary.alteon similarity index 100% rename from share/dictionary.alteon rename to share/dictionary/radius/dictionary.alteon diff --git a/share/dictionary.altiga b/share/dictionary/radius/dictionary.altiga similarity index 100% rename from share/dictionary.altiga rename to share/dictionary/radius/dictionary.altiga diff --git a/share/dictionary.alvarion b/share/dictionary/radius/dictionary.alvarion similarity index 100% rename from share/dictionary.alvarion rename to share/dictionary/radius/dictionary.alvarion diff --git a/share/dictionary.alvarion.wimax.v2_2 b/share/dictionary/radius/dictionary.alvarion.wimax.v2_2 similarity index 100% rename from share/dictionary.alvarion.wimax.v2_2 rename to share/dictionary/radius/dictionary.alvarion.wimax.v2_2 diff --git a/share/dictionary.apc b/share/dictionary/radius/dictionary.apc similarity index 100% rename from share/dictionary.apc rename to share/dictionary/radius/dictionary.apc diff --git a/share/dictionary.aptilo b/share/dictionary/radius/dictionary.aptilo similarity index 100% rename from share/dictionary.aptilo rename to share/dictionary/radius/dictionary.aptilo diff --git a/share/dictionary.aptis b/share/dictionary/radius/dictionary.aptis similarity index 100% rename from share/dictionary.aptis rename to share/dictionary/radius/dictionary.aptis diff --git a/share/dictionary.arbor b/share/dictionary/radius/dictionary.arbor similarity index 100% rename from share/dictionary.arbor rename to share/dictionary/radius/dictionary.arbor diff --git a/share/dictionary.arista b/share/dictionary/radius/dictionary.arista similarity index 100% rename from share/dictionary.arista rename to share/dictionary/radius/dictionary.arista diff --git a/share/dictionary.arp b/share/dictionary/radius/dictionary.arp similarity index 100% rename from share/dictionary.arp rename to share/dictionary/radius/dictionary.arp diff --git a/share/dictionary.aruba b/share/dictionary/radius/dictionary.aruba similarity index 100% rename from share/dictionary.aruba rename to share/dictionary/radius/dictionary.aruba diff --git a/share/dictionary.ascend b/share/dictionary/radius/dictionary.ascend similarity index 100% rename from share/dictionary.ascend rename to share/dictionary/radius/dictionary.ascend diff --git a/share/dictionary.ascend.illegal b/share/dictionary/radius/dictionary.ascend.illegal similarity index 100% rename from share/dictionary.ascend.illegal rename to share/dictionary/radius/dictionary.ascend.illegal diff --git a/share/dictionary.asn b/share/dictionary/radius/dictionary.asn similarity index 100% rename from share/dictionary.asn rename to share/dictionary/radius/dictionary.asn diff --git a/share/dictionary.audiocodes b/share/dictionary/radius/dictionary.audiocodes similarity index 100% rename from share/dictionary.audiocodes rename to share/dictionary/radius/dictionary.audiocodes diff --git a/share/dictionary.avaya b/share/dictionary/radius/dictionary.avaya similarity index 100% rename from share/dictionary.avaya rename to share/dictionary/radius/dictionary.avaya diff --git a/share/dictionary.azaire b/share/dictionary/radius/dictionary.azaire similarity index 100% rename from share/dictionary.azaire rename to share/dictionary/radius/dictionary.azaire diff --git a/share/dictionary.bay b/share/dictionary/radius/dictionary.bay similarity index 100% rename from share/dictionary.bay rename to share/dictionary/radius/dictionary.bay diff --git a/share/dictionary.bigswitch b/share/dictionary/radius/dictionary.bigswitch similarity index 100% rename from share/dictionary.bigswitch rename to share/dictionary/radius/dictionary.bigswitch diff --git a/share/dictionary.bintec b/share/dictionary/radius/dictionary.bintec similarity index 100% rename from share/dictionary.bintec rename to share/dictionary/radius/dictionary.bintec diff --git a/share/dictionary.bluecoat b/share/dictionary/radius/dictionary.bluecoat similarity index 100% rename from share/dictionary.bluecoat rename to share/dictionary/radius/dictionary.bluecoat diff --git a/share/dictionary.boingo b/share/dictionary/radius/dictionary.boingo similarity index 100% rename from share/dictionary.boingo rename to share/dictionary/radius/dictionary.boingo diff --git a/share/dictionary.bristol b/share/dictionary/radius/dictionary.bristol similarity index 100% rename from share/dictionary.bristol rename to share/dictionary/radius/dictionary.bristol diff --git a/share/dictionary.broadsoft b/share/dictionary/radius/dictionary.broadsoft similarity index 100% rename from share/dictionary.broadsoft rename to share/dictionary/radius/dictionary.broadsoft diff --git a/share/dictionary.brocade b/share/dictionary/radius/dictionary.brocade similarity index 100% rename from share/dictionary.brocade rename to share/dictionary/radius/dictionary.brocade diff --git a/share/dictionary.bskyb b/share/dictionary/radius/dictionary.bskyb similarity index 100% rename from share/dictionary.bskyb rename to share/dictionary/radius/dictionary.bskyb diff --git a/share/dictionary.bt b/share/dictionary/radius/dictionary.bt similarity index 100% rename from share/dictionary.bt rename to share/dictionary/radius/dictionary.bt diff --git a/share/dictionary.cablelabs b/share/dictionary/radius/dictionary.cablelabs similarity index 100% rename from share/dictionary.cablelabs rename to share/dictionary/radius/dictionary.cablelabs diff --git a/share/dictionary.cabletron b/share/dictionary/radius/dictionary.cabletron similarity index 100% rename from share/dictionary.cabletron rename to share/dictionary/radius/dictionary.cabletron diff --git a/share/dictionary.camiant b/share/dictionary/radius/dictionary.camiant similarity index 100% rename from share/dictionary.camiant rename to share/dictionary/radius/dictionary.camiant diff --git a/share/dictionary.checkpoint b/share/dictionary/radius/dictionary.checkpoint similarity index 100% rename from share/dictionary.checkpoint rename to share/dictionary/radius/dictionary.checkpoint diff --git a/share/dictionary.chillispot b/share/dictionary/radius/dictionary.chillispot similarity index 100% rename from share/dictionary.chillispot rename to share/dictionary/radius/dictionary.chillispot diff --git a/share/dictionary.cisco b/share/dictionary/radius/dictionary.cisco similarity index 100% rename from share/dictionary.cisco rename to share/dictionary/radius/dictionary.cisco diff --git a/share/dictionary.cisco.asa b/share/dictionary/radius/dictionary.cisco.asa similarity index 100% rename from share/dictionary.cisco.asa rename to share/dictionary/radius/dictionary.cisco.asa diff --git a/share/dictionary.cisco.bbsm b/share/dictionary/radius/dictionary.cisco.bbsm similarity index 100% rename from share/dictionary.cisco.bbsm rename to share/dictionary/radius/dictionary.cisco.bbsm diff --git a/share/dictionary.cisco.vpn3000 b/share/dictionary/radius/dictionary.cisco.vpn3000 similarity index 100% rename from share/dictionary.cisco.vpn3000 rename to share/dictionary/radius/dictionary.cisco.vpn3000 diff --git a/share/dictionary.cisco.vpn5000 b/share/dictionary/radius/dictionary.cisco.vpn5000 similarity index 100% rename from share/dictionary.cisco.vpn5000 rename to share/dictionary/radius/dictionary.cisco.vpn5000 diff --git a/share/dictionary.citrix b/share/dictionary/radius/dictionary.citrix similarity index 100% rename from share/dictionary.citrix rename to share/dictionary/radius/dictionary.citrix diff --git a/share/dictionary.clavister b/share/dictionary/radius/dictionary.clavister similarity index 100% rename from share/dictionary.clavister rename to share/dictionary/radius/dictionary.clavister diff --git a/share/dictionary.cnergee b/share/dictionary/radius/dictionary.cnergee similarity index 100% rename from share/dictionary.cnergee rename to share/dictionary/radius/dictionary.cnergee diff --git a/share/dictionary.colubris b/share/dictionary/radius/dictionary.colubris similarity index 100% rename from share/dictionary.colubris rename to share/dictionary/radius/dictionary.colubris diff --git a/share/dictionary.columbia_university b/share/dictionary/radius/dictionary.columbia_university similarity index 100% rename from share/dictionary.columbia_university rename to share/dictionary/radius/dictionary.columbia_university diff --git a/share/dictionary.compat b/share/dictionary/radius/dictionary.compat similarity index 94% rename from share/dictionary.compat rename to share/dictionary/radius/dictionary.compat index 24c754aacbb..c317717994e 100644 --- a/share/dictionary.compat +++ b/share/dictionary/radius/dictionary.compat @@ -21,10 +21,13 @@ ATTRIBUTE Port-Message 18 string ATTRIBUTE Dialback-No 19 string ATTRIBUTE Dialback-Name 20 string ATTRIBUTE Challenge-State 24 string + +ATTRIBUTE Framed-Compression 13 integer VALUE Framed-Compression Van-Jacobsen-TCP-IP 1 VALUE Framed-Compression VJ-TCP-IP 1 + +ATTRIBUTE Service-Type 6 integer VALUE Service-Type Shell-User 6 -VALUE Auth-Type Unix 1 VALUE Service-Type Dialback-Login-User 3 VALUE Service-Type Dialback-Framed-User 4 VALUE Service-Type Dialout-Framed-User 5 diff --git a/share/dictionary.compatible b/share/dictionary/radius/dictionary.compatible similarity index 100% rename from share/dictionary.compatible rename to share/dictionary/radius/dictionary.compatible diff --git a/share/dictionary.cosine b/share/dictionary/radius/dictionary.cosine similarity index 100% rename from share/dictionary.cosine rename to share/dictionary/radius/dictionary.cosine diff --git a/share/dictionary.dante b/share/dictionary/radius/dictionary.dante similarity index 100% rename from share/dictionary.dante rename to share/dictionary/radius/dictionary.dante diff --git a/share/dictionary.dellemc b/share/dictionary/radius/dictionary.dellemc similarity index 100% rename from share/dictionary.dellemc rename to share/dictionary/radius/dictionary.dellemc diff --git a/share/dictionary.digium b/share/dictionary/radius/dictionary.digium similarity index 100% rename from share/dictionary.digium rename to share/dictionary/radius/dictionary.digium diff --git a/share/dictionary.dlink b/share/dictionary/radius/dictionary.dlink similarity index 100% rename from share/dictionary.dlink rename to share/dictionary/radius/dictionary.dlink diff --git a/share/dictionary.dragonwave b/share/dictionary/radius/dictionary.dragonwave similarity index 100% rename from share/dictionary.dragonwave rename to share/dictionary/radius/dictionary.dragonwave diff --git a/share/dictionary.efficientip b/share/dictionary/radius/dictionary.efficientip similarity index 100% rename from share/dictionary.efficientip rename to share/dictionary/radius/dictionary.efficientip diff --git a/share/dictionary.eltex b/share/dictionary/radius/dictionary.eltex similarity index 100% rename from share/dictionary.eltex rename to share/dictionary/radius/dictionary.eltex diff --git a/share/dictionary.epygi b/share/dictionary/radius/dictionary.epygi similarity index 100% rename from share/dictionary.epygi rename to share/dictionary/radius/dictionary.epygi diff --git a/share/dictionary.equallogic b/share/dictionary/radius/dictionary.equallogic similarity index 100% rename from share/dictionary.equallogic rename to share/dictionary/radius/dictionary.equallogic diff --git a/share/dictionary.ericsson b/share/dictionary/radius/dictionary.ericsson similarity index 100% rename from share/dictionary.ericsson rename to share/dictionary/radius/dictionary.ericsson diff --git a/share/dictionary.ericsson.ab b/share/dictionary/radius/dictionary.ericsson.ab similarity index 100% rename from share/dictionary.ericsson.ab rename to share/dictionary/radius/dictionary.ericsson.ab diff --git a/share/dictionary.ericsson.packet.core.networks b/share/dictionary/radius/dictionary.ericsson.packet.core.networks similarity index 100% rename from share/dictionary.ericsson.packet.core.networks rename to share/dictionary/radius/dictionary.ericsson.packet.core.networks diff --git a/share/dictionary.extreme b/share/dictionary/radius/dictionary.extreme similarity index 100% rename from share/dictionary.extreme rename to share/dictionary/radius/dictionary.extreme diff --git a/share/dictionary.f5 b/share/dictionary/radius/dictionary.f5 similarity index 100% rename from share/dictionary.f5 rename to share/dictionary/radius/dictionary.f5 diff --git a/share/dictionary.fdxtended b/share/dictionary/radius/dictionary.fdxtended similarity index 100% rename from share/dictionary.fdxtended rename to share/dictionary/radius/dictionary.fdxtended diff --git a/share/dictionary.fortinet b/share/dictionary/radius/dictionary.fortinet similarity index 100% rename from share/dictionary.fortinet rename to share/dictionary/radius/dictionary.fortinet diff --git a/share/dictionary.foundry b/share/dictionary/radius/dictionary.foundry similarity index 100% rename from share/dictionary.foundry rename to share/dictionary/radius/dictionary.foundry diff --git a/share/dictionary.freedhcp b/share/dictionary/radius/dictionary.freedhcp similarity index 100% rename from share/dictionary.freedhcp rename to share/dictionary/radius/dictionary.freedhcp diff --git a/share/dictionary.freeradius b/share/dictionary/radius/dictionary.freeradius similarity index 100% rename from share/dictionary.freeradius rename to share/dictionary/radius/dictionary.freeradius diff --git a/share/dictionary.freeswitch b/share/dictionary/radius/dictionary.freeswitch similarity index 100% rename from share/dictionary.freeswitch rename to share/dictionary/radius/dictionary.freeswitch diff --git a/share/dictionary.gandalf b/share/dictionary/radius/dictionary.gandalf similarity index 100% rename from share/dictionary.gandalf rename to share/dictionary/radius/dictionary.gandalf diff --git a/share/dictionary.garderos b/share/dictionary/radius/dictionary.garderos similarity index 100% rename from share/dictionary.garderos rename to share/dictionary/radius/dictionary.garderos diff --git a/share/dictionary.gemtek b/share/dictionary/radius/dictionary.gemtek similarity index 100% rename from share/dictionary.gemtek rename to share/dictionary/radius/dictionary.gemtek diff --git a/share/dictionary.h3c b/share/dictionary/radius/dictionary.h3c similarity index 100% rename from share/dictionary.h3c rename to share/dictionary/radius/dictionary.h3c diff --git a/share/dictionary.hillstone b/share/dictionary/radius/dictionary.hillstone similarity index 100% rename from share/dictionary.hillstone rename to share/dictionary/radius/dictionary.hillstone diff --git a/share/dictionary.hp b/share/dictionary/radius/dictionary.hp similarity index 100% rename from share/dictionary.hp rename to share/dictionary/radius/dictionary.hp diff --git a/share/dictionary.huawei b/share/dictionary/radius/dictionary.huawei similarity index 100% rename from share/dictionary.huawei rename to share/dictionary/radius/dictionary.huawei diff --git a/share/dictionary.iana b/share/dictionary/radius/dictionary.iana similarity index 100% rename from share/dictionary.iana rename to share/dictionary/radius/dictionary.iana diff --git a/share/dictionary.iea b/share/dictionary/radius/dictionary.iea similarity index 100% rename from share/dictionary.iea rename to share/dictionary/radius/dictionary.iea diff --git a/share/dictionary.iec b/share/dictionary/radius/dictionary.iec similarity index 100% rename from share/dictionary.iec rename to share/dictionary/radius/dictionary.iec diff --git a/share/dictionary.infinera b/share/dictionary/radius/dictionary.infinera similarity index 100% rename from share/dictionary.infinera rename to share/dictionary/radius/dictionary.infinera diff --git a/share/dictionary.infoblox b/share/dictionary/radius/dictionary.infoblox similarity index 100% rename from share/dictionary.infoblox rename to share/dictionary/radius/dictionary.infoblox diff --git a/share/dictionary.infonet b/share/dictionary/radius/dictionary.infonet similarity index 100% rename from share/dictionary.infonet rename to share/dictionary/radius/dictionary.infonet diff --git a/share/dictionary.ipunplugged b/share/dictionary/radius/dictionary.ipunplugged similarity index 100% rename from share/dictionary.ipunplugged rename to share/dictionary/radius/dictionary.ipunplugged diff --git a/share/dictionary.issanni b/share/dictionary/radius/dictionary.issanni similarity index 100% rename from share/dictionary.issanni rename to share/dictionary/radius/dictionary.issanni diff --git a/share/dictionary.itk b/share/dictionary/radius/dictionary.itk similarity index 100% rename from share/dictionary.itk rename to share/dictionary/radius/dictionary.itk diff --git a/share/dictionary.juniper b/share/dictionary/radius/dictionary.juniper similarity index 100% rename from share/dictionary.juniper rename to share/dictionary/radius/dictionary.juniper diff --git a/share/dictionary.karlnet b/share/dictionary/radius/dictionary.karlnet similarity index 100% rename from share/dictionary.karlnet rename to share/dictionary/radius/dictionary.karlnet diff --git a/share/dictionary.kineto b/share/dictionary/radius/dictionary.kineto similarity index 100% rename from share/dictionary.kineto rename to share/dictionary/radius/dictionary.kineto diff --git a/share/dictionary.lancom b/share/dictionary/radius/dictionary.lancom similarity index 100% rename from share/dictionary.lancom rename to share/dictionary/radius/dictionary.lancom diff --git a/share/dictionary.lantronix b/share/dictionary/radius/dictionary.lantronix similarity index 100% rename from share/dictionary.lantronix rename to share/dictionary/radius/dictionary.lantronix diff --git a/share/dictionary.livingston b/share/dictionary/radius/dictionary.livingston similarity index 100% rename from share/dictionary.livingston rename to share/dictionary/radius/dictionary.livingston diff --git a/share/dictionary.localweb b/share/dictionary/radius/dictionary.localweb similarity index 100% rename from share/dictionary.localweb rename to share/dictionary/radius/dictionary.localweb diff --git a/share/dictionary.lucent b/share/dictionary/radius/dictionary.lucent similarity index 100% rename from share/dictionary.lucent rename to share/dictionary/radius/dictionary.lucent diff --git a/share/dictionary.manzara b/share/dictionary/radius/dictionary.manzara similarity index 100% rename from share/dictionary.manzara rename to share/dictionary/radius/dictionary.manzara diff --git a/share/dictionary.meinberg b/share/dictionary/radius/dictionary.meinberg similarity index 100% rename from share/dictionary.meinberg rename to share/dictionary/radius/dictionary.meinberg diff --git a/share/dictionary.meraki b/share/dictionary/radius/dictionary.meraki similarity index 100% rename from share/dictionary.meraki rename to share/dictionary/radius/dictionary.meraki diff --git a/share/dictionary.merit b/share/dictionary/radius/dictionary.merit similarity index 100% rename from share/dictionary.merit rename to share/dictionary/radius/dictionary.merit diff --git a/share/dictionary.meru b/share/dictionary/radius/dictionary.meru similarity index 100% rename from share/dictionary.meru rename to share/dictionary/radius/dictionary.meru diff --git a/share/dictionary.microsemi b/share/dictionary/radius/dictionary.microsemi similarity index 100% rename from share/dictionary.microsemi rename to share/dictionary/radius/dictionary.microsemi diff --git a/share/dictionary.microsoft b/share/dictionary/radius/dictionary.microsoft similarity index 100% rename from share/dictionary.microsoft rename to share/dictionary/radius/dictionary.microsoft diff --git a/share/dictionary.mikrotik b/share/dictionary/radius/dictionary.mikrotik similarity index 100% rename from share/dictionary.mikrotik rename to share/dictionary/radius/dictionary.mikrotik diff --git a/share/dictionary.mimosa b/share/dictionary/radius/dictionary.mimosa similarity index 100% rename from share/dictionary.mimosa rename to share/dictionary/radius/dictionary.mimosa diff --git a/share/dictionary.motorola b/share/dictionary/radius/dictionary.motorola similarity index 100% rename from share/dictionary.motorola rename to share/dictionary/radius/dictionary.motorola diff --git a/share/dictionary.motorola.illegal b/share/dictionary/radius/dictionary.motorola.illegal similarity index 100% rename from share/dictionary.motorola.illegal rename to share/dictionary/radius/dictionary.motorola.illegal diff --git a/share/dictionary.motorola.wimax b/share/dictionary/radius/dictionary.motorola.wimax similarity index 100% rename from share/dictionary.motorola.wimax rename to share/dictionary/radius/dictionary.motorola.wimax diff --git a/share/dictionary.navini b/share/dictionary/radius/dictionary.navini similarity index 100% rename from share/dictionary.navini rename to share/dictionary/radius/dictionary.navini diff --git a/share/dictionary.netscreen b/share/dictionary/radius/dictionary.netscreen similarity index 100% rename from share/dictionary.netscreen rename to share/dictionary/radius/dictionary.netscreen diff --git a/share/dictionary.networkphysics b/share/dictionary/radius/dictionary.networkphysics similarity index 100% rename from share/dictionary.networkphysics rename to share/dictionary/radius/dictionary.networkphysics diff --git a/share/dictionary.nexans b/share/dictionary/radius/dictionary.nexans similarity index 100% rename from share/dictionary.nexans rename to share/dictionary/radius/dictionary.nexans diff --git a/share/dictionary.nokia b/share/dictionary/radius/dictionary.nokia similarity index 100% rename from share/dictionary.nokia rename to share/dictionary/radius/dictionary.nokia diff --git a/share/dictionary.nokia.conflict b/share/dictionary/radius/dictionary.nokia.conflict similarity index 100% rename from share/dictionary.nokia.conflict rename to share/dictionary/radius/dictionary.nokia.conflict diff --git a/share/dictionary.nomadix b/share/dictionary/radius/dictionary.nomadix similarity index 100% rename from share/dictionary.nomadix rename to share/dictionary/radius/dictionary.nomadix diff --git a/share/dictionary.nortel b/share/dictionary/radius/dictionary.nortel similarity index 100% rename from share/dictionary.nortel rename to share/dictionary/radius/dictionary.nortel diff --git a/share/dictionary.ntua b/share/dictionary/radius/dictionary.ntua similarity index 100% rename from share/dictionary.ntua rename to share/dictionary/radius/dictionary.ntua diff --git a/share/dictionary.openser b/share/dictionary/radius/dictionary.openser similarity index 100% rename from share/dictionary.openser rename to share/dictionary/radius/dictionary.openser diff --git a/share/dictionary.packeteer b/share/dictionary/radius/dictionary.packeteer similarity index 100% rename from share/dictionary.packeteer rename to share/dictionary/radius/dictionary.packeteer diff --git a/share/dictionary.paloalto b/share/dictionary/radius/dictionary.paloalto similarity index 100% rename from share/dictionary.paloalto rename to share/dictionary/radius/dictionary.paloalto diff --git a/share/dictionary.patton b/share/dictionary/radius/dictionary.patton similarity index 100% rename from share/dictionary.patton rename to share/dictionary/radius/dictionary.patton diff --git a/share/dictionary.perle b/share/dictionary/radius/dictionary.perle similarity index 100% rename from share/dictionary.perle rename to share/dictionary/radius/dictionary.perle diff --git a/share/dictionary.propel b/share/dictionary/radius/dictionary.propel similarity index 100% rename from share/dictionary.propel rename to share/dictionary/radius/dictionary.propel diff --git a/share/dictionary.prosoft b/share/dictionary/radius/dictionary.prosoft similarity index 100% rename from share/dictionary.prosoft rename to share/dictionary/radius/dictionary.prosoft diff --git a/share/dictionary.proxim b/share/dictionary/radius/dictionary.proxim similarity index 100% rename from share/dictionary.proxim rename to share/dictionary/radius/dictionary.proxim diff --git a/share/dictionary.purewave b/share/dictionary/radius/dictionary.purewave similarity index 100% rename from share/dictionary.purewave rename to share/dictionary/radius/dictionary.purewave diff --git a/share/dictionary.quiconnect b/share/dictionary/radius/dictionary.quiconnect similarity index 100% rename from share/dictionary.quiconnect rename to share/dictionary/radius/dictionary.quiconnect diff --git a/share/dictionary.quintum b/share/dictionary/radius/dictionary.quintum similarity index 100% rename from share/dictionary.quintum rename to share/dictionary/radius/dictionary.quintum diff --git a/share/dictionary.redcreek b/share/dictionary/radius/dictionary.redcreek similarity index 100% rename from share/dictionary.redcreek rename to share/dictionary/radius/dictionary.redcreek diff --git a/share/dictionary.rfc2865 b/share/dictionary/radius/dictionary.rfc2865 similarity index 100% rename from share/dictionary.rfc2865 rename to share/dictionary/radius/dictionary.rfc2865 diff --git a/share/dictionary.rfc2866 b/share/dictionary/radius/dictionary.rfc2866 similarity index 100% rename from share/dictionary.rfc2866 rename to share/dictionary/radius/dictionary.rfc2866 diff --git a/share/dictionary.rfc2867 b/share/dictionary/radius/dictionary.rfc2867 similarity index 100% rename from share/dictionary.rfc2867 rename to share/dictionary/radius/dictionary.rfc2867 diff --git a/share/dictionary.rfc2868 b/share/dictionary/radius/dictionary.rfc2868 similarity index 100% rename from share/dictionary.rfc2868 rename to share/dictionary/radius/dictionary.rfc2868 diff --git a/share/dictionary.rfc2869 b/share/dictionary/radius/dictionary.rfc2869 similarity index 100% rename from share/dictionary.rfc2869 rename to share/dictionary/radius/dictionary.rfc2869 diff --git a/share/dictionary.rfc3162 b/share/dictionary/radius/dictionary.rfc3162 similarity index 100% rename from share/dictionary.rfc3162 rename to share/dictionary/radius/dictionary.rfc3162 diff --git a/share/dictionary.rfc3576 b/share/dictionary/radius/dictionary.rfc3576 similarity index 100% rename from share/dictionary.rfc3576 rename to share/dictionary/radius/dictionary.rfc3576 diff --git a/share/dictionary.rfc3580 b/share/dictionary/radius/dictionary.rfc3580 similarity index 100% rename from share/dictionary.rfc3580 rename to share/dictionary/radius/dictionary.rfc3580 diff --git a/share/dictionary.rfc4072 b/share/dictionary/radius/dictionary.rfc4072 similarity index 100% rename from share/dictionary.rfc4072 rename to share/dictionary/radius/dictionary.rfc4072 diff --git a/share/dictionary.rfc4372 b/share/dictionary/radius/dictionary.rfc4372 similarity index 100% rename from share/dictionary.rfc4372 rename to share/dictionary/radius/dictionary.rfc4372 diff --git a/share/dictionary.rfc4603 b/share/dictionary/radius/dictionary.rfc4603 similarity index 100% rename from share/dictionary.rfc4603 rename to share/dictionary/radius/dictionary.rfc4603 diff --git a/share/dictionary.rfc4675 b/share/dictionary/radius/dictionary.rfc4675 similarity index 100% rename from share/dictionary.rfc4675 rename to share/dictionary/radius/dictionary.rfc4675 diff --git a/share/dictionary.rfc4679 b/share/dictionary/radius/dictionary.rfc4679 similarity index 100% rename from share/dictionary.rfc4679 rename to share/dictionary/radius/dictionary.rfc4679 diff --git a/share/dictionary.rfc4818 b/share/dictionary/radius/dictionary.rfc4818 similarity index 100% rename from share/dictionary.rfc4818 rename to share/dictionary/radius/dictionary.rfc4818 diff --git a/share/dictionary.rfc4849 b/share/dictionary/radius/dictionary.rfc4849 similarity index 100% rename from share/dictionary.rfc4849 rename to share/dictionary/radius/dictionary.rfc4849 diff --git a/share/dictionary.rfc5090 b/share/dictionary/radius/dictionary.rfc5090 similarity index 100% rename from share/dictionary.rfc5090 rename to share/dictionary/radius/dictionary.rfc5090 diff --git a/share/dictionary.rfc5176 b/share/dictionary/radius/dictionary.rfc5176 similarity index 100% rename from share/dictionary.rfc5176 rename to share/dictionary/radius/dictionary.rfc5176 diff --git a/share/dictionary.rfc5447 b/share/dictionary/radius/dictionary.rfc5447 similarity index 100% rename from share/dictionary.rfc5447 rename to share/dictionary/radius/dictionary.rfc5447 diff --git a/share/dictionary.rfc5580 b/share/dictionary/radius/dictionary.rfc5580 similarity index 100% rename from share/dictionary.rfc5580 rename to share/dictionary/radius/dictionary.rfc5580 diff --git a/share/dictionary.rfc5607 b/share/dictionary/radius/dictionary.rfc5607 similarity index 100% rename from share/dictionary.rfc5607 rename to share/dictionary/radius/dictionary.rfc5607 diff --git a/share/dictionary.rfc5904 b/share/dictionary/radius/dictionary.rfc5904 similarity index 100% rename from share/dictionary.rfc5904 rename to share/dictionary/radius/dictionary.rfc5904 diff --git a/share/dictionary.rfc6519 b/share/dictionary/radius/dictionary.rfc6519 similarity index 100% rename from share/dictionary.rfc6519 rename to share/dictionary/radius/dictionary.rfc6519 diff --git a/share/dictionary.rfc6572 b/share/dictionary/radius/dictionary.rfc6572 similarity index 100% rename from share/dictionary.rfc6572 rename to share/dictionary/radius/dictionary.rfc6572 diff --git a/share/dictionary.rfc6677 b/share/dictionary/radius/dictionary.rfc6677 similarity index 100% rename from share/dictionary.rfc6677 rename to share/dictionary/radius/dictionary.rfc6677 diff --git a/share/dictionary.rfc6911 b/share/dictionary/radius/dictionary.rfc6911 similarity index 100% rename from share/dictionary.rfc6911 rename to share/dictionary/radius/dictionary.rfc6911 diff --git a/share/dictionary.rfc6929 b/share/dictionary/radius/dictionary.rfc6929 similarity index 100% rename from share/dictionary.rfc6929 rename to share/dictionary/radius/dictionary.rfc6929 diff --git a/share/dictionary.rfc6930 b/share/dictionary/radius/dictionary.rfc6930 similarity index 100% rename from share/dictionary.rfc6930 rename to share/dictionary/radius/dictionary.rfc6930 diff --git a/share/dictionary.rfc7055 b/share/dictionary/radius/dictionary.rfc7055 similarity index 100% rename from share/dictionary.rfc7055 rename to share/dictionary/radius/dictionary.rfc7055 diff --git a/share/dictionary.rfc7155 b/share/dictionary/radius/dictionary.rfc7155 similarity index 100% rename from share/dictionary.rfc7155 rename to share/dictionary/radius/dictionary.rfc7155 diff --git a/share/dictionary.rfc7268 b/share/dictionary/radius/dictionary.rfc7268 similarity index 100% rename from share/dictionary.rfc7268 rename to share/dictionary/radius/dictionary.rfc7268 diff --git a/share/dictionary.rfc7499 b/share/dictionary/radius/dictionary.rfc7499 similarity index 100% rename from share/dictionary.rfc7499 rename to share/dictionary/radius/dictionary.rfc7499 diff --git a/share/dictionary.rfc7930 b/share/dictionary/radius/dictionary.rfc7930 similarity index 100% rename from share/dictionary.rfc7930 rename to share/dictionary/radius/dictionary.rfc7930 diff --git a/share/dictionary.riverbed b/share/dictionary/radius/dictionary.riverbed similarity index 100% rename from share/dictionary.riverbed rename to share/dictionary/radius/dictionary.riverbed diff --git a/share/dictionary.riverstone b/share/dictionary/radius/dictionary.riverstone similarity index 100% rename from share/dictionary.riverstone rename to share/dictionary/radius/dictionary.riverstone diff --git a/share/dictionary.roaringpenguin b/share/dictionary/radius/dictionary.roaringpenguin similarity index 100% rename from share/dictionary.roaringpenguin rename to share/dictionary/radius/dictionary.roaringpenguin diff --git a/share/dictionary.ruckus b/share/dictionary/radius/dictionary.ruckus similarity index 100% rename from share/dictionary.ruckus rename to share/dictionary/radius/dictionary.ruckus diff --git a/share/dictionary.ruggedcom b/share/dictionary/radius/dictionary.ruggedcom similarity index 100% rename from share/dictionary.ruggedcom rename to share/dictionary/radius/dictionary.ruggedcom diff --git a/share/dictionary.sandy b/share/dictionary/radius/dictionary.sandy similarity index 100% rename from share/dictionary.sandy rename to share/dictionary/radius/dictionary.sandy diff --git a/share/dictionary.sangoma b/share/dictionary/radius/dictionary.sangoma similarity index 100% rename from share/dictionary.sangoma rename to share/dictionary/radius/dictionary.sangoma diff --git a/share/dictionary.sg b/share/dictionary/radius/dictionary.sg similarity index 100% rename from share/dictionary.sg rename to share/dictionary/radius/dictionary.sg diff --git a/share/dictionary.shasta b/share/dictionary/radius/dictionary.shasta similarity index 100% rename from share/dictionary.shasta rename to share/dictionary/radius/dictionary.shasta diff --git a/share/dictionary.shiva b/share/dictionary/radius/dictionary.shiva similarity index 100% rename from share/dictionary.shiva rename to share/dictionary/radius/dictionary.shiva diff --git a/share/dictionary.siemens b/share/dictionary/radius/dictionary.siemens similarity index 100% rename from share/dictionary.siemens rename to share/dictionary/radius/dictionary.siemens diff --git a/share/dictionary.slipstream b/share/dictionary/radius/dictionary.slipstream similarity index 100% rename from share/dictionary.slipstream rename to share/dictionary/radius/dictionary.slipstream diff --git a/share/dictionary.sofaware b/share/dictionary/radius/dictionary.sofaware similarity index 100% rename from share/dictionary.sofaware rename to share/dictionary/radius/dictionary.sofaware diff --git a/share/dictionary.sonicwall b/share/dictionary/radius/dictionary.sonicwall similarity index 100% rename from share/dictionary.sonicwall rename to share/dictionary/radius/dictionary.sonicwall diff --git a/share/dictionary.springtide b/share/dictionary/radius/dictionary.springtide similarity index 100% rename from share/dictionary.springtide rename to share/dictionary/radius/dictionary.springtide diff --git a/share/dictionary.starent b/share/dictionary/radius/dictionary.starent similarity index 100% rename from share/dictionary.starent rename to share/dictionary/radius/dictionary.starent diff --git a/share/dictionary.starent.vsa1 b/share/dictionary/radius/dictionary.starent.vsa1 similarity index 100% rename from share/dictionary.starent.vsa1 rename to share/dictionary/radius/dictionary.starent.vsa1 diff --git a/share/dictionary.surfnet b/share/dictionary/radius/dictionary.surfnet similarity index 100% rename from share/dictionary.surfnet rename to share/dictionary/radius/dictionary.surfnet diff --git a/share/dictionary.symbol b/share/dictionary/radius/dictionary.symbol similarity index 100% rename from share/dictionary.symbol rename to share/dictionary/radius/dictionary.symbol diff --git a/share/dictionary.t_systems_nova b/share/dictionary/radius/dictionary.t_systems_nova similarity index 100% rename from share/dictionary.t_systems_nova rename to share/dictionary/radius/dictionary.t_systems_nova diff --git a/share/dictionary.telebit b/share/dictionary/radius/dictionary.telebit similarity index 100% rename from share/dictionary.telebit rename to share/dictionary/radius/dictionary.telebit diff --git a/share/dictionary.telkom b/share/dictionary/radius/dictionary.telkom similarity index 100% rename from share/dictionary.telkom rename to share/dictionary/radius/dictionary.telkom diff --git a/share/dictionary.terena b/share/dictionary/radius/dictionary.terena similarity index 100% rename from share/dictionary.terena rename to share/dictionary/radius/dictionary.terena diff --git a/share/dictionary.trapeze b/share/dictionary/radius/dictionary.trapeze similarity index 100% rename from share/dictionary.trapeze rename to share/dictionary/radius/dictionary.trapeze diff --git a/share/dictionary.travelping b/share/dictionary/radius/dictionary.travelping similarity index 100% rename from share/dictionary.travelping rename to share/dictionary/radius/dictionary.travelping diff --git a/share/dictionary.tropos b/share/dictionary/radius/dictionary.tropos similarity index 100% rename from share/dictionary.tropos rename to share/dictionary/radius/dictionary.tropos diff --git a/share/dictionary.ukerna b/share/dictionary/radius/dictionary.ukerna similarity index 100% rename from share/dictionary.ukerna rename to share/dictionary/radius/dictionary.ukerna diff --git a/share/dictionary.unisphere b/share/dictionary/radius/dictionary.unisphere similarity index 100% rename from share/dictionary.unisphere rename to share/dictionary/radius/dictionary.unisphere diff --git a/share/dictionary.unix b/share/dictionary/radius/dictionary.unix similarity index 100% rename from share/dictionary.unix rename to share/dictionary/radius/dictionary.unix diff --git a/share/dictionary.usr b/share/dictionary/radius/dictionary.usr similarity index 100% rename from share/dictionary.usr rename to share/dictionary/radius/dictionary.usr diff --git a/share/dictionary.usr.illegal b/share/dictionary/radius/dictionary.usr.illegal similarity index 93% rename from share/dictionary.usr.illegal rename to share/dictionary/radius/dictionary.usr.illegal index 3a27d684232..7fe7c4fe932 100644 --- a/share/dictionary.usr.illegal +++ b/share/dictionary/radius/dictionary.usr.illegal @@ -12,19 +12,21 @@ # # Prompt value should be 1 for echo, 0 for no echo, default 1. #ATTRIBUTE Prompt 64 integer -ATTRIBUTE Multi-Link-Flag 126 integer ATTRIBUTE Char-Noecho 250 integer # # USR specific Integer Translations # +ATTRIBUTE Termination-Action 29 integer VALUE Termination-Action Manage-Resources 2 +ATTRIBUTE Acct-Status-Type 40 integer VALUE Acct-Status-Type Modem-Start 4 VALUE Acct-Status-Type Modem-Stop 5 VALUE Acct-Status-Type Cancel 6 +ATTRIBUTE Multi-Link-Flag 126 integer VALUE Multi-Link-Flag True 1 VALUE Multi-Link-Flag False 0 diff --git a/share/dictionary.utstarcom b/share/dictionary/radius/dictionary.utstarcom similarity index 100% rename from share/dictionary.utstarcom rename to share/dictionary/radius/dictionary.utstarcom diff --git a/share/dictionary.valemount b/share/dictionary/radius/dictionary.valemount similarity index 100% rename from share/dictionary.valemount rename to share/dictionary/radius/dictionary.valemount diff --git a/share/dictionary.versanet b/share/dictionary/radius/dictionary.versanet similarity index 100% rename from share/dictionary.versanet rename to share/dictionary/radius/dictionary.versanet diff --git a/share/dictionary.walabi b/share/dictionary/radius/dictionary.walabi similarity index 100% rename from share/dictionary.walabi rename to share/dictionary/radius/dictionary.walabi diff --git a/share/dictionary.waverider b/share/dictionary/radius/dictionary.waverider similarity index 100% rename from share/dictionary.waverider rename to share/dictionary/radius/dictionary.waverider diff --git a/share/dictionary.wichorus b/share/dictionary/radius/dictionary.wichorus similarity index 100% rename from share/dictionary.wichorus rename to share/dictionary/radius/dictionary.wichorus diff --git a/share/dictionary.wifialliance b/share/dictionary/radius/dictionary.wifialliance similarity index 100% rename from share/dictionary.wifialliance rename to share/dictionary/radius/dictionary.wifialliance diff --git a/share/dictionary.wimax b/share/dictionary/radius/dictionary.wimax similarity index 100% rename from share/dictionary.wimax rename to share/dictionary/radius/dictionary.wimax diff --git a/share/dictionary.wimax.alvarion b/share/dictionary/radius/dictionary.wimax.alvarion similarity index 100% rename from share/dictionary.wimax.alvarion rename to share/dictionary/radius/dictionary.wimax.alvarion diff --git a/share/dictionary.wimax.wichorus b/share/dictionary/radius/dictionary.wimax.wichorus similarity index 100% rename from share/dictionary.wimax.wichorus rename to share/dictionary/radius/dictionary.wimax.wichorus diff --git a/share/dictionary.wispr b/share/dictionary/radius/dictionary.wispr similarity index 100% rename from share/dictionary.wispr rename to share/dictionary/radius/dictionary.wispr diff --git a/share/dictionary.xedia b/share/dictionary/radius/dictionary.xedia similarity index 100% rename from share/dictionary.xedia rename to share/dictionary/radius/dictionary.xedia diff --git a/share/dictionary.xirrus b/share/dictionary/radius/dictionary.xirrus similarity index 100% rename from share/dictionary.xirrus rename to share/dictionary/radius/dictionary.xirrus diff --git a/share/dictionary.xylan b/share/dictionary/radius/dictionary.xylan similarity index 100% rename from share/dictionary.xylan rename to share/dictionary/radius/dictionary.xylan diff --git a/share/dictionary.yubico b/share/dictionary/radius/dictionary.yubico similarity index 100% rename from share/dictionary.yubico rename to share/dictionary/radius/dictionary.yubico diff --git a/share/dictionary.zeus b/share/dictionary/radius/dictionary.zeus similarity index 100% rename from share/dictionary.zeus rename to share/dictionary/radius/dictionary.zeus diff --git a/share/dictionary.zte b/share/dictionary/radius/dictionary.zte similarity index 100% rename from share/dictionary.zte rename to share/dictionary/radius/dictionary.zte diff --git a/share/dictionary.zyxel b/share/dictionary/radius/dictionary.zyxel similarity index 100% rename from share/dictionary.zyxel rename to share/dictionary/radius/dictionary.zyxel diff --git a/share/dictionary/snmp/dictionary b/share/dictionary/snmp/dictionary new file mode 100644 index 00000000000..a67d82e9781 --- /dev/null +++ b/share/dictionary/snmp/dictionary @@ -0,0 +1,14 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# The FreeRADIUS Vendor-Specific dictionary for SNMP operations. +# +# Version: $Id$ +# + +PROTOCOL SNMP 3 format=4 +BEGIN-PROTOCOL SNMP + +$INCLUDE dictionary.freeradius + +END-PROTOCOL SNMP diff --git a/share/dictionary.freeradius.snmp b/share/dictionary/snmp/dictionary.freeradius similarity index 98% rename from share/dictionary.freeradius.snmp rename to share/dictionary/snmp/dictionary.freeradius index 6169f426096..9badc1a29a4 100644 --- a/share/dictionary.freeradius.snmp +++ b/share/dictionary/snmp/dictionary.freeradius @@ -6,8 +6,6 @@ # Version: $Id$ # -BEGIN-VENDOR FreeRADIUS format=Extended-Vendor-Specific-1 - ATTRIBUTE FreeRADIUS-SNMP-Operation 10 byte VALUE FreeRADIUS-SNMP-Operation ping 0 @@ -120,5 +118,3 @@ END-TLV Radius-Auth-Client-Ext-Entry END-TLV Radius-Auth-Serv END-TLV FreeRADIUS-Mib-2 - -END-VENDOR FreeRADIUS diff --git a/share/dictionary/tacacs/dictionary b/share/dictionary/tacacs/dictionary new file mode 100644 index 00000000000..9620a9ecba5 --- /dev/null +++ b/share/dictionary/tacacs/dictionary @@ -0,0 +1,14 @@ +# -*- text -*- +# Copyright (C) 2017 The FreeRADIUS Server project and contributors +# +# The FreeRADIUS Vendor-Specific dictionary for SNMP operations. +# +# Version: $Id$ +# + +PROTOCOL TACACS 5 +BEGIN-PROTOCOL TACACS + +$INCLUDE dictionary.tacacs + +END-PROTOCOL TACACS diff --git a/share/dictionary.tacacs b/share/dictionary/tacacs/dictionary.tacacs similarity index 98% rename from share/dictionary.tacacs rename to share/dictionary/tacacs/dictionary.tacacs index 59f00df275c..de834953bdd 100644 --- a/share/dictionary.tacacs +++ b/share/dictionary/tacacs/dictionary.tacacs @@ -1,6 +1,6 @@ # -*- text -*- # Copyright (C) 2017 The FreeRADIUS Server project and contributors -# Copyright 2017 Network RADIUS SARL +# Copyright (C) 2017 Network RADIUS SARL # # Non Protocol Attributes used by FreeRADIUS # diff --git a/share/dictionary/vqp/dictionary b/share/dictionary/vqp/dictionary new file mode 100644 index 00000000000..2889f32c394 --- /dev/null +++ b/share/dictionary/vqp/dictionary @@ -0,0 +1,14 @@ +# -*- text -*- +# Copyright (C) 2016 The FreeRADIUS Server project and contributors +# +# The FreeRADIUS Vendor-Specific dictionary for SNMP operations. +# +# Version: $Id$ +# + +PROTOCOL VQP 6 format=2 +BEGIN-PROTOCOL VQP + +$INCLUDE dictionary.vqp + +END-PROTOCOL VQP diff --git a/share/dictionary.vqp b/share/dictionary/vqp/dictionary.vqp similarity index 100% rename from share/dictionary.vqp rename to share/dictionary/vqp/dictionary.vqp diff --git a/src/tests/dictionary.test b/src/tests/dictionary similarity index 100% rename from src/tests/dictionary.test rename to src/tests/dictionary diff --git a/src/tests/unit/dictionary.unit b/src/tests/unit/dictionary.unit index 536b0573ca8..b62c7e8c980 100644 --- a/src/tests/unit/dictionary.unit +++ b/src/tests/unit/dictionary.unit @@ -4,6 +4,7 @@ # We use 241-255 from the "reserved" space, which means that # these tests won't affect real attributes # +ATTRIBUTE Unit-Root-241 241 tlv ATTRIBUTE Unit-Integer 241.241 integer ATTRIBUTE Unit-Octets 241.242 octets ATTRIBUTE Unit-TLV 241.243 tlv @@ -40,15 +41,23 @@ ATTRIBUTE Unit-Struct4-Short .3 uint16 ATTRIBUTE Unit-TLV-Integer 241.243.1 integer +ATTRIBUTE Unit-Root-246 246 tlv ATTRIBUTE Unit-Long-Octets 246.241 octets -BEGIN-Vendor FreeRADIUS format=Extended-Vendor-Specific-2 +ATTRIBUTE Extended-Attribute-1 241 extended +ATTRIBUTE Extended-Attribute-2 242 extended + +ATTRIBUTE Extended-Vendor-Specific-1 241.26 evs +ATTRIBUTE Extended-Vendor-Specific-2 242.26 evs + +VENDOR FreeRADIUS 1 +BEGIN-Vendor FreeRADIUS format=Extended-Vendor-Specific-1 ATTRIBUTE Unit-EVS-Integer 1 integer ATTRIBUTE Unit-EVS-Octets 2 octets END-Vendor FreeRADIUS -BEGIN-Vendor FreeRADIUS format=Extended-Vendor-Specific-5 +BEGIN-Vendor FreeRADIUS format=Extended-Vendor-Specific-2 ATTRIBUTE Unit-EVS-5-Integer 1 integer ATTRIBUTE Unit-EVS-5-Octets 2 octets