Move illegal attributes around

And enable the Motorola VSA dictionary

diff --git a/share/dictionary b/share/dictionary
index 63865e3..ea57a4e 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -152,6 +152,7 @@ $INCLUDE dictionary.manzara
 $INCLUDE dictionary.merit
 $INCLUDE dictionary.microsoft
 $INCLUDE dictionary.mikrotik
+$INCLUDE dictionary.motorola
 $INCLUDE dictionary.motorola.wimax
 $INCLUDE dictionary.navini
 $INCLUDE dictionary.netscreen

diff --git a/share/dictionary.motorola b/share/dictionary.motorola
index fccaf03..3f76aac 100644 (file)
--- a/share/dictionary.motorola
+++ b/share/dictionary.motorola
@@ -12,20 +12,6 @@
 
 VENDOR         Motorola                        161
 
-ATTRIBUTE      Motorola-Canopy-Shared-Secret           224     string
-ATTRIBUTE      Motorola-Canopy-SULDR                   225     string
-ATTRIBUTE      Motorola-Canopy-SDLDR                   226     string
-ATTRIBUTE      Motorola-Canopy-ULBA                    227     string
-ATTRIBUTE      Motorola-Canopy-DLBA                    228     string
-ATTRIBUTE      Motorola-Canopy-Enable                  229     string
-ATTRIBUTE      Motorola-Canopy-LPSULDR                 230     string
-ATTRIBUTE      Motorola-Canopy-LPSDLDR                 231     string
-ATTRIBUTE      Motorola-Canopy-HPCENABLE               232     string
-ATTRIBUTE      Motorola-Canopy-HPSULDR                 233     string
-ATTRIBUTE      Motorola-Canopy-HPSDLDR                 234     string
-ATTRIBUTE      Motorola-Canopy-HIGHERBW                235     string
-ATTRIBUTE      Motorola-Canopy-CIRENABLE               236     string
-
 BEGIN-VENDOR   Motorola
 
 # Low Priority uplink CIR

diff --git a/share/dictionary.motorola.illegal b/share/dictionary.motorola.illegal
new file mode 100644 (file)
index 0000000..5943da4
--- /dev/null
+++ b/share/dictionary.motorola.illegal
@@ -0,0 +1,26 @@
+# -*- text -*-
+##############################################################################
+#
+#      Motorola Canopy attributes.
+#
+#      See also dictionary.motorola.illegal.  You can use that one
+#      by listing it in raddb/dictionary.
+#
+#      $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Motorola-Canopy-Shared-Secret           224     string
+ATTRIBUTE      Motorola-Canopy-SULDR                   225     string
+ATTRIBUTE      Motorola-Canopy-SDLDR                   226     string
+ATTRIBUTE      Motorola-Canopy-ULBA                    227     string
+ATTRIBUTE      Motorola-Canopy-DLBA                    228     string
+ATTRIBUTE      Motorola-Canopy-Enable                  229     string
+ATTRIBUTE      Motorola-Canopy-LPSULDR                 230     string
+ATTRIBUTE      Motorola-Canopy-LPSDLDR                 231     string
+ATTRIBUTE      Motorola-Canopy-HPCENABLE               232     string
+ATTRIBUTE      Motorola-Canopy-HPSULDR                 233     string
+ATTRIBUTE      Motorola-Canopy-HPSDLDR                 234     string
+ATTRIBUTE      Motorola-Canopy-HIGHERBW                235     string
+ATTRIBUTE      Motorola-Canopy-CIRENABLE               236     string
+