From: Alan T. DeKok Date: Tue, 16 Aug 2022 21:44:33 +0000 (-0400) Subject: rename the alias files to something which isn't stupid X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08a32051664654c206688b90f643d01ef4f043aa;p=thirdparty%2Ffreeradius-server.git rename the alias files to something which isn't stupid --- diff --git a/doc/antora/modules/installation/pages/upgrade.adoc b/doc/antora/modules/installation/pages/upgrade.adoc index 69a01c9cee6..6a07603ded7 100644 --- a/doc/antora/modules/installation/pages/upgrade.adoc +++ b/doc/antora/modules/installation/pages/upgrade.adoc @@ -11,6 +11,7 @@ In general, we have the following changes: * most module configuration is very close to v3. * most of the `unlang` processing is very close to v3. + * `update` is now replaced just by editing the attribute in place. * each `server` section need a `namespace` parameter. * Packet processing sections are now `recv Access-Request`, etc. Not `authorize`, etc. @@ -30,6 +31,9 @@ the new configuration. Start the server after every change via Take your time. It is better to make small incremental progress, than to make massive changes, and then to spend weeks debugging it. Use a revision control system such as `git` to save and track your changes. +If the changes work as you expect, do `git commit`, and continue with +the next change. If the changes do not work, either keep at it, or +move to a different portion of the configuration All of the attribute names used in v3 have been changed in v4. Please see the xref:attribute_names.adoc[attribute names] document for more @@ -43,6 +47,66 @@ If you are upgrading from v2 you should read the v3 version of this file. It describes changed from v2 to v3. This file describes only the changes from v3 to v4. +== Attribute Names + +Much of the information in this section is also in the +`raddb/dictionary` file + +All of the attributes have been renamed from v3. This change was +necessary in order to support new funtionality 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, +and are 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. + +The old v3 names are in "alias" dictionaries, in the +`${dictdir}/alias/` directory. To find out where this directory is on +your local system, run "radiusd -h" or "radclient -h". Then look for +the "-D" command-line option, and it will tell you where the +dictionary files are located. + +The v3 names are in a file named `${dictdir}/radius/alias/VENDOR.txt` where +`VENDOR` is the name of the vendor, which is taken from the `VENDOR` +definition in the v3 dictionaries. + +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 compatibilty names. The reason +is simple: the alias names _mostly_ work, in most situations. But +there are situations where the aliases do not behave correctly. + +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 compatiblity functions will be used for a +decade. So we need to find a balance between upgrades and ongoing +support. Easy upgrades will mean complex ongoing support. Complex +upgrades make ongoing support easier, but also make it less likely +that people will upgrade. + == radiusd.conf The following configurations have been removed. See the new `listen` diff --git a/raddb/dictionary b/raddb/dictionary index 4a7be4577cc..e294ddb45c5 100644 --- a/raddb/dictionary +++ b/raddb/dictionary @@ -92,7 +92,7 @@ # command-line option, and it will tell you where the dictionary # files are located. # -# The v3 names are in ${dictdir}/radius/alias/alias.VENDOR where +# 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. # @@ -114,5 +114,5 @@ # #BEGIN-PROTOCOL RADIUS -#$INCLUDE ${dictdir}/radius/alias/alias.cisco +#$INCLUDE ${dictdir}/radius/alias/cisco.txt #END-PROTOCOL RADIUS diff --git a/share/dictionary/radius/alias/alias.3com b/share/dictionary/radius/alias/3com.txt similarity index 100% rename from share/dictionary/radius/alias/alias.3com rename to share/dictionary/radius/alias/3com.txt diff --git a/share/dictionary/radius/alias/alias.3gpp b/share/dictionary/radius/alias/3gpp.txt similarity index 100% rename from share/dictionary/radius/alias/alias.3gpp rename to share/dictionary/radius/alias/3gpp.txt diff --git a/share/dictionary/radius/alias/alias.3gpp2 b/share/dictionary/radius/alias/3gpp2.txt similarity index 100% rename from share/dictionary/radius/alias/alias.3gpp2 rename to share/dictionary/radius/alias/3gpp2.txt diff --git a/share/dictionary/radius/alias/alias.acc b/share/dictionary/radius/alias/acc.txt similarity index 100% rename from share/dictionary/radius/alias/alias.acc rename to share/dictionary/radius/alias/acc.txt diff --git a/share/dictionary/radius/alias/alias.acme b/share/dictionary/radius/alias/acme.txt similarity index 100% rename from share/dictionary/radius/alias/alias.acme rename to share/dictionary/radius/alias/acme.txt diff --git a/share/dictionary/radius/alias/alias.actelis b/share/dictionary/radius/alias/actelis.txt similarity index 100% rename from share/dictionary/radius/alias/alias.actelis rename to share/dictionary/radius/alias/actelis.txt diff --git a/share/dictionary/radius/alias/alias.adsl-forum b/share/dictionary/radius/alias/adsl-forum.txt similarity index 100% rename from share/dictionary/radius/alias/alias.adsl-forum rename to share/dictionary/radius/alias/adsl-forum.txt diff --git a/share/dictionary/radius/alias/alias.adtran b/share/dictionary/radius/alias/adtran.txt similarity index 100% rename from share/dictionary/radius/alias/alias.adtran rename to share/dictionary/radius/alias/adtran.txt diff --git a/share/dictionary/radius/alias/alias.aerohive b/share/dictionary/radius/alias/aerohive.txt similarity index 100% rename from share/dictionary/radius/alias/alias.aerohive rename to share/dictionary/radius/alias/aerohive.txt diff --git a/share/dictionary/radius/alias/alias.airespace b/share/dictionary/radius/alias/airespace.txt similarity index 100% rename from share/dictionary/radius/alias/alias.airespace rename to share/dictionary/radius/alias/airespace.txt diff --git a/share/dictionary/radius/alias/alias.alcatel-esam b/share/dictionary/radius/alias/alcatel-esam.txt similarity index 100% rename from share/dictionary/radius/alias/alias.alcatel-esam rename to share/dictionary/radius/alias/alcatel-esam.txt diff --git a/share/dictionary/radius/alias/alias.alcatel-lucent-service-router b/share/dictionary/radius/alias/alcatel-lucent-service-router.txt similarity index 100% rename from share/dictionary/radius/alias/alias.alcatel-lucent-service-router rename to share/dictionary/radius/alias/alcatel-lucent-service-router.txt diff --git a/share/dictionary/radius/alias/alias.alcatel b/share/dictionary/radius/alias/alcatel.txt similarity index 100% rename from share/dictionary/radius/alias/alias.alcatel rename to share/dictionary/radius/alias/alcatel.txt diff --git a/share/dictionary/radius/alias/alias.alteon b/share/dictionary/radius/alias/alteon.txt similarity index 100% rename from share/dictionary/radius/alias/alias.alteon rename to share/dictionary/radius/alias/alteon.txt diff --git a/share/dictionary/radius/alias/alias.alu-aaa b/share/dictionary/radius/alias/alu-aaa.txt similarity index 100% rename from share/dictionary/radius/alias/alias.alu-aaa rename to share/dictionary/radius/alias/alu-aaa.txt diff --git a/share/dictionary/radius/alias/alias.alvarion b/share/dictionary/radius/alias/alvarion.txt similarity index 100% rename from share/dictionary/radius/alias/alias.alvarion rename to share/dictionary/radius/alias/alvarion.txt diff --git a/share/dictionary/radius/alias/alias.apc b/share/dictionary/radius/alias/apc.txt similarity index 100% rename from share/dictionary/radius/alias/alias.apc rename to share/dictionary/radius/alias/apc.txt diff --git a/share/dictionary/radius/alias/alias.aptilo b/share/dictionary/radius/alias/aptilo.txt similarity index 100% rename from share/dictionary/radius/alias/alias.aptilo rename to share/dictionary/radius/alias/aptilo.txt diff --git a/share/dictionary/radius/alias/alias.aptis b/share/dictionary/radius/alias/aptis.txt similarity index 100% rename from share/dictionary/radius/alias/alias.aptis rename to share/dictionary/radius/alias/aptis.txt diff --git a/share/dictionary/radius/alias/alias.arbor b/share/dictionary/radius/alias/arbor.txt similarity index 100% rename from share/dictionary/radius/alias/alias.arbor rename to share/dictionary/radius/alias/arbor.txt diff --git a/share/dictionary/radius/alias/alias.arista b/share/dictionary/radius/alias/arista.txt similarity index 100% rename from share/dictionary/radius/alias/alias.arista rename to share/dictionary/radius/alias/arista.txt diff --git a/share/dictionary/radius/alias/alias.aruba b/share/dictionary/radius/alias/aruba.txt similarity index 100% rename from share/dictionary/radius/alias/alias.aruba rename to share/dictionary/radius/alias/aruba.txt diff --git a/share/dictionary/radius/alias/alias.ascend b/share/dictionary/radius/alias/ascend.txt similarity index 100% rename from share/dictionary/radius/alias/alias.ascend rename to share/dictionary/radius/alias/ascend.txt diff --git a/share/dictionary/radius/alias/alias.asn b/share/dictionary/radius/alias/asn.txt similarity index 100% rename from share/dictionary/radius/alias/alias.asn rename to share/dictionary/radius/alias/asn.txt diff --git a/share/dictionary/radius/alias/alias.audiocodes b/share/dictionary/radius/alias/audiocodes.txt similarity index 100% rename from share/dictionary/radius/alias/alias.audiocodes rename to share/dictionary/radius/alias/audiocodes.txt diff --git a/share/dictionary/radius/alias/alias.azaire b/share/dictionary/radius/alias/azaire.txt similarity index 100% rename from share/dictionary/radius/alias/alias.azaire rename to share/dictionary/radius/alias/azaire.txt diff --git a/share/dictionary/radius/alias/alias.bay-networks b/share/dictionary/radius/alias/bay-networks.txt similarity index 100% rename from share/dictionary/radius/alias/alias.bay-networks rename to share/dictionary/radius/alias/bay-networks.txt diff --git a/share/dictionary/radius/alias/alias.big-switch-networks b/share/dictionary/radius/alias/big-switch-networks.txt similarity index 100% rename from share/dictionary/radius/alias/alias.big-switch-networks rename to share/dictionary/radius/alias/big-switch-networks.txt diff --git a/share/dictionary/radius/alias/alias.bintec b/share/dictionary/radius/alias/bintec.txt similarity index 100% rename from share/dictionary/radius/alias/alias.bintec rename to share/dictionary/radius/alias/bintec.txt diff --git a/share/dictionary/radius/alias/alias.bluecoat b/share/dictionary/radius/alias/bluecoat.txt similarity index 100% rename from share/dictionary/radius/alias/alias.bluecoat rename to share/dictionary/radius/alias/bluecoat.txt diff --git a/share/dictionary/radius/alias/alias.boingo b/share/dictionary/radius/alias/boingo.txt similarity index 100% rename from share/dictionary/radius/alias/alias.boingo rename to share/dictionary/radius/alias/boingo.txt diff --git a/share/dictionary/radius/alias/alias.bristol b/share/dictionary/radius/alias/bristol.txt similarity index 100% rename from share/dictionary/radius/alias/alias.bristol rename to share/dictionary/radius/alias/bristol.txt diff --git a/share/dictionary/radius/alias/alias.broadsoft b/share/dictionary/radius/alias/broadsoft.txt similarity index 100% rename from share/dictionary/radius/alias/alias.broadsoft rename to share/dictionary/radius/alias/broadsoft.txt diff --git a/share/dictionary/radius/alias/alias.brocade b/share/dictionary/radius/alias/brocade.txt similarity index 100% rename from share/dictionary/radius/alias/alias.brocade rename to share/dictionary/radius/alias/brocade.txt diff --git a/share/dictionary/radius/alias/alias.bskyb b/share/dictionary/radius/alias/bskyb.txt similarity index 100% rename from share/dictionary/radius/alias/alias.bskyb rename to share/dictionary/radius/alias/bskyb.txt diff --git a/share/dictionary/radius/alias/alias.bt b/share/dictionary/radius/alias/bt.txt similarity index 100% rename from share/dictionary/radius/alias/alias.bt rename to share/dictionary/radius/alias/bt.txt diff --git a/share/dictionary/radius/alias/alias.cablelabs b/share/dictionary/radius/alias/cablelabs.txt similarity index 100% rename from share/dictionary/radius/alias/alias.cablelabs rename to share/dictionary/radius/alias/cablelabs.txt diff --git a/share/dictionary/radius/alias/alias.cabletron b/share/dictionary/radius/alias/cabletron.txt similarity index 100% rename from share/dictionary/radius/alias/alias.cabletron rename to share/dictionary/radius/alias/cabletron.txt diff --git a/share/dictionary/radius/alias/alias.cajun_p330 b/share/dictionary/radius/alias/cajun_p330.txt similarity index 100% rename from share/dictionary/radius/alias/alias.cajun_p330 rename to share/dictionary/radius/alias/cajun_p330.txt diff --git a/share/dictionary/radius/alias/alias.camiant b/share/dictionary/radius/alias/camiant.txt similarity index 100% rename from share/dictionary/radius/alias/alias.camiant rename to share/dictionary/radius/alias/camiant.txt diff --git a/share/dictionary/radius/alias/alias.centec b/share/dictionary/radius/alias/centec.txt similarity index 100% rename from share/dictionary/radius/alias/alias.centec rename to share/dictionary/radius/alias/centec.txt diff --git a/share/dictionary/radius/alias/alias.checkpoint b/share/dictionary/radius/alias/checkpoint.txt similarity index 100% rename from share/dictionary/radius/alias/alias.checkpoint rename to share/dictionary/radius/alias/checkpoint.txt diff --git a/share/dictionary/radius/alias/alias.chillispot b/share/dictionary/radius/alias/chillispot.txt similarity index 100% rename from share/dictionary/radius/alias/alias.chillispot rename to share/dictionary/radius/alias/chillispot.txt diff --git a/share/dictionary/radius/alias/alias.cisco-asa b/share/dictionary/radius/alias/cisco-asa.txt similarity index 100% rename from share/dictionary/radius/alias/alias.cisco-asa rename to share/dictionary/radius/alias/cisco-asa.txt diff --git a/share/dictionary/radius/alias/alias.cisco-bbsm b/share/dictionary/radius/alias/cisco-bbsm.txt similarity index 100% rename from share/dictionary/radius/alias/alias.cisco-bbsm rename to share/dictionary/radius/alias/cisco-bbsm.txt diff --git a/share/dictionary/radius/alias/alias.cisco b/share/dictionary/radius/alias/cisco.txt similarity index 100% rename from share/dictionary/radius/alias/alias.cisco rename to share/dictionary/radius/alias/cisco.txt diff --git a/share/dictionary/radius/alias/alias.citrix b/share/dictionary/radius/alias/citrix.txt similarity index 100% rename from share/dictionary/radius/alias/alias.citrix rename to share/dictionary/radius/alias/citrix.txt diff --git a/share/dictionary/radius/alias/alias.clavister b/share/dictionary/radius/alias/clavister.txt similarity index 100% rename from share/dictionary/radius/alias/alias.clavister rename to share/dictionary/radius/alias/clavister.txt diff --git a/share/dictionary/radius/alias/alias.cnergee b/share/dictionary/radius/alias/cnergee.txt similarity index 100% rename from share/dictionary/radius/alias/alias.cnergee rename to share/dictionary/radius/alias/cnergee.txt diff --git a/share/dictionary/radius/alias/alias.colubris b/share/dictionary/radius/alias/colubris.txt similarity index 100% rename from share/dictionary/radius/alias/alias.colubris rename to share/dictionary/radius/alias/colubris.txt diff --git a/share/dictionary/radius/alias/alias.columbia-university b/share/dictionary/radius/alias/columbia-university.txt similarity index 100% rename from share/dictionary/radius/alias/alias.columbia-university rename to share/dictionary/radius/alias/columbia-university.txt diff --git a/share/dictionary/radius/alias/alias.compatible b/share/dictionary/radius/alias/compatible.txt similarity index 100% rename from share/dictionary/radius/alias/alias.compatible rename to share/dictionary/radius/alias/compatible.txt diff --git a/share/dictionary/radius/alias/alias.cosine b/share/dictionary/radius/alias/cosine.txt similarity index 100% rename from share/dictionary/radius/alias/alias.cosine rename to share/dictionary/radius/alias/cosine.txt diff --git a/share/dictionary/radius/alias/alias.dante b/share/dictionary/radius/alias/dante.txt similarity index 100% rename from share/dictionary/radius/alias/alias.dante rename to share/dictionary/radius/alias/dante.txt diff --git a/share/dictionary/radius/alias/alias.dellemc b/share/dictionary/radius/alias/dellemc.txt similarity index 100% rename from share/dictionary/radius/alias/alias.dellemc rename to share/dictionary/radius/alias/dellemc.txt diff --git a/share/dictionary/radius/alias/alias.digium b/share/dictionary/radius/alias/digium.txt similarity index 100% rename from share/dictionary/radius/alias/alias.digium rename to share/dictionary/radius/alias/digium.txt diff --git a/share/dictionary/radius/alias/alias.dlink b/share/dictionary/radius/alias/dlink.txt similarity index 100% rename from share/dictionary/radius/alias/alias.dlink rename to share/dictionary/radius/alias/dlink.txt diff --git a/share/dictionary/radius/alias/alias.dragonwave b/share/dictionary/radius/alias/dragonwave.txt similarity index 100% rename from share/dictionary/radius/alias/alias.dragonwave rename to share/dictionary/radius/alias/dragonwave.txt diff --git a/share/dictionary/radius/alias/alias.efficientip b/share/dictionary/radius/alias/efficientip.txt similarity index 100% rename from share/dictionary/radius/alias/alias.efficientip rename to share/dictionary/radius/alias/efficientip.txt diff --git a/share/dictionary/radius/alias/alias.eltex b/share/dictionary/radius/alias/eltex.txt similarity index 100% rename from share/dictionary/radius/alias/alias.eltex rename to share/dictionary/radius/alias/eltex.txt diff --git a/share/dictionary/radius/alias/alias.epygi b/share/dictionary/radius/alias/epygi.txt similarity index 100% rename from share/dictionary/radius/alias/alias.epygi rename to share/dictionary/radius/alias/epygi.txt diff --git a/share/dictionary/radius/alias/alias.equallogic b/share/dictionary/radius/alias/equallogic.txt similarity index 100% rename from share/dictionary/radius/alias/alias.equallogic rename to share/dictionary/radius/alias/equallogic.txt diff --git a/share/dictionary/radius/alias/alias.ericsson-ab b/share/dictionary/radius/alias/ericsson-ab.txt similarity index 100% rename from share/dictionary/radius/alias/alias.ericsson-ab rename to share/dictionary/radius/alias/ericsson-ab.txt diff --git a/share/dictionary/radius/alias/alias.ericsson-packet-core-networks b/share/dictionary/radius/alias/ericsson-packet-core-networks.txt similarity index 100% rename from share/dictionary/radius/alias/alias.ericsson-packet-core-networks rename to share/dictionary/radius/alias/ericsson-packet-core-networks.txt diff --git a/share/dictionary/radius/alias/alias.ericsson b/share/dictionary/radius/alias/ericsson.txt similarity index 100% rename from share/dictionary/radius/alias/alias.ericsson rename to share/dictionary/radius/alias/ericsson.txt diff --git a/share/dictionary/radius/alias/alias.erx b/share/dictionary/radius/alias/erx.txt similarity index 100% rename from share/dictionary/radius/alias/alias.erx rename to share/dictionary/radius/alias/erx.txt diff --git a/share/dictionary/radius/alias/alias.extreme b/share/dictionary/radius/alias/extreme.txt similarity index 100% rename from share/dictionary/radius/alias/alias.extreme rename to share/dictionary/radius/alias/extreme.txt diff --git a/share/dictionary/radius/alias/alias.f5 b/share/dictionary/radius/alias/f5.txt similarity index 100% rename from share/dictionary/radius/alias/alias.f5 rename to share/dictionary/radius/alias/f5.txt diff --git a/share/dictionary/radius/alias/alias.fdxtended b/share/dictionary/radius/alias/fdxtended.txt similarity index 100% rename from share/dictionary/radius/alias/alias.fdxtended rename to share/dictionary/radius/alias/fdxtended.txt diff --git a/share/dictionary/radius/alias/alias.force10 b/share/dictionary/radius/alias/force10.txt similarity index 100% rename from share/dictionary/radius/alias/alias.force10 rename to share/dictionary/radius/alias/force10.txt diff --git a/share/dictionary/radius/alias/alias.fortinet b/share/dictionary/radius/alias/fortinet.txt similarity index 100% rename from share/dictionary/radius/alias/alias.fortinet rename to share/dictionary/radius/alias/fortinet.txt diff --git a/share/dictionary/radius/alias/alias.foundry b/share/dictionary/radius/alias/foundry.txt similarity index 100% rename from share/dictionary/radius/alias/alias.foundry rename to share/dictionary/radius/alias/foundry.txt diff --git a/share/dictionary/radius/alias/alias.freeradius b/share/dictionary/radius/alias/freeradius.txt similarity index 100% rename from share/dictionary/radius/alias/alias.freeradius rename to share/dictionary/radius/alias/freeradius.txt diff --git a/share/dictionary/radius/alias/alias.freeswitch b/share/dictionary/radius/alias/freeswitch.txt similarity index 100% rename from share/dictionary/radius/alias/alias.freeswitch rename to share/dictionary/radius/alias/freeswitch.txt diff --git a/share/dictionary/radius/alias/alias.gandalf b/share/dictionary/radius/alias/gandalf.txt similarity index 100% rename from share/dictionary/radius/alias/alias.gandalf rename to share/dictionary/radius/alias/gandalf.txt diff --git a/share/dictionary/radius/alias/alias.garderos b/share/dictionary/radius/alias/garderos.txt similarity index 100% rename from share/dictionary/radius/alias/alias.garderos rename to share/dictionary/radius/alias/garderos.txt diff --git a/share/dictionary/radius/alias/alias.gemtek b/share/dictionary/radius/alias/gemtek.txt similarity index 100% rename from share/dictionary/radius/alias/alias.gemtek rename to share/dictionary/radius/alias/gemtek.txt diff --git a/share/dictionary/radius/alias/alias.h3c b/share/dictionary/radius/alias/h3c.txt similarity index 100% rename from share/dictionary/radius/alias/alias.h3c rename to share/dictionary/radius/alias/h3c.txt diff --git a/share/dictionary/radius/alias/alias.hillstone b/share/dictionary/radius/alias/hillstone.txt similarity index 100% rename from share/dictionary/radius/alias/alias.hillstone rename to share/dictionary/radius/alias/hillstone.txt diff --git a/share/dictionary/radius/alias/alias.hp b/share/dictionary/radius/alias/hp.txt similarity index 100% rename from share/dictionary/radius/alias/alias.hp rename to share/dictionary/radius/alias/hp.txt diff --git a/share/dictionary/radius/alias/alias.huawei b/share/dictionary/radius/alias/huawei.txt similarity index 100% rename from share/dictionary/radius/alias/alias.huawei rename to share/dictionary/radius/alias/huawei.txt diff --git a/share/dictionary/radius/alias/alias.iea-software b/share/dictionary/radius/alias/iea-software.txt similarity index 100% rename from share/dictionary/radius/alias/alias.iea-software rename to share/dictionary/radius/alias/iea-software.txt diff --git a/share/dictionary/radius/alias/alias.infinera b/share/dictionary/radius/alias/infinera.txt similarity index 100% rename from share/dictionary/radius/alias/alias.infinera rename to share/dictionary/radius/alias/infinera.txt diff --git a/share/dictionary/radius/alias/alias.infoblox b/share/dictionary/radius/alias/infoblox.txt similarity index 100% rename from share/dictionary/radius/alias/alias.infoblox rename to share/dictionary/radius/alias/infoblox.txt diff --git a/share/dictionary/radius/alias/alias.infonet b/share/dictionary/radius/alias/infonet.txt similarity index 100% rename from share/dictionary/radius/alias/alias.infonet rename to share/dictionary/radius/alias/infonet.txt diff --git a/share/dictionary/radius/alias/alias.ipunplugged b/share/dictionary/radius/alias/ipunplugged.txt similarity index 100% rename from share/dictionary/radius/alias/alias.ipunplugged rename to share/dictionary/radius/alias/ipunplugged.txt diff --git a/share/dictionary/radius/alias/alias.issanni b/share/dictionary/radius/alias/issanni.txt similarity index 100% rename from share/dictionary/radius/alias/alias.issanni rename to share/dictionary/radius/alias/issanni.txt diff --git a/share/dictionary/radius/alias/alias.itk b/share/dictionary/radius/alias/itk.txt similarity index 100% rename from share/dictionary/radius/alias/alias.itk rename to share/dictionary/radius/alias/itk.txt diff --git a/share/dictionary/radius/alias/alias.juniper b/share/dictionary/radius/alias/juniper.txt similarity index 100% rename from share/dictionary/radius/alias/alias.juniper rename to share/dictionary/radius/alias/juniper.txt diff --git a/share/dictionary/radius/alias/alias.karlnet b/share/dictionary/radius/alias/karlnet.txt similarity index 100% rename from share/dictionary/radius/alias/alias.karlnet rename to share/dictionary/radius/alias/karlnet.txt diff --git a/share/dictionary/radius/alias/alias.kineto b/share/dictionary/radius/alias/kineto.txt similarity index 100% rename from share/dictionary/radius/alias/alias.kineto rename to share/dictionary/radius/alias/kineto.txt diff --git a/share/dictionary/radius/alias/alias.lancom b/share/dictionary/radius/alias/lancom.txt similarity index 100% rename from share/dictionary/radius/alias/alias.lancom rename to share/dictionary/radius/alias/lancom.txt diff --git a/share/dictionary/radius/alias/alias.lantronix b/share/dictionary/radius/alias/lantronix.txt similarity index 100% rename from share/dictionary/radius/alias/alias.lantronix rename to share/dictionary/radius/alias/lantronix.txt diff --git a/share/dictionary/radius/alias/alias.livingston b/share/dictionary/radius/alias/livingston.txt similarity index 100% rename from share/dictionary/radius/alias/alias.livingston rename to share/dictionary/radius/alias/livingston.txt diff --git a/share/dictionary/radius/alias/alias.local-web b/share/dictionary/radius/alias/local-web.txt similarity index 100% rename from share/dictionary/radius/alias/alias.local-web rename to share/dictionary/radius/alias/local-web.txt diff --git a/share/dictionary/radius/alias/alias.lucent b/share/dictionary/radius/alias/lucent.txt similarity index 100% rename from share/dictionary/radius/alias/alias.lucent rename to share/dictionary/radius/alias/lucent.txt diff --git a/share/dictionary/radius/alias/alias.manzara b/share/dictionary/radius/alias/manzara.txt similarity index 100% rename from share/dictionary/radius/alias/alias.manzara rename to share/dictionary/radius/alias/manzara.txt diff --git a/share/dictionary/radius/alias/alias.meinberg b/share/dictionary/radius/alias/meinberg.txt similarity index 100% rename from share/dictionary/radius/alias/alias.meinberg rename to share/dictionary/radius/alias/meinberg.txt diff --git a/share/dictionary/radius/alias/alias.meraki b/share/dictionary/radius/alias/meraki.txt similarity index 100% rename from share/dictionary/radius/alias/alias.meraki rename to share/dictionary/radius/alias/meraki.txt diff --git a/share/dictionary/radius/alias/alias.merit b/share/dictionary/radius/alias/merit.txt similarity index 100% rename from share/dictionary/radius/alias/alias.merit rename to share/dictionary/radius/alias/merit.txt diff --git a/share/dictionary/radius/alias/alias.meru b/share/dictionary/radius/alias/meru.txt similarity index 100% rename from share/dictionary/radius/alias/alias.meru rename to share/dictionary/radius/alias/meru.txt diff --git a/share/dictionary/radius/alias/alias.microsemi b/share/dictionary/radius/alias/microsemi.txt similarity index 100% rename from share/dictionary/radius/alias/alias.microsemi rename to share/dictionary/radius/alias/microsemi.txt diff --git a/share/dictionary/radius/alias/alias.microsoft b/share/dictionary/radius/alias/microsoft.txt similarity index 100% rename from share/dictionary/radius/alias/alias.microsoft rename to share/dictionary/radius/alias/microsoft.txt diff --git a/share/dictionary/radius/alias/alias.mikrotik b/share/dictionary/radius/alias/mikrotik.txt similarity index 100% rename from share/dictionary/radius/alias/alias.mikrotik rename to share/dictionary/radius/alias/mikrotik.txt diff --git a/share/dictionary/radius/alias/alias.mimosa b/share/dictionary/radius/alias/mimosa.txt similarity index 100% rename from share/dictionary/radius/alias/alias.mimosa rename to share/dictionary/radius/alias/mimosa.txt diff --git a/share/dictionary/radius/alias/alias.motorola b/share/dictionary/radius/alias/motorola.txt similarity index 100% rename from share/dictionary/radius/alias/alias.motorola rename to share/dictionary/radius/alias/motorola.txt diff --git a/share/dictionary/radius/alias/alias.navini b/share/dictionary/radius/alias/navini.txt similarity index 100% rename from share/dictionary/radius/alias/alias.navini rename to share/dictionary/radius/alias/navini.txt diff --git a/share/dictionary/radius/alias/alias.net b/share/dictionary/radius/alias/net.txt similarity index 100% rename from share/dictionary/radius/alias/alias.net rename to share/dictionary/radius/alias/net.txt diff --git a/share/dictionary/radius/alias/alias.netborder b/share/dictionary/radius/alias/netborder.txt similarity index 100% rename from share/dictionary/radius/alias/alias.netborder rename to share/dictionary/radius/alias/netborder.txt diff --git a/share/dictionary/radius/alias/alias.netscreen b/share/dictionary/radius/alias/netscreen.txt similarity index 100% rename from share/dictionary/radius/alias/alias.netscreen rename to share/dictionary/radius/alias/netscreen.txt diff --git a/share/dictionary/radius/alias/alias.networkphysics b/share/dictionary/radius/alias/networkphysics.txt similarity index 100% rename from share/dictionary/radius/alias/alias.networkphysics rename to share/dictionary/radius/alias/networkphysics.txt diff --git a/share/dictionary/radius/alias/alias.nexans b/share/dictionary/radius/alias/nexans.txt similarity index 100% rename from share/dictionary/radius/alias/alias.nexans rename to share/dictionary/radius/alias/nexans.txt diff --git a/share/dictionary/radius/alias/alias.nokia b/share/dictionary/radius/alias/nokia.txt similarity index 100% rename from share/dictionary/radius/alias/alias.nokia rename to share/dictionary/radius/alias/nokia.txt diff --git a/share/dictionary/radius/alias/alias.nomadix b/share/dictionary/radius/alias/nomadix.txt similarity index 100% rename from share/dictionary/radius/alias/alias.nomadix rename to share/dictionary/radius/alias/nomadix.txt diff --git a/share/dictionary/radius/alias/alias.nortel b/share/dictionary/radius/alias/nortel.txt similarity index 100% rename from share/dictionary/radius/alias/alias.nortel rename to share/dictionary/radius/alias/nortel.txt diff --git a/share/dictionary/radius/alias/alias.ntua b/share/dictionary/radius/alias/ntua.txt similarity index 100% rename from share/dictionary/radius/alias/alias.ntua rename to share/dictionary/radius/alias/ntua.txt diff --git a/share/dictionary/radius/alias/alias.packeteer b/share/dictionary/radius/alias/packeteer.txt similarity index 100% rename from share/dictionary/radius/alias/alias.packeteer rename to share/dictionary/radius/alias/packeteer.txt diff --git a/share/dictionary/radius/alias/alias.paloalto b/share/dictionary/radius/alias/paloalto.txt similarity index 100% rename from share/dictionary/radius/alias/alias.paloalto rename to share/dictionary/radius/alias/paloalto.txt diff --git a/share/dictionary/radius/alias/alias.patton b/share/dictionary/radius/alias/patton.txt similarity index 100% rename from share/dictionary/radius/alias/alias.patton rename to share/dictionary/radius/alias/patton.txt diff --git a/share/dictionary/radius/alias/alias.perle b/share/dictionary/radius/alias/perle.txt similarity index 100% rename from share/dictionary/radius/alias/alias.perle rename to share/dictionary/radius/alias/perle.txt diff --git a/share/dictionary/radius/alias/alias.pfsense b/share/dictionary/radius/alias/pfsense.txt similarity index 100% rename from share/dictionary/radius/alias/alias.pfsense rename to share/dictionary/radius/alias/pfsense.txt diff --git a/share/dictionary/radius/alias/alias.pica8 b/share/dictionary/radius/alias/pica8.txt similarity index 100% rename from share/dictionary/radius/alias/alias.pica8 rename to share/dictionary/radius/alias/pica8.txt diff --git a/share/dictionary/radius/alias/alias.propel b/share/dictionary/radius/alias/propel.txt similarity index 100% rename from share/dictionary/radius/alias/alias.propel rename to share/dictionary/radius/alias/propel.txt diff --git a/share/dictionary/radius/alias/alias.prosoft b/share/dictionary/radius/alias/prosoft.txt similarity index 100% rename from share/dictionary/radius/alias/alias.prosoft rename to share/dictionary/radius/alias/prosoft.txt diff --git a/share/dictionary/radius/alias/alias.proxim b/share/dictionary/radius/alias/proxim.txt similarity index 100% rename from share/dictionary/radius/alias/alias.proxim rename to share/dictionary/radius/alias/proxim.txt diff --git a/share/dictionary/radius/alias/alias.purewave b/share/dictionary/radius/alias/purewave.txt similarity index 100% rename from share/dictionary/radius/alias/alias.purewave rename to share/dictionary/radius/alias/purewave.txt diff --git a/share/dictionary/radius/alias/alias.quiconnect b/share/dictionary/radius/alias/quiconnect.txt similarity index 100% rename from share/dictionary/radius/alias/alias.quiconnect rename to share/dictionary/radius/alias/quiconnect.txt diff --git a/share/dictionary/radius/alias/alias.quintum b/share/dictionary/radius/alias/quintum.txt similarity index 100% rename from share/dictionary/radius/alias/alias.quintum rename to share/dictionary/radius/alias/quintum.txt diff --git a/share/dictionary/radius/alias/alias.rcntec b/share/dictionary/radius/alias/rcntec.txt similarity index 100% rename from share/dictionary/radius/alias/alias.rcntec rename to share/dictionary/radius/alias/rcntec.txt diff --git a/share/dictionary/radius/alias/alias.redcreek b/share/dictionary/radius/alias/redcreek.txt similarity index 100% rename from share/dictionary/radius/alias/alias.redcreek rename to share/dictionary/radius/alias/redcreek.txt diff --git a/share/dictionary/radius/alias/alias.riverbed b/share/dictionary/radius/alias/riverbed.txt similarity index 100% rename from share/dictionary/radius/alias/alias.riverbed rename to share/dictionary/radius/alias/riverbed.txt diff --git a/share/dictionary/radius/alias/alias.riverstone b/share/dictionary/radius/alias/riverstone.txt similarity index 100% rename from share/dictionary/radius/alias/alias.riverstone rename to share/dictionary/radius/alias/riverstone.txt diff --git a/share/dictionary/radius/alias/alias.roaring-penguin b/share/dictionary/radius/alias/roaring-penguin.txt similarity index 100% rename from share/dictionary/radius/alias/alias.roaring-penguin rename to share/dictionary/radius/alias/roaring-penguin.txt diff --git a/share/dictionary/radius/alias/alias.ruckus b/share/dictionary/radius/alias/ruckus.txt similarity index 100% rename from share/dictionary/radius/alias/alias.ruckus rename to share/dictionary/radius/alias/ruckus.txt diff --git a/share/dictionary/radius/alias/alias.ruggedcom b/share/dictionary/radius/alias/ruggedcom.txt similarity index 100% rename from share/dictionary/radius/alias/alias.ruggedcom rename to share/dictionary/radius/alias/ruggedcom.txt diff --git a/share/dictionary/radius/alias/alias.sg b/share/dictionary/radius/alias/sg.txt similarity index 100% rename from share/dictionary/radius/alias/alias.sg rename to share/dictionary/radius/alias/sg.txt diff --git a/share/dictionary/radius/alias/alias.shasta b/share/dictionary/radius/alias/shasta.txt similarity index 100% rename from share/dictionary/radius/alias/alias.shasta rename to share/dictionary/radius/alias/shasta.txt diff --git a/share/dictionary/radius/alias/alias.shiva b/share/dictionary/radius/alias/shiva.txt similarity index 100% rename from share/dictionary/radius/alias/alias.shiva rename to share/dictionary/radius/alias/shiva.txt diff --git a/share/dictionary/radius/alias/alias.siemens b/share/dictionary/radius/alias/siemens.txt similarity index 100% rename from share/dictionary/radius/alias/alias.siemens rename to share/dictionary/radius/alias/siemens.txt diff --git a/share/dictionary/radius/alias/alias.slipstream b/share/dictionary/radius/alias/slipstream.txt similarity index 100% rename from share/dictionary/radius/alias/alias.slipstream rename to share/dictionary/radius/alias/slipstream.txt diff --git a/share/dictionary/radius/alias/alias.sofaware b/share/dictionary/radius/alias/sofaware.txt similarity index 100% rename from share/dictionary/radius/alias/alias.sofaware rename to share/dictionary/radius/alias/sofaware.txt diff --git a/share/dictionary/radius/alias/alias.softbank b/share/dictionary/radius/alias/softbank.txt similarity index 100% rename from share/dictionary/radius/alias/alias.softbank rename to share/dictionary/radius/alias/softbank.txt diff --git a/share/dictionary/radius/alias/alias.sonicwall b/share/dictionary/radius/alias/sonicwall.txt similarity index 100% rename from share/dictionary/radius/alias/alias.sonicwall rename to share/dictionary/radius/alias/sonicwall.txt diff --git a/share/dictionary/radius/alias/alias.springtide b/share/dictionary/radius/alias/springtide.txt similarity index 100% rename from share/dictionary/radius/alias/alias.springtide rename to share/dictionary/radius/alias/springtide.txt diff --git a/share/dictionary/radius/alias/alias.starent b/share/dictionary/radius/alias/starent.txt similarity index 100% rename from share/dictionary/radius/alias/alias.starent rename to share/dictionary/radius/alias/starent.txt diff --git a/share/dictionary/radius/alias/alias.surfnet b/share/dictionary/radius/alias/surfnet.txt similarity index 100% rename from share/dictionary/radius/alias/alias.surfnet rename to share/dictionary/radius/alias/surfnet.txt diff --git a/share/dictionary/radius/alias/alias.symbol b/share/dictionary/radius/alias/symbol.txt similarity index 100% rename from share/dictionary/radius/alias/alias.symbol rename to share/dictionary/radius/alias/symbol.txt diff --git a/share/dictionary/radius/alias/alias.t-systems-nova b/share/dictionary/radius/alias/t-systems-nova.txt similarity index 100% rename from share/dictionary/radius/alias/alias.t-systems-nova rename to share/dictionary/radius/alias/t-systems-nova.txt diff --git a/share/dictionary/radius/alias/alias.telebit b/share/dictionary/radius/alias/telebit.txt similarity index 100% rename from share/dictionary/radius/alias/alias.telebit rename to share/dictionary/radius/alias/telebit.txt diff --git a/share/dictionary/radius/alias/alias.telkom b/share/dictionary/radius/alias/telkom.txt similarity index 100% rename from share/dictionary/radius/alias/alias.telkom rename to share/dictionary/radius/alias/telkom.txt diff --git a/share/dictionary/radius/alias/alias.telrad b/share/dictionary/radius/alias/telrad.txt similarity index 100% rename from share/dictionary/radius/alias/alias.telrad rename to share/dictionary/radius/alias/telrad.txt diff --git a/share/dictionary/radius/alias/alias.terena b/share/dictionary/radius/alias/terena.txt similarity index 100% rename from share/dictionary/radius/alias/alias.terena rename to share/dictionary/radius/alias/terena.txt diff --git a/share/dictionary/radius/alias/alias.trapeze b/share/dictionary/radius/alias/trapeze.txt similarity index 100% rename from share/dictionary/radius/alias/alias.trapeze rename to share/dictionary/radius/alias/trapeze.txt diff --git a/share/dictionary/radius/alias/alias.travelping b/share/dictionary/radius/alias/travelping.txt similarity index 100% rename from share/dictionary/radius/alias/alias.travelping rename to share/dictionary/radius/alias/travelping.txt diff --git a/share/dictionary/radius/alias/alias.tripplite b/share/dictionary/radius/alias/tripplite.txt similarity index 100% rename from share/dictionary/radius/alias/alias.tripplite rename to share/dictionary/radius/alias/tripplite.txt diff --git a/share/dictionary/radius/alias/alias.tropos b/share/dictionary/radius/alias/tropos.txt similarity index 100% rename from share/dictionary/radius/alias/alias.tropos rename to share/dictionary/radius/alias/tropos.txt diff --git a/share/dictionary/radius/alias/alias.ukerna b/share/dictionary/radius/alias/ukerna.txt similarity index 100% rename from share/dictionary/radius/alias/alias.ukerna rename to share/dictionary/radius/alias/ukerna.txt diff --git a/share/dictionary/radius/alias/alias.unix b/share/dictionary/radius/alias/unix.txt similarity index 100% rename from share/dictionary/radius/alias/alias.unix rename to share/dictionary/radius/alias/unix.txt diff --git a/share/dictionary/radius/alias/alias.usr b/share/dictionary/radius/alias/usr.txt similarity index 100% rename from share/dictionary/radius/alias/alias.usr rename to share/dictionary/radius/alias/usr.txt diff --git a/share/dictionary/radius/alias/alias.utstarcom b/share/dictionary/radius/alias/utstarcom.txt similarity index 100% rename from share/dictionary/radius/alias/alias.utstarcom rename to share/dictionary/radius/alias/utstarcom.txt diff --git a/share/dictionary/radius/alias/alias.valemountnetworks b/share/dictionary/radius/alias/valemountnetworks.txt similarity index 100% rename from share/dictionary/radius/alias/alias.valemountnetworks rename to share/dictionary/radius/alias/valemountnetworks.txt diff --git a/share/dictionary/radius/alias/alias.vasexperts b/share/dictionary/radius/alias/vasexperts.txt similarity index 100% rename from share/dictionary/radius/alias/alias.vasexperts rename to share/dictionary/radius/alias/vasexperts.txt diff --git a/share/dictionary/radius/alias/alias.verizonwireless b/share/dictionary/radius/alias/verizonwireless.txt similarity index 100% rename from share/dictionary/radius/alias/alias.verizonwireless rename to share/dictionary/radius/alias/verizonwireless.txt diff --git a/share/dictionary/radius/alias/alias.versanet b/share/dictionary/radius/alias/versanet.txt similarity index 100% rename from share/dictionary/radius/alias/alias.versanet rename to share/dictionary/radius/alias/versanet.txt diff --git a/share/dictionary/radius/alias/alias.walabi b/share/dictionary/radius/alias/walabi.txt similarity index 100% rename from share/dictionary/radius/alias/alias.walabi rename to share/dictionary/radius/alias/walabi.txt diff --git a/share/dictionary/radius/alias/alias.waverider b/share/dictionary/radius/alias/waverider.txt similarity index 100% rename from share/dictionary/radius/alias/alias.waverider rename to share/dictionary/radius/alias/waverider.txt diff --git a/share/dictionary/radius/alias/alias.wichorus b/share/dictionary/radius/alias/wichorus.txt similarity index 100% rename from share/dictionary/radius/alias/alias.wichorus rename to share/dictionary/radius/alias/wichorus.txt diff --git a/share/dictionary/radius/alias/alias.wifi-alliance b/share/dictionary/radius/alias/wifi-alliance.txt similarity index 100% rename from share/dictionary/radius/alias/alias.wifi-alliance rename to share/dictionary/radius/alias/wifi-alliance.txt diff --git a/share/dictionary/radius/alias/alias.wimax b/share/dictionary/radius/alias/wimax.txt similarity index 100% rename from share/dictionary/radius/alias/alias.wimax rename to share/dictionary/radius/alias/wimax.txt diff --git a/share/dictionary/radius/alias/alias.wispr b/share/dictionary/radius/alias/wispr.txt similarity index 100% rename from share/dictionary/radius/alias/alias.wispr rename to share/dictionary/radius/alias/wispr.txt diff --git a/share/dictionary/radius/alias/alias.xedia b/share/dictionary/radius/alias/xedia.txt similarity index 100% rename from share/dictionary/radius/alias/alias.xedia rename to share/dictionary/radius/alias/xedia.txt diff --git a/share/dictionary/radius/alias/alias.xylan b/share/dictionary/radius/alias/xylan.txt similarity index 100% rename from share/dictionary/radius/alias/alias.xylan rename to share/dictionary/radius/alias/xylan.txt diff --git a/share/dictionary/radius/alias/alias.yubico b/share/dictionary/radius/alias/yubico.txt similarity index 100% rename from share/dictionary/radius/alias/alias.yubico rename to share/dictionary/radius/alias/yubico.txt diff --git a/share/dictionary/radius/alias/alias.zeus b/share/dictionary/radius/alias/zeus.txt similarity index 100% rename from share/dictionary/radius/alias/alias.zeus rename to share/dictionary/radius/alias/zeus.txt diff --git a/share/dictionary/radius/alias/alias.zte b/share/dictionary/radius/alias/zte.txt similarity index 100% rename from share/dictionary/radius/alias/alias.zte rename to share/dictionary/radius/alias/zte.txt diff --git a/share/dictionary/radius/alias/alias.zyxel b/share/dictionary/radius/alias/zyxel.txt similarity index 100% rename from share/dictionary/radius/alias/alias.zyxel rename to share/dictionary/radius/alias/zyxel.txt