From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 22 Jan 2025 16:50:46 +0000 (-0500)
Subject: update docs and rename
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38571c5e;p=thirdparty%2Ffreeradius-server.git

update docs and rename

after some thought (finally), it makes more sense to drop the
"alias/foo.txt" names, and instead use "v3/dictionary.foo".

It is now clearer that the names are for v3 compatibility.
---

diff --git a/raddb/dictionary b/raddb/dictionary
index 0c984250306..db677b5d35c 100644
--- a/raddb/dictionary
+++ b/raddb/dictionary
@@ -87,37 +87,43 @@
 #DEFINE	My-Local-Integer	integer
 
 #
-#  ## v3 Compatible names.
-#
-#  All of the attributes have been renamed from v3.  This change was
-#  necessary in order to support new functionality in v4.  The
-#  unfortunate side effect of this change is that all of the names in
-#  SQL, LDAP, and the "files" module are incompatible with v4.
-#
-#  We recognize that is is difficult to change every entry in a
-#  database, especially when there's no clear mapping between the
-#  "old" and "new" names.  This renaming is made more complex because
-#  the "new" names need to be grouped and arranged in ways that the
-#  old ones were not.
-#
-#  The "old" names were all in flat lists, so that User-Name appeared
-#  next to Cisco-AVPAir.  This organization was simple enough to work
-#  for 20 years, but its time has come.  The new names are
-#  hierarchical, so that the organization is nested by definition.
-#
-#  For v4, the Cisco-AVPair attribute is called "AVPair", and it lives
-#  inside of the "Cisco" namespace, which in turn lives inside of the
-#  "Vendor-Specific" namespace.  So the new name for Cisco-AVPair is
-#  Vendor-Specific.Cisco.AVPair.
-#
-#  This process continues for many thousands of vendor-specific
-#  attributes.
-#
-#  Happily, it is possible to (mostly) use the old names with v4.
-#  There are limitations, but it will mostly work.  The main reason
-#  for enabling the old names is to try out v4 with a database that is
-#  also used by v3.  This lets you test that v4 works, without going
-#  through a complex "upgrade everything" process.
+#  ## v3 Compatibility and Migration
+#
+#  By default, the server does NOT load the v3 names.  While this
+#  behavior is done to simplify the server configuration, it can also
+#  make migration more difficult.
+#
+#  If your system is using Vendor-Specific attributes from a
+#  particular vendor, you can list those dictionaries below.  The
+#  server will then load the version 3 names, which makes migration
+#  much simpler.
+#
+#  For v4, all of the attributes have been renamed from v3.  This
+#  change was necessary in order to support new functionality.  The
+#  unfortunate side effect of this change is that all of the names
+#  used by v3 in tje SQL, LDAP, and "files" module are incompatible
+#  with v4.
+#
+#  The problem with v3 was that names were all in flat lists, so that
+#  User-Name appeared in the same to Cisco-AVPAir.  This organization
+#  was simple enough to work for 25 years, but its time has come.  The
+#  new names are hierarchical, which means they are organized into a
+#  tree-like structure.
+#
+#  For v4, the Cisco-AVPair attribute is now called "AVPair".  It
+#  lives inside of the "Cisco" namespace, which in turn lives inside
+#  of the "Vendor-Specific" namespace.  So the new name for
+#  `Cisco-AVPair` is `Vendor-Specific.Cisco.AVPair`.
+#
+#  These changes have been made for many hundreds of dictionary files,
+#  and many thousands of Vendor-Specific attributes.
+#
+#  In the interest of compatibility, is possible to use the old names
+#  with v4.  There are limitations, but it will generally work.  The
+#  main reason for enabling the old names is to try out v4 with a
+#  database that is also used by v3.  This lets you test that v4
+#  works, without going through a complex "upgrade everything"
+#  process.
 #
 #  The old v3 names are in "alias" dictionaries, in the `${dictdir}`
 #  directory.  To find out where this directory is on your local
@@ -126,14 +132,14 @@
 #  files are located.
 #
 #  The v3 names are in `${dictdir}/radius/alias/VENDOR.txt` where
-#  _VENDOR_ is the name of the vendor, which is taken from the `VENDOR`
-#  definition in the v3 dictionaries.
+#  _VENDOR_ is the name taken from the v3 `dictionary.VENDOR`.
 #
-#  You will need to add a `$INCLUDE` line for each vendor-specific
-#  dictionary which is used by your local system.  The default v4
-#  dictionaries do not enable all of v3 compatibility names.
+#  You will need to edit the text below to add a `$INCLUDE` line for
+#  each vendor-specific dictionary which is used by your local system.
+#  The default v4 dictionaries do not enable all of v3 compatibility
+#  names.
 #
-#  Yes, we recognize that this process is a bit of work.  However, we
+#  We recognize that this process is a bit of work.  However, we
 #  wish to encourage everyone using v4 to upgrade to using the new v4
 #  features.  Our experience shows that if we automatically enable
 #  "compatibility functions", then those compatibility functions will
@@ -142,10 +148,16 @@
 #  ongoing support.  Complex upgrades make ongoing support easier, but
 #  also make it less likely that people will upgrade.
 #
+#  Note that if you over-write the "v3/dictionary.VENDOR" files with a
+#  copy of the v3 dictionary, then it won't work.  Migrations across
+#  major version numbers means that the configuration files are *not*
+#  100% compatible. This includes the dictionaries!
 #
 #  All of the v3 compatibility names are in the RADIUS namespace.
+#  There are no aliases for DHCPv4.
 #
 
 #BEGIN-PROTOCOL RADIUS
-#$INCLUDE ${dictdir}/radius/alias/cisco.txt
+#$INCLUDE ${dictdir}/radius/v3/dictionary.cisco
+#$INCLUDE ${dictdir}/radius/v3/dictionary.aruba
 #END-PROTOCOL RADIUS
diff --git a/raddb/radiusd.conf.in b/raddb/radiusd.conf.in
index 8ae2a64d5ff..4908aeceae2 100644
--- a/raddb/radiusd.conf.in
+++ b/raddb/radiusd.conf.in
@@ -648,6 +648,8 @@ global {
 #  Some of these flags can also be passed on the command line as
 #  `-S flag=value`.
 #
+#  Dictionary migration instructions can be found in `${raddbdir}/dictionary`.
+#
 migrate {
 	#
 	#  rewrite_update:: Rewrite old `update` sections to use the new
diff --git a/share/dictionary/radius/v3/README.md b/share/dictionary/radius/v3/README.md
new file mode 100644
index 00000000000..529d2111e95
--- /dev/null
+++ b/share/dictionary/radius/v3/README.md
@@ -0,0 +1,8 @@
+# v3 Compatibility Dictionaries
+
+The dictionaries in this directory allow the use of v3 names in v4.
+
+See ${raddbdir}/dictionary for more information.
+
+Do NOT copy the v3 dictionaries to this directory.  The files are NOT
+compatible.
diff --git a/share/dictionary/radius/alias/3com.txt b/share/dictionary/radius/v3/dictionary.3com
similarity index 100%
rename from share/dictionary/radius/alias/3com.txt
rename to share/dictionary/radius/v3/dictionary.3com
diff --git a/share/dictionary/radius/alias/3gpp.txt b/share/dictionary/radius/v3/dictionary.3gpp
similarity index 100%
rename from share/dictionary/radius/alias/3gpp.txt
rename to share/dictionary/radius/v3/dictionary.3gpp
diff --git a/share/dictionary/radius/alias/3gpp2.txt b/share/dictionary/radius/v3/dictionary.3gpp2
similarity index 100%
rename from share/dictionary/radius/alias/3gpp2.txt
rename to share/dictionary/radius/v3/dictionary.3gpp2
diff --git a/share/dictionary/radius/alias/acc.txt b/share/dictionary/radius/v3/dictionary.acc
similarity index 100%
rename from share/dictionary/radius/alias/acc.txt
rename to share/dictionary/radius/v3/dictionary.acc
diff --git a/share/dictionary/radius/alias/acme.txt b/share/dictionary/radius/v3/dictionary.acme
similarity index 100%
rename from share/dictionary/radius/alias/acme.txt
rename to share/dictionary/radius/v3/dictionary.acme
diff --git a/share/dictionary/radius/alias/actelis.txt b/share/dictionary/radius/v3/dictionary.actelis
similarity index 100%
rename from share/dictionary/radius/alias/actelis.txt
rename to share/dictionary/radius/v3/dictionary.actelis
diff --git a/share/dictionary/radius/alias/adsl-forum.txt b/share/dictionary/radius/v3/dictionary.adsl-forum
similarity index 100%
rename from share/dictionary/radius/alias/adsl-forum.txt
rename to share/dictionary/radius/v3/dictionary.adsl-forum
diff --git a/share/dictionary/radius/alias/adtran.txt b/share/dictionary/radius/v3/dictionary.adtran
similarity index 100%
rename from share/dictionary/radius/alias/adtran.txt
rename to share/dictionary/radius/v3/dictionary.adtran
diff --git a/share/dictionary/radius/alias/aerohive.txt b/share/dictionary/radius/v3/dictionary.aerohive
similarity index 100%
rename from share/dictionary/radius/alias/aerohive.txt
rename to share/dictionary/radius/v3/dictionary.aerohive
diff --git a/share/dictionary/radius/alias/airespace.txt b/share/dictionary/radius/v3/dictionary.airespace
similarity index 100%
rename from share/dictionary/radius/alias/airespace.txt
rename to share/dictionary/radius/v3/dictionary.airespace
diff --git a/share/dictionary/radius/alias/alcatel.txt b/share/dictionary/radius/v3/dictionary.alcatel
similarity index 100%
rename from share/dictionary/radius/alias/alcatel.txt
rename to share/dictionary/radius/v3/dictionary.alcatel
diff --git a/share/dictionary/radius/alias/alcatel-esam.txt b/share/dictionary/radius/v3/dictionary.alcatel-esam
similarity index 100%
rename from share/dictionary/radius/alias/alcatel-esam.txt
rename to share/dictionary/radius/v3/dictionary.alcatel-esam
diff --git a/share/dictionary/radius/alias/alcatel-lucent-service-router.txt b/share/dictionary/radius/v3/dictionary.alcatel-lucent-service-router
similarity index 100%
rename from share/dictionary/radius/alias/alcatel-lucent-service-router.txt
rename to share/dictionary/radius/v3/dictionary.alcatel-lucent-service-router
diff --git a/share/dictionary/radius/alias/alteon.txt b/share/dictionary/radius/v3/dictionary.alteon
similarity index 100%
rename from share/dictionary/radius/alias/alteon.txt
rename to share/dictionary/radius/v3/dictionary.alteon
diff --git a/share/dictionary/radius/alias/alu-aaa.txt b/share/dictionary/radius/v3/dictionary.alu-aaa
similarity index 100%
rename from share/dictionary/radius/alias/alu-aaa.txt
rename to share/dictionary/radius/v3/dictionary.alu-aaa
diff --git a/share/dictionary/radius/alias/alvarion.txt b/share/dictionary/radius/v3/dictionary.alvarion
similarity index 100%
rename from share/dictionary/radius/alias/alvarion.txt
rename to share/dictionary/radius/v3/dictionary.alvarion
diff --git a/share/dictionary/radius/alias/apc.txt b/share/dictionary/radius/v3/dictionary.apc
similarity index 100%
rename from share/dictionary/radius/alias/apc.txt
rename to share/dictionary/radius/v3/dictionary.apc
diff --git a/share/dictionary/radius/alias/aptilo.txt b/share/dictionary/radius/v3/dictionary.aptilo
similarity index 100%
rename from share/dictionary/radius/alias/aptilo.txt
rename to share/dictionary/radius/v3/dictionary.aptilo
diff --git a/share/dictionary/radius/alias/aptis.txt b/share/dictionary/radius/v3/dictionary.aptis
similarity index 100%
rename from share/dictionary/radius/alias/aptis.txt
rename to share/dictionary/radius/v3/dictionary.aptis
diff --git a/share/dictionary/radius/alias/arbor.txt b/share/dictionary/radius/v3/dictionary.arbor
similarity index 100%
rename from share/dictionary/radius/alias/arbor.txt
rename to share/dictionary/radius/v3/dictionary.arbor
diff --git a/share/dictionary/radius/alias/arista.txt b/share/dictionary/radius/v3/dictionary.arista
similarity index 100%
rename from share/dictionary/radius/alias/arista.txt
rename to share/dictionary/radius/v3/dictionary.arista
diff --git a/share/dictionary/radius/alias/aruba.txt b/share/dictionary/radius/v3/dictionary.aruba
similarity index 100%
rename from share/dictionary/radius/alias/aruba.txt
rename to share/dictionary/radius/v3/dictionary.aruba
diff --git a/share/dictionary/radius/alias/ascend.txt b/share/dictionary/radius/v3/dictionary.ascend
similarity index 100%
rename from share/dictionary/radius/alias/ascend.txt
rename to share/dictionary/radius/v3/dictionary.ascend
diff --git a/share/dictionary/radius/alias/asn.txt b/share/dictionary/radius/v3/dictionary.asn
similarity index 100%
rename from share/dictionary/radius/alias/asn.txt
rename to share/dictionary/radius/v3/dictionary.asn
diff --git a/share/dictionary/radius/alias/audiocodes.txt b/share/dictionary/radius/v3/dictionary.audiocodes
similarity index 100%
rename from share/dictionary/radius/alias/audiocodes.txt
rename to share/dictionary/radius/v3/dictionary.audiocodes
diff --git a/share/dictionary/radius/alias/azaire.txt b/share/dictionary/radius/v3/dictionary.azaire
similarity index 100%
rename from share/dictionary/radius/alias/azaire.txt
rename to share/dictionary/radius/v3/dictionary.azaire
diff --git a/share/dictionary/radius/alias/bay-networks.txt b/share/dictionary/radius/v3/dictionary.bay-networks
similarity index 100%
rename from share/dictionary/radius/alias/bay-networks.txt
rename to share/dictionary/radius/v3/dictionary.bay-networks
diff --git a/share/dictionary/radius/alias/big-switch-networks.txt b/share/dictionary/radius/v3/dictionary.big-switch-networks
similarity index 100%
rename from share/dictionary/radius/alias/big-switch-networks.txt
rename to share/dictionary/radius/v3/dictionary.big-switch-networks
diff --git a/share/dictionary/radius/alias/bintec.txt b/share/dictionary/radius/v3/dictionary.bintec
similarity index 100%
rename from share/dictionary/radius/alias/bintec.txt
rename to share/dictionary/radius/v3/dictionary.bintec
diff --git a/share/dictionary/radius/alias/bluecoat.txt b/share/dictionary/radius/v3/dictionary.bluecoat
similarity index 100%
rename from share/dictionary/radius/alias/bluecoat.txt
rename to share/dictionary/radius/v3/dictionary.bluecoat
diff --git a/share/dictionary/radius/alias/boingo.txt b/share/dictionary/radius/v3/dictionary.boingo
similarity index 100%
rename from share/dictionary/radius/alias/boingo.txt
rename to share/dictionary/radius/v3/dictionary.boingo
diff --git a/share/dictionary/radius/alias/bristol.txt b/share/dictionary/radius/v3/dictionary.bristol
similarity index 100%
rename from share/dictionary/radius/alias/bristol.txt
rename to share/dictionary/radius/v3/dictionary.bristol
diff --git a/share/dictionary/radius/alias/broadsoft.txt b/share/dictionary/radius/v3/dictionary.broadsoft
similarity index 100%
rename from share/dictionary/radius/alias/broadsoft.txt
rename to share/dictionary/radius/v3/dictionary.broadsoft
diff --git a/share/dictionary/radius/alias/brocade.txt b/share/dictionary/radius/v3/dictionary.brocade
similarity index 100%
rename from share/dictionary/radius/alias/brocade.txt
rename to share/dictionary/radius/v3/dictionary.brocade
diff --git a/share/dictionary/radius/alias/bskyb.txt b/share/dictionary/radius/v3/dictionary.bskyb
similarity index 100%
rename from share/dictionary/radius/alias/bskyb.txt
rename to share/dictionary/radius/v3/dictionary.bskyb
diff --git a/share/dictionary/radius/alias/bt.txt b/share/dictionary/radius/v3/dictionary.bt
similarity index 100%
rename from share/dictionary/radius/alias/bt.txt
rename to share/dictionary/radius/v3/dictionary.bt
diff --git a/share/dictionary/radius/alias/cablelabs.txt b/share/dictionary/radius/v3/dictionary.cablelabs
similarity index 100%
rename from share/dictionary/radius/alias/cablelabs.txt
rename to share/dictionary/radius/v3/dictionary.cablelabs
diff --git a/share/dictionary/radius/alias/cabletron.txt b/share/dictionary/radius/v3/dictionary.cabletron
similarity index 100%
rename from share/dictionary/radius/alias/cabletron.txt
rename to share/dictionary/radius/v3/dictionary.cabletron
diff --git a/share/dictionary/radius/alias/cajun_p330.txt b/share/dictionary/radius/v3/dictionary.cajun_p330
similarity index 100%
rename from share/dictionary/radius/alias/cajun_p330.txt
rename to share/dictionary/radius/v3/dictionary.cajun_p330
diff --git a/share/dictionary/radius/alias/camiant.txt b/share/dictionary/radius/v3/dictionary.camiant
similarity index 100%
rename from share/dictionary/radius/alias/camiant.txt
rename to share/dictionary/radius/v3/dictionary.camiant
diff --git a/share/dictionary/radius/alias/centec.txt b/share/dictionary/radius/v3/dictionary.centec
similarity index 100%
rename from share/dictionary/radius/alias/centec.txt
rename to share/dictionary/radius/v3/dictionary.centec
diff --git a/share/dictionary/radius/alias/checkpoint.txt b/share/dictionary/radius/v3/dictionary.checkpoint
similarity index 100%
rename from share/dictionary/radius/alias/checkpoint.txt
rename to share/dictionary/radius/v3/dictionary.checkpoint
diff --git a/share/dictionary/radius/alias/chillispot.txt b/share/dictionary/radius/v3/dictionary.chillispot
similarity index 100%
rename from share/dictionary/radius/alias/chillispot.txt
rename to share/dictionary/radius/v3/dictionary.chillispot
diff --git a/share/dictionary/radius/alias/cisco.txt b/share/dictionary/radius/v3/dictionary.cisco
similarity index 100%
rename from share/dictionary/radius/alias/cisco.txt
rename to share/dictionary/radius/v3/dictionary.cisco
diff --git a/share/dictionary/radius/alias/cisco-asa.txt b/share/dictionary/radius/v3/dictionary.cisco-asa
similarity index 100%
rename from share/dictionary/radius/alias/cisco-asa.txt
rename to share/dictionary/radius/v3/dictionary.cisco-asa
diff --git a/share/dictionary/radius/alias/cisco-bbsm.txt b/share/dictionary/radius/v3/dictionary.cisco-bbsm
similarity index 100%
rename from share/dictionary/radius/alias/cisco-bbsm.txt
rename to share/dictionary/radius/v3/dictionary.cisco-bbsm
diff --git a/share/dictionary/radius/alias/citrix.txt b/share/dictionary/radius/v3/dictionary.citrix
similarity index 100%
rename from share/dictionary/radius/alias/citrix.txt
rename to share/dictionary/radius/v3/dictionary.citrix
diff --git a/share/dictionary/radius/alias/clavister.txt b/share/dictionary/radius/v3/dictionary.clavister
similarity index 100%
rename from share/dictionary/radius/alias/clavister.txt
rename to share/dictionary/radius/v3/dictionary.clavister
diff --git a/share/dictionary/radius/alias/cnergee.txt b/share/dictionary/radius/v3/dictionary.cnergee
similarity index 100%
rename from share/dictionary/radius/alias/cnergee.txt
rename to share/dictionary/radius/v3/dictionary.cnergee
diff --git a/share/dictionary/radius/alias/colubris.txt b/share/dictionary/radius/v3/dictionary.colubris
similarity index 100%
rename from share/dictionary/radius/alias/colubris.txt
rename to share/dictionary/radius/v3/dictionary.colubris
diff --git a/share/dictionary/radius/alias/columbia-university.txt b/share/dictionary/radius/v3/dictionary.columbia-university
similarity index 100%
rename from share/dictionary/radius/alias/columbia-university.txt
rename to share/dictionary/radius/v3/dictionary.columbia-university
diff --git a/share/dictionary/radius/alias/compatible.txt b/share/dictionary/radius/v3/dictionary.compatible
similarity index 100%
rename from share/dictionary/radius/alias/compatible.txt
rename to share/dictionary/radius/v3/dictionary.compatible
diff --git a/share/dictionary/radius/alias/cosine.txt b/share/dictionary/radius/v3/dictionary.cosine
similarity index 100%
rename from share/dictionary/radius/alias/cosine.txt
rename to share/dictionary/radius/v3/dictionary.cosine
diff --git a/share/dictionary/radius/alias/dante.txt b/share/dictionary/radius/v3/dictionary.dante
similarity index 100%
rename from share/dictionary/radius/alias/dante.txt
rename to share/dictionary/radius/v3/dictionary.dante
diff --git a/share/dictionary/radius/alias/dellemc.txt b/share/dictionary/radius/v3/dictionary.dellemc
similarity index 100%
rename from share/dictionary/radius/alias/dellemc.txt
rename to share/dictionary/radius/v3/dictionary.dellemc
diff --git a/share/dictionary/radius/alias/digium.txt b/share/dictionary/radius/v3/dictionary.digium
similarity index 100%
rename from share/dictionary/radius/alias/digium.txt
rename to share/dictionary/radius/v3/dictionary.digium
diff --git a/share/dictionary/radius/alias/dlink.txt b/share/dictionary/radius/v3/dictionary.dlink
similarity index 100%
rename from share/dictionary/radius/alias/dlink.txt
rename to share/dictionary/radius/v3/dictionary.dlink
diff --git a/share/dictionary/radius/alias/dragonwave.txt b/share/dictionary/radius/v3/dictionary.dragonwave
similarity index 100%
rename from share/dictionary/radius/alias/dragonwave.txt
rename to share/dictionary/radius/v3/dictionary.dragonwave
diff --git a/share/dictionary/radius/alias/efficientip.txt b/share/dictionary/radius/v3/dictionary.efficientip
similarity index 100%
rename from share/dictionary/radius/alias/efficientip.txt
rename to share/dictionary/radius/v3/dictionary.efficientip
diff --git a/share/dictionary/radius/alias/eltex.txt b/share/dictionary/radius/v3/dictionary.eltex
similarity index 100%
rename from share/dictionary/radius/alias/eltex.txt
rename to share/dictionary/radius/v3/dictionary.eltex
diff --git a/share/dictionary/radius/alias/epygi.txt b/share/dictionary/radius/v3/dictionary.epygi
similarity index 100%
rename from share/dictionary/radius/alias/epygi.txt
rename to share/dictionary/radius/v3/dictionary.epygi
diff --git a/share/dictionary/radius/alias/equallogic.txt b/share/dictionary/radius/v3/dictionary.equallogic
similarity index 100%
rename from share/dictionary/radius/alias/equallogic.txt
rename to share/dictionary/radius/v3/dictionary.equallogic
diff --git a/share/dictionary/radius/alias/ericsson.txt b/share/dictionary/radius/v3/dictionary.ericsson
similarity index 100%
rename from share/dictionary/radius/alias/ericsson.txt
rename to share/dictionary/radius/v3/dictionary.ericsson
diff --git a/share/dictionary/radius/alias/ericsson-ab.txt b/share/dictionary/radius/v3/dictionary.ericsson-ab
similarity index 100%
rename from share/dictionary/radius/alias/ericsson-ab.txt
rename to share/dictionary/radius/v3/dictionary.ericsson-ab
diff --git a/share/dictionary/radius/alias/ericsson-packet-core-networks.txt b/share/dictionary/radius/v3/dictionary.ericsson-packet-core-networks
similarity index 100%
rename from share/dictionary/radius/alias/ericsson-packet-core-networks.txt
rename to share/dictionary/radius/v3/dictionary.ericsson-packet-core-networks
diff --git a/share/dictionary/radius/alias/erx.txt b/share/dictionary/radius/v3/dictionary.erx
similarity index 100%
rename from share/dictionary/radius/alias/erx.txt
rename to share/dictionary/radius/v3/dictionary.erx
diff --git a/share/dictionary/radius/alias/extreme.txt b/share/dictionary/radius/v3/dictionary.extreme
similarity index 100%
rename from share/dictionary/radius/alias/extreme.txt
rename to share/dictionary/radius/v3/dictionary.extreme
diff --git a/share/dictionary/radius/alias/f5.txt b/share/dictionary/radius/v3/dictionary.f5
similarity index 100%
rename from share/dictionary/radius/alias/f5.txt
rename to share/dictionary/radius/v3/dictionary.f5
diff --git a/share/dictionary/radius/alias/fdxtended.txt b/share/dictionary/radius/v3/dictionary.fdxtended
similarity index 100%
rename from share/dictionary/radius/alias/fdxtended.txt
rename to share/dictionary/radius/v3/dictionary.fdxtended
diff --git a/share/dictionary/radius/alias/force10.txt b/share/dictionary/radius/v3/dictionary.force10
similarity index 100%
rename from share/dictionary/radius/alias/force10.txt
rename to share/dictionary/radius/v3/dictionary.force10
diff --git a/share/dictionary/radius/alias/fortinet.txt b/share/dictionary/radius/v3/dictionary.fortinet
similarity index 100%
rename from share/dictionary/radius/alias/fortinet.txt
rename to share/dictionary/radius/v3/dictionary.fortinet
diff --git a/share/dictionary/radius/alias/foundry.txt b/share/dictionary/radius/v3/dictionary.foundry
similarity index 100%
rename from share/dictionary/radius/alias/foundry.txt
rename to share/dictionary/radius/v3/dictionary.foundry
diff --git a/share/dictionary/radius/alias/freeradius.txt b/share/dictionary/radius/v3/dictionary.freeradius
similarity index 100%
rename from share/dictionary/radius/alias/freeradius.txt
rename to share/dictionary/radius/v3/dictionary.freeradius
diff --git a/share/dictionary/radius/alias/freeswitch.txt b/share/dictionary/radius/v3/dictionary.freeswitch
similarity index 100%
rename from share/dictionary/radius/alias/freeswitch.txt
rename to share/dictionary/radius/v3/dictionary.freeswitch
diff --git a/share/dictionary/radius/alias/gandalf.txt b/share/dictionary/radius/v3/dictionary.gandalf
similarity index 100%
rename from share/dictionary/radius/alias/gandalf.txt
rename to share/dictionary/radius/v3/dictionary.gandalf
diff --git a/share/dictionary/radius/alias/garderos.txt b/share/dictionary/radius/v3/dictionary.garderos
similarity index 100%
rename from share/dictionary/radius/alias/garderos.txt
rename to share/dictionary/radius/v3/dictionary.garderos
diff --git a/share/dictionary/radius/alias/gemtek.txt b/share/dictionary/radius/v3/dictionary.gemtek
similarity index 100%
rename from share/dictionary/radius/alias/gemtek.txt
rename to share/dictionary/radius/v3/dictionary.gemtek
diff --git a/share/dictionary/radius/alias/h3c.txt b/share/dictionary/radius/v3/dictionary.h3c
similarity index 100%
rename from share/dictionary/radius/alias/h3c.txt
rename to share/dictionary/radius/v3/dictionary.h3c
diff --git a/share/dictionary/radius/alias/hillstone.txt b/share/dictionary/radius/v3/dictionary.hillstone
similarity index 100%
rename from share/dictionary/radius/alias/hillstone.txt
rename to share/dictionary/radius/v3/dictionary.hillstone
diff --git a/share/dictionary/radius/alias/hp.txt b/share/dictionary/radius/v3/dictionary.hp
similarity index 100%
rename from share/dictionary/radius/alias/hp.txt
rename to share/dictionary/radius/v3/dictionary.hp
diff --git a/share/dictionary/radius/alias/huawei.txt b/share/dictionary/radius/v3/dictionary.huawei
similarity index 100%
rename from share/dictionary/radius/alias/huawei.txt
rename to share/dictionary/radius/v3/dictionary.huawei
diff --git a/share/dictionary/radius/alias/iea-software.txt b/share/dictionary/radius/v3/dictionary.iea-software
similarity index 100%
rename from share/dictionary/radius/alias/iea-software.txt
rename to share/dictionary/radius/v3/dictionary.iea-software
diff --git a/share/dictionary/radius/alias/infinera.txt b/share/dictionary/radius/v3/dictionary.infinera
similarity index 100%
rename from share/dictionary/radius/alias/infinera.txt
rename to share/dictionary/radius/v3/dictionary.infinera
diff --git a/share/dictionary/radius/alias/infoblox.txt b/share/dictionary/radius/v3/dictionary.infoblox
similarity index 100%
rename from share/dictionary/radius/alias/infoblox.txt
rename to share/dictionary/radius/v3/dictionary.infoblox
diff --git a/share/dictionary/radius/alias/infonet.txt b/share/dictionary/radius/v3/dictionary.infonet
similarity index 100%
rename from share/dictionary/radius/alias/infonet.txt
rename to share/dictionary/radius/v3/dictionary.infonet
diff --git a/share/dictionary/radius/alias/ipunplugged.txt b/share/dictionary/radius/v3/dictionary.ipunplugged
similarity index 100%
rename from share/dictionary/radius/alias/ipunplugged.txt
rename to share/dictionary/radius/v3/dictionary.ipunplugged
diff --git a/share/dictionary/radius/alias/issanni.txt b/share/dictionary/radius/v3/dictionary.issanni
similarity index 100%
rename from share/dictionary/radius/alias/issanni.txt
rename to share/dictionary/radius/v3/dictionary.issanni
diff --git a/share/dictionary/radius/alias/itk.txt b/share/dictionary/radius/v3/dictionary.itk
similarity index 100%
rename from share/dictionary/radius/alias/itk.txt
rename to share/dictionary/radius/v3/dictionary.itk
diff --git a/share/dictionary/radius/alias/juniper.txt b/share/dictionary/radius/v3/dictionary.juniper
similarity index 100%
rename from share/dictionary/radius/alias/juniper.txt
rename to share/dictionary/radius/v3/dictionary.juniper
diff --git a/share/dictionary/radius/alias/karlnet.txt b/share/dictionary/radius/v3/dictionary.karlnet
similarity index 100%
rename from share/dictionary/radius/alias/karlnet.txt
rename to share/dictionary/radius/v3/dictionary.karlnet
diff --git a/share/dictionary/radius/alias/kineto.txt b/share/dictionary/radius/v3/dictionary.kineto
similarity index 100%
rename from share/dictionary/radius/alias/kineto.txt
rename to share/dictionary/radius/v3/dictionary.kineto
diff --git a/share/dictionary/radius/alias/lancom.txt b/share/dictionary/radius/v3/dictionary.lancom
similarity index 100%
rename from share/dictionary/radius/alias/lancom.txt
rename to share/dictionary/radius/v3/dictionary.lancom
diff --git a/share/dictionary/radius/alias/lantronix.txt b/share/dictionary/radius/v3/dictionary.lantronix
similarity index 100%
rename from share/dictionary/radius/alias/lantronix.txt
rename to share/dictionary/radius/v3/dictionary.lantronix
diff --git a/share/dictionary/radius/alias/livingston.txt b/share/dictionary/radius/v3/dictionary.livingston
similarity index 100%
rename from share/dictionary/radius/alias/livingston.txt
rename to share/dictionary/radius/v3/dictionary.livingston
diff --git a/share/dictionary/radius/alias/local-web.txt b/share/dictionary/radius/v3/dictionary.local-web
similarity index 100%
rename from share/dictionary/radius/alias/local-web.txt
rename to share/dictionary/radius/v3/dictionary.local-web
diff --git a/share/dictionary/radius/alias/lucent.txt b/share/dictionary/radius/v3/dictionary.lucent
similarity index 100%
rename from share/dictionary/radius/alias/lucent.txt
rename to share/dictionary/radius/v3/dictionary.lucent
diff --git a/share/dictionary/radius/alias/manzara.txt b/share/dictionary/radius/v3/dictionary.manzara
similarity index 100%
rename from share/dictionary/radius/alias/manzara.txt
rename to share/dictionary/radius/v3/dictionary.manzara
diff --git a/share/dictionary/radius/alias/meinberg.txt b/share/dictionary/radius/v3/dictionary.meinberg
similarity index 100%
rename from share/dictionary/radius/alias/meinberg.txt
rename to share/dictionary/radius/v3/dictionary.meinberg
diff --git a/share/dictionary/radius/alias/meraki.txt b/share/dictionary/radius/v3/dictionary.meraki
similarity index 100%
rename from share/dictionary/radius/alias/meraki.txt
rename to share/dictionary/radius/v3/dictionary.meraki
diff --git a/share/dictionary/radius/alias/merit.txt b/share/dictionary/radius/v3/dictionary.merit
similarity index 100%
rename from share/dictionary/radius/alias/merit.txt
rename to share/dictionary/radius/v3/dictionary.merit
diff --git a/share/dictionary/radius/alias/meru.txt b/share/dictionary/radius/v3/dictionary.meru
similarity index 100%
rename from share/dictionary/radius/alias/meru.txt
rename to share/dictionary/radius/v3/dictionary.meru
diff --git a/share/dictionary/radius/alias/microsemi.txt b/share/dictionary/radius/v3/dictionary.microsemi
similarity index 100%
rename from share/dictionary/radius/alias/microsemi.txt
rename to share/dictionary/radius/v3/dictionary.microsemi
diff --git a/share/dictionary/radius/alias/microsoft.txt b/share/dictionary/radius/v3/dictionary.microsoft
similarity index 100%
rename from share/dictionary/radius/alias/microsoft.txt
rename to share/dictionary/radius/v3/dictionary.microsoft
diff --git a/share/dictionary/radius/alias/mikrotik.txt b/share/dictionary/radius/v3/dictionary.mikrotik
similarity index 100%
rename from share/dictionary/radius/alias/mikrotik.txt
rename to share/dictionary/radius/v3/dictionary.mikrotik
diff --git a/share/dictionary/radius/alias/mimosa.txt b/share/dictionary/radius/v3/dictionary.mimosa
similarity index 100%
rename from share/dictionary/radius/alias/mimosa.txt
rename to share/dictionary/radius/v3/dictionary.mimosa
diff --git a/share/dictionary/radius/alias/motorola.txt b/share/dictionary/radius/v3/dictionary.motorola
similarity index 100%
rename from share/dictionary/radius/alias/motorola.txt
rename to share/dictionary/radius/v3/dictionary.motorola
diff --git a/share/dictionary/radius/alias/navini.txt b/share/dictionary/radius/v3/dictionary.navini
similarity index 100%
rename from share/dictionary/radius/alias/navini.txt
rename to share/dictionary/radius/v3/dictionary.navini
diff --git a/share/dictionary/radius/alias/net.txt b/share/dictionary/radius/v3/dictionary.net
similarity index 100%
rename from share/dictionary/radius/alias/net.txt
rename to share/dictionary/radius/v3/dictionary.net
diff --git a/share/dictionary/radius/alias/netborder.txt b/share/dictionary/radius/v3/dictionary.netborder
similarity index 100%
rename from share/dictionary/radius/alias/netborder.txt
rename to share/dictionary/radius/v3/dictionary.netborder
diff --git a/share/dictionary/radius/alias/netscreen.txt b/share/dictionary/radius/v3/dictionary.netscreen
similarity index 100%
rename from share/dictionary/radius/alias/netscreen.txt
rename to share/dictionary/radius/v3/dictionary.netscreen
diff --git a/share/dictionary/radius/alias/networkphysics.txt b/share/dictionary/radius/v3/dictionary.networkphysics
similarity index 100%
rename from share/dictionary/radius/alias/networkphysics.txt
rename to share/dictionary/radius/v3/dictionary.networkphysics
diff --git a/share/dictionary/radius/alias/nexans.txt b/share/dictionary/radius/v3/dictionary.nexans
similarity index 100%
rename from share/dictionary/radius/alias/nexans.txt
rename to share/dictionary/radius/v3/dictionary.nexans
diff --git a/share/dictionary/radius/alias/nokia.txt b/share/dictionary/radius/v3/dictionary.nokia
similarity index 100%
rename from share/dictionary/radius/alias/nokia.txt
rename to share/dictionary/radius/v3/dictionary.nokia
diff --git a/share/dictionary/radius/alias/nomadix.txt b/share/dictionary/radius/v3/dictionary.nomadix
similarity index 100%
rename from share/dictionary/radius/alias/nomadix.txt
rename to share/dictionary/radius/v3/dictionary.nomadix
diff --git a/share/dictionary/radius/alias/nortel.txt b/share/dictionary/radius/v3/dictionary.nortel
similarity index 100%
rename from share/dictionary/radius/alias/nortel.txt
rename to share/dictionary/radius/v3/dictionary.nortel
diff --git a/share/dictionary/radius/alias/ntua.txt b/share/dictionary/radius/v3/dictionary.ntua
similarity index 100%
rename from share/dictionary/radius/alias/ntua.txt
rename to share/dictionary/radius/v3/dictionary.ntua
diff --git a/share/dictionary/radius/alias/packeteer.txt b/share/dictionary/radius/v3/dictionary.packeteer
similarity index 100%
rename from share/dictionary/radius/alias/packeteer.txt
rename to share/dictionary/radius/v3/dictionary.packeteer
diff --git a/share/dictionary/radius/alias/paloalto.txt b/share/dictionary/radius/v3/dictionary.paloalto
similarity index 100%
rename from share/dictionary/radius/alias/paloalto.txt
rename to share/dictionary/radius/v3/dictionary.paloalto
diff --git a/share/dictionary/radius/alias/patton.txt b/share/dictionary/radius/v3/dictionary.patton
similarity index 100%
rename from share/dictionary/radius/alias/patton.txt
rename to share/dictionary/radius/v3/dictionary.patton
diff --git a/share/dictionary/radius/alias/perle.txt b/share/dictionary/radius/v3/dictionary.perle
similarity index 100%
rename from share/dictionary/radius/alias/perle.txt
rename to share/dictionary/radius/v3/dictionary.perle
diff --git a/share/dictionary/radius/alias/pfsense.txt b/share/dictionary/radius/v3/dictionary.pfsense
similarity index 100%
rename from share/dictionary/radius/alias/pfsense.txt
rename to share/dictionary/radius/v3/dictionary.pfsense
diff --git a/share/dictionary/radius/alias/pica8.txt b/share/dictionary/radius/v3/dictionary.pica8
similarity index 100%
rename from share/dictionary/radius/alias/pica8.txt
rename to share/dictionary/radius/v3/dictionary.pica8
diff --git a/share/dictionary/radius/alias/propel.txt b/share/dictionary/radius/v3/dictionary.propel
similarity index 100%
rename from share/dictionary/radius/alias/propel.txt
rename to share/dictionary/radius/v3/dictionary.propel
diff --git a/share/dictionary/radius/alias/prosoft.txt b/share/dictionary/radius/v3/dictionary.prosoft
similarity index 100%
rename from share/dictionary/radius/alias/prosoft.txt
rename to share/dictionary/radius/v3/dictionary.prosoft
diff --git a/share/dictionary/radius/alias/proxim.txt b/share/dictionary/radius/v3/dictionary.proxim
similarity index 100%
rename from share/dictionary/radius/alias/proxim.txt
rename to share/dictionary/radius/v3/dictionary.proxim
diff --git a/share/dictionary/radius/alias/purewave.txt b/share/dictionary/radius/v3/dictionary.purewave
similarity index 100%
rename from share/dictionary/radius/alias/purewave.txt
rename to share/dictionary/radius/v3/dictionary.purewave
diff --git a/share/dictionary/radius/alias/quiconnect.txt b/share/dictionary/radius/v3/dictionary.quiconnect
similarity index 100%
rename from share/dictionary/radius/alias/quiconnect.txt
rename to share/dictionary/radius/v3/dictionary.quiconnect
diff --git a/share/dictionary/radius/alias/quintum.txt b/share/dictionary/radius/v3/dictionary.quintum
similarity index 100%
rename from share/dictionary/radius/alias/quintum.txt
rename to share/dictionary/radius/v3/dictionary.quintum
diff --git a/share/dictionary/radius/alias/rcntec.txt b/share/dictionary/radius/v3/dictionary.rcntec
similarity index 100%
rename from share/dictionary/radius/alias/rcntec.txt
rename to share/dictionary/radius/v3/dictionary.rcntec
diff --git a/share/dictionary/radius/alias/redcreek.txt b/share/dictionary/radius/v3/dictionary.redcreek
similarity index 100%
rename from share/dictionary/radius/alias/redcreek.txt
rename to share/dictionary/radius/v3/dictionary.redcreek
diff --git a/share/dictionary/radius/alias/riverbed.txt b/share/dictionary/radius/v3/dictionary.riverbed
similarity index 100%
rename from share/dictionary/radius/alias/riverbed.txt
rename to share/dictionary/radius/v3/dictionary.riverbed
diff --git a/share/dictionary/radius/alias/riverstone.txt b/share/dictionary/radius/v3/dictionary.riverstone
similarity index 100%
rename from share/dictionary/radius/alias/riverstone.txt
rename to share/dictionary/radius/v3/dictionary.riverstone
diff --git a/share/dictionary/radius/alias/roaring-penguin.txt b/share/dictionary/radius/v3/dictionary.roaring-penguin
similarity index 100%
rename from share/dictionary/radius/alias/roaring-penguin.txt
rename to share/dictionary/radius/v3/dictionary.roaring-penguin
diff --git a/share/dictionary/radius/alias/ruckus.txt b/share/dictionary/radius/v3/dictionary.ruckus
similarity index 100%
rename from share/dictionary/radius/alias/ruckus.txt
rename to share/dictionary/radius/v3/dictionary.ruckus
diff --git a/share/dictionary/radius/alias/ruggedcom.txt b/share/dictionary/radius/v3/dictionary.ruggedcom
similarity index 100%
rename from share/dictionary/radius/alias/ruggedcom.txt
rename to share/dictionary/radius/v3/dictionary.ruggedcom
diff --git a/share/dictionary/radius/alias/sg.txt b/share/dictionary/radius/v3/dictionary.sg
similarity index 100%
rename from share/dictionary/radius/alias/sg.txt
rename to share/dictionary/radius/v3/dictionary.sg
diff --git a/share/dictionary/radius/alias/shasta.txt b/share/dictionary/radius/v3/dictionary.shasta
similarity index 100%
rename from share/dictionary/radius/alias/shasta.txt
rename to share/dictionary/radius/v3/dictionary.shasta
diff --git a/share/dictionary/radius/alias/shiva.txt b/share/dictionary/radius/v3/dictionary.shiva
similarity index 100%
rename from share/dictionary/radius/alias/shiva.txt
rename to share/dictionary/radius/v3/dictionary.shiva
diff --git a/share/dictionary/radius/alias/siemens.txt b/share/dictionary/radius/v3/dictionary.siemens
similarity index 100%
rename from share/dictionary/radius/alias/siemens.txt
rename to share/dictionary/radius/v3/dictionary.siemens
diff --git a/share/dictionary/radius/alias/slipstream.txt b/share/dictionary/radius/v3/dictionary.slipstream
similarity index 100%
rename from share/dictionary/radius/alias/slipstream.txt
rename to share/dictionary/radius/v3/dictionary.slipstream
diff --git a/share/dictionary/radius/alias/sofaware.txt b/share/dictionary/radius/v3/dictionary.sofaware
similarity index 100%
rename from share/dictionary/radius/alias/sofaware.txt
rename to share/dictionary/radius/v3/dictionary.sofaware
diff --git a/share/dictionary/radius/alias/softbank.txt b/share/dictionary/radius/v3/dictionary.softbank
similarity index 100%
rename from share/dictionary/radius/alias/softbank.txt
rename to share/dictionary/radius/v3/dictionary.softbank
diff --git a/share/dictionary/radius/alias/sonicwall.txt b/share/dictionary/radius/v3/dictionary.sonicwall
similarity index 100%
rename from share/dictionary/radius/alias/sonicwall.txt
rename to share/dictionary/radius/v3/dictionary.sonicwall
diff --git a/share/dictionary/radius/alias/springtide.txt b/share/dictionary/radius/v3/dictionary.springtide
similarity index 100%
rename from share/dictionary/radius/alias/springtide.txt
rename to share/dictionary/radius/v3/dictionary.springtide
diff --git a/share/dictionary/radius/alias/starent.txt b/share/dictionary/radius/v3/dictionary.starent
similarity index 100%
rename from share/dictionary/radius/alias/starent.txt
rename to share/dictionary/radius/v3/dictionary.starent
diff --git a/share/dictionary/radius/alias/surfnet.txt b/share/dictionary/radius/v3/dictionary.surfnet
similarity index 100%
rename from share/dictionary/radius/alias/surfnet.txt
rename to share/dictionary/radius/v3/dictionary.surfnet
diff --git a/share/dictionary/radius/alias/symbol.txt b/share/dictionary/radius/v3/dictionary.symbol
similarity index 100%
rename from share/dictionary/radius/alias/symbol.txt
rename to share/dictionary/radius/v3/dictionary.symbol
diff --git a/share/dictionary/radius/alias/t-systems-nova.txt b/share/dictionary/radius/v3/dictionary.t-systems-nova
similarity index 100%
rename from share/dictionary/radius/alias/t-systems-nova.txt
rename to share/dictionary/radius/v3/dictionary.t-systems-nova
diff --git a/share/dictionary/radius/alias/telebit.txt b/share/dictionary/radius/v3/dictionary.telebit
similarity index 100%
rename from share/dictionary/radius/alias/telebit.txt
rename to share/dictionary/radius/v3/dictionary.telebit
diff --git a/share/dictionary/radius/alias/telkom.txt b/share/dictionary/radius/v3/dictionary.telkom
similarity index 100%
rename from share/dictionary/radius/alias/telkom.txt
rename to share/dictionary/radius/v3/dictionary.telkom
diff --git a/share/dictionary/radius/alias/telrad.txt b/share/dictionary/radius/v3/dictionary.telrad
similarity index 100%
rename from share/dictionary/radius/alias/telrad.txt
rename to share/dictionary/radius/v3/dictionary.telrad
diff --git a/share/dictionary/radius/alias/terena.txt b/share/dictionary/radius/v3/dictionary.terena
similarity index 100%
rename from share/dictionary/radius/alias/terena.txt
rename to share/dictionary/radius/v3/dictionary.terena
diff --git a/share/dictionary/radius/alias/trapeze.txt b/share/dictionary/radius/v3/dictionary.trapeze
similarity index 100%
rename from share/dictionary/radius/alias/trapeze.txt
rename to share/dictionary/radius/v3/dictionary.trapeze
diff --git a/share/dictionary/radius/alias/travelping.txt b/share/dictionary/radius/v3/dictionary.travelping
similarity index 100%
rename from share/dictionary/radius/alias/travelping.txt
rename to share/dictionary/radius/v3/dictionary.travelping
diff --git a/share/dictionary/radius/alias/tripplite.txt b/share/dictionary/radius/v3/dictionary.tripplite
similarity index 100%
rename from share/dictionary/radius/alias/tripplite.txt
rename to share/dictionary/radius/v3/dictionary.tripplite
diff --git a/share/dictionary/radius/alias/tropos.txt b/share/dictionary/radius/v3/dictionary.tropos
similarity index 100%
rename from share/dictionary/radius/alias/tropos.txt
rename to share/dictionary/radius/v3/dictionary.tropos
diff --git a/share/dictionary/radius/alias/ukerna.txt b/share/dictionary/radius/v3/dictionary.ukerna
similarity index 100%
rename from share/dictionary/radius/alias/ukerna.txt
rename to share/dictionary/radius/v3/dictionary.ukerna
diff --git a/share/dictionary/radius/alias/unix.txt b/share/dictionary/radius/v3/dictionary.unix
similarity index 100%
rename from share/dictionary/radius/alias/unix.txt
rename to share/dictionary/radius/v3/dictionary.unix
diff --git a/share/dictionary/radius/alias/usr.txt b/share/dictionary/radius/v3/dictionary.usr
similarity index 100%
rename from share/dictionary/radius/alias/usr.txt
rename to share/dictionary/radius/v3/dictionary.usr
diff --git a/share/dictionary/radius/alias/utstarcom.txt b/share/dictionary/radius/v3/dictionary.utstarcom
similarity index 100%
rename from share/dictionary/radius/alias/utstarcom.txt
rename to share/dictionary/radius/v3/dictionary.utstarcom
diff --git a/share/dictionary/radius/alias/valemountnetworks.txt b/share/dictionary/radius/v3/dictionary.valemountnetworks
similarity index 100%
rename from share/dictionary/radius/alias/valemountnetworks.txt
rename to share/dictionary/radius/v3/dictionary.valemountnetworks
diff --git a/share/dictionary/radius/alias/vasexperts.txt b/share/dictionary/radius/v3/dictionary.vasexperts
similarity index 100%
rename from share/dictionary/radius/alias/vasexperts.txt
rename to share/dictionary/radius/v3/dictionary.vasexperts
diff --git a/share/dictionary/radius/alias/verizonwireless.txt b/share/dictionary/radius/v3/dictionary.verizonwireless
similarity index 100%
rename from share/dictionary/radius/alias/verizonwireless.txt
rename to share/dictionary/radius/v3/dictionary.verizonwireless
diff --git a/share/dictionary/radius/alias/versanet.txt b/share/dictionary/radius/v3/dictionary.versanet
similarity index 100%
rename from share/dictionary/radius/alias/versanet.txt
rename to share/dictionary/radius/v3/dictionary.versanet
diff --git a/share/dictionary/radius/alias/walabi.txt b/share/dictionary/radius/v3/dictionary.walabi
similarity index 100%
rename from share/dictionary/radius/alias/walabi.txt
rename to share/dictionary/radius/v3/dictionary.walabi
diff --git a/share/dictionary/radius/alias/waverider.txt b/share/dictionary/radius/v3/dictionary.waverider
similarity index 100%
rename from share/dictionary/radius/alias/waverider.txt
rename to share/dictionary/radius/v3/dictionary.waverider
diff --git a/share/dictionary/radius/alias/wichorus.txt b/share/dictionary/radius/v3/dictionary.wichorus
similarity index 100%
rename from share/dictionary/radius/alias/wichorus.txt
rename to share/dictionary/radius/v3/dictionary.wichorus
diff --git a/share/dictionary/radius/alias/wifi-alliance.txt b/share/dictionary/radius/v3/dictionary.wifi-alliance
similarity index 100%
rename from share/dictionary/radius/alias/wifi-alliance.txt
rename to share/dictionary/radius/v3/dictionary.wifi-alliance
diff --git a/share/dictionary/radius/alias/wimax.txt b/share/dictionary/radius/v3/dictionary.wimax
similarity index 100%
rename from share/dictionary/radius/alias/wimax.txt
rename to share/dictionary/radius/v3/dictionary.wimax
diff --git a/share/dictionary/radius/alias/wispr.txt b/share/dictionary/radius/v3/dictionary.wispr
similarity index 100%
rename from share/dictionary/radius/alias/wispr.txt
rename to share/dictionary/radius/v3/dictionary.wispr
diff --git a/share/dictionary/radius/alias/xedia.txt b/share/dictionary/radius/v3/dictionary.xedia
similarity index 100%
rename from share/dictionary/radius/alias/xedia.txt
rename to share/dictionary/radius/v3/dictionary.xedia
diff --git a/share/dictionary/radius/alias/xylan.txt b/share/dictionary/radius/v3/dictionary.xylan
similarity index 100%
rename from share/dictionary/radius/alias/xylan.txt
rename to share/dictionary/radius/v3/dictionary.xylan
diff --git a/share/dictionary/radius/alias/yubico.txt b/share/dictionary/radius/v3/dictionary.yubico
similarity index 100%
rename from share/dictionary/radius/alias/yubico.txt
rename to share/dictionary/radius/v3/dictionary.yubico
diff --git a/share/dictionary/radius/alias/zeus.txt b/share/dictionary/radius/v3/dictionary.zeus
similarity index 100%
rename from share/dictionary/radius/alias/zeus.txt
rename to share/dictionary/radius/v3/dictionary.zeus
diff --git a/share/dictionary/radius/alias/zte.txt b/share/dictionary/radius/v3/dictionary.zte
similarity index 100%
rename from share/dictionary/radius/alias/zte.txt
rename to share/dictionary/radius/v3/dictionary.zte
diff --git a/share/dictionary/radius/alias/zyxel.txt b/share/dictionary/radius/v3/dictionary.zyxel
similarity index 100%
rename from share/dictionary/radius/alias/zyxel.txt
rename to share/dictionary/radius/v3/dictionary.zyxel