Updated Trapeze dictionary and added one for Meru (as submitted by John Carter)

diff --git a/share/dictionary b/share/dictionary
index 3b8bd1e..a443e29 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -162,6 +162,7 @@ $INCLUDE dictionary.localweb
 $INCLUDE dictionary.lucent
 $INCLUDE dictionary.manzara
 $INCLUDE dictionary.merit
+$INCLUDE dictionary.meru
 $INCLUDE dictionary.microsoft
 $INCLUDE dictionary.mikrotik
 $INCLUDE dictionary.motorola

diff --git a/share/dictionary.meru b/share/dictionary.meru
new file mode 100644 (file)
index 0000000..7efe595
--- /dev/null
+++ b/share/dictionary.meru
@@ -0,0 +1,17 @@
+# -*- text -*-
+# Copyright (C) 2013 The FreeRADIUS Server project and contributors
+#
+#      dictionary.meru
+#
+#      $Id$
+#
+#
+VENDOR          Meru            15983
+
+BEGIN-VENDOR    Meru
+
+ATTRIBUTE       Access-Point-Id                 1       integer
+ATTRIBUTE       Access-Point-Name               2       string
+
+END-VENDOR      Meru
+

diff --git a/share/dictionary.trapeze b/share/dictionary.trapeze
index 06a3706..62d9827 100644 (file)
--- a/share/dictionary.trapeze
+++ b/share/dictionary.trapeze
@@ -29,4 +29,10 @@ ATTRIBUTE    Trapeze-End-Date                        6       string
 ATTRIBUTE      Trapeze-Start-Date                      7       string
 ATTRIBUTE      Trapeze-URL                             8       string
 
+# Additional attributes, not known when added
+ATTRIBUTE      Trapeze-User-Group-Name                 9       string
+ATTRIBUTE      Trapeze-QoS-Profile                     10      string
+ATTRIBUTE      Trapeze-Simultaneous-Logins             11      string
+ATTRIBUTE      Trapeze-CoA-Username                    12      string
+
 END-VENDOR     Trapeze