aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packaging/nsis/wireshark.nsi1
-rw-r--r--radius/dictionary1
-rw-r--r--radius/dictionary.meraki15
3 files changed, 17 insertions, 0 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 5768a60119..4f80ed87c9 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -695,6 +695,7 @@ File "${STAGING_DIR}\radius\dictionary.localweb"
File "${STAGING_DIR}\radius\dictionary.lucent"
File "${STAGING_DIR}\radius\dictionary.manzara"
File "${STAGING_DIR}\radius\dictionary.meinberg"
+File "${STAGING_DIR}\radius\dictionary.meraki"
File "${STAGING_DIR}\radius\dictionary.merit"
File "${STAGING_DIR}\radius\dictionary.meru"
File "${STAGING_DIR}\radius\dictionary.microsemi"
diff --git a/radius/dictionary b/radius/dictionary
index 034fb6d6c8..7f68169813 100644
--- a/radius/dictionary
+++ b/radius/dictionary
@@ -218,6 +218,7 @@ $INCLUDE dictionary.localweb
$INCLUDE dictionary.lucent
$INCLUDE dictionary.manzara
$INCLUDE dictionary.meinberg
+$INCLUDE dictionary.meraki
$INCLUDE dictionary.merit
$INCLUDE dictionary.meru
$INCLUDE dictionary.microsemi
diff --git a/radius/dictionary.meraki b/radius/dictionary.meraki
new file mode 100644
index 0000000000..eb69f5e6d6
--- /dev/null
+++ b/radius/dictionary.meraki
@@ -0,0 +1,15 @@
+# -*- text -*-
+# Copyright (C) 2015 The FreeRADIUS Server project and contributors
+#
+# For Meraki.
+#
+
+VENDOR Meraki 29671
+BEGIN-VENDOR Meraki
+
+ATTRIBUTE Meraki-Device-Name 1 string
+ATTRIBUTE Meraki-Network-Name 2 string
+ATTRIBUTE Meraki-Ap-Name 3 string
+ATTRIBUTE Meraki-Ap-Tags 4 string
+
+END-VENDOR Meraki