Move references to illegal dictionaries to raddb/dictionary

The main dictionary files should NOT be edited.  Ever.  So placing
the "illegal" attributes in a file which can be edited is a good idea.

diff --git a/raddb/dictionary.in b/raddb/dictionary.in
index ceb31c8..2fbd1fb 100644 (file)
--- a/raddb/dictionary.in
+++ b/raddb/dictionary.in
@@ -9,6 +9,35 @@
 #
 
 #
+#  These two dictionaries define attributes which conflict with the
+#  IANA assigned attributes.  They define attributes for equipment which
+#  is 5-10 years old, and which should *no longer* be used.
+#
+#  Moving the dictionaries here has the following effect:
+#
+#      1) The "old" names in the dictionaries can still be used in
+#         SQL, the "users" file, etc.
+#
+#      2) Access-Request and Accounting-Request packets will use the
+#         "new" names.
+#
+$INCLUDE       @prefix@/dictionary.ascend.illegal
+$INCLUDE       @prefix@/dictionary.usr.illegal
+
+#
+#  The DHCP dictionary is used only when the server is built with
+#  "configure --with-dhcp".  It is not (and should not) be used in
+#  other situations.  If you are running just a RADIUS server, this
+#  line can be deleted.  If you are using DHCP, the following line
+#  should be uncommented.
+#
+#  Ideally, the "configure" process should automatically enable this
+#  dictionary, but we don't yet do that.
+#
+#$INCLUDE      @prefix@/dictionary.dhcp
+
+
+#
 #      The filename given here should be an absolute path. 
 #
 $INCLUDE       @prefix@/share/freeradius/dictionary

diff --git a/share/dictionary b/share/dictionary
index 856c1ce..ca54ec7 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -100,7 +100,6 @@ $INCLUDE dictionary.apc
 $INCLUDE dictionary.aruba
 $INCLUDE dictionary.azaire
 $INCLUDE dictionary.ascend
-$INCLUDE dictionary.ascend.illegal
 $INCLUDE dictionary.bay
 $INCLUDE dictionary.bintec
 $INCLUDE dictionary.cablelabs
@@ -117,7 +116,6 @@ $INCLUDE dictionary.cisco.bbsm
 $INCLUDE dictionary.clavister
 $INCLUDE dictionary.colubris
 $INCLUDE dictionary.cosine
-$INCLUDE dictionary.dhcp
 $INCLUDE dictionary.digium
 $INCLUDE dictionary.eltex
 $INCLUDE dictionary.epygi
@@ -188,7 +186,6 @@ $INCLUDE dictionary.tropos
 $INCLUDE dictionary.t_systems_nova
 $INCLUDE dictionary.unix
 $INCLUDE dictionary.usr
-$INCLUDE dictionary.usr.illegal
 $INCLUDE dictionary.utstarcom
 $INCLUDE dictionary.valemount
 $INCLUDE dictionary.versanet