X-Git-Url: http://git.samba.org/?p=metze%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=radius%2Fdictionary;h=06166d8cb1ee2a96deab16d339fbff773f21468c;hp=1f7e59aa528b5dc0900b62edadca0d698400bdab;hb=cc09fbd2142607a43c2677f51e93095d0a7cb966;hpb=7613327d69747ec4e2b6045c0f29be00128d2b69

diff --git a/radius/dictionary b/radius/dictionary
index 1f7e59aa52..06166d8cb1 100644
--- a/radius/dictionary
+++ b/radius/dictionary
@@ -115,11 +115,31 @@ $INCLUDE dictionary.rfc6519
 $INCLUDE dictionary.rfc6572
 $INCLUDE dictionary.rfc6677
 $INCLUDE dictionary.rfc6911
+#
+# We do not support RFC 6929, so we comment this out.
+# See bug 13176.
+#
 #$INCLUDE dictionary.rfc6929
+#
+# We do not support RFC 6929, so we comment this out.
+# See bug 13176.
+#
 #$INCLUDE dictionary.rfc6930
 $INCLUDE dictionary.rfc7055
 #$INCLUDE dictionary.rfc7155
 #$INCLUDE dictionary.rfc7268
+#
+# We do not support RFC 6929, so we comment these out.  They cause
+#
+#  radius: Vendor: 'integer', does not exist in {dictionary file}
+#
+# errors.
+#
+# See bug 13176.
+#
+#$INCLUDE dictionary.rfc7499
+#$INCLUDE dictionary.rfc7930
+
 
 #
 #	Mostly values which have been allocated by IANA under
@@ -143,6 +163,7 @@ $INCLUDE dictionary.alcatel-lucent.aaa
 $INCLUDE dictionary.alteon
 $INCLUDE dictionary.alvarion
 $INCLUDE dictionary.apc
+$INCLUDE dictionary.arbor
 $INCLUDE dictionary.aruba
 $INCLUDE dictionary.azaire
 $INCLUDE dictionary.ascend
@@ -210,8 +231,10 @@ $INCLUDE dictionary.livingston
 $INCLUDE dictionary.localweb
 $INCLUDE dictionary.lucent
 $INCLUDE dictionary.manzara
+$INCLUDE dictionary.meinberg
 $INCLUDE dictionary.merit
 $INCLUDE dictionary.meru
+$INCLUDE dictionary.microsemi
 $INCLUDE dictionary.microsoft
 $INCLUDE dictionary.mikrotik
 $INCLUDE dictionary.motorola
@@ -235,6 +258,7 @@ $INCLUDE dictionary.nortel
 $INCLUDE dictionary.packeteer
 $INCLUDE dictionary.paloalto
 $INCLUDE dictionary.patton
+$INCLUDE dictionary.perle
 $INCLUDE dictionary.propel
 $INCLUDE dictionary.prosoft
 $INCLUDE dictionary.proxim
@@ -246,6 +270,8 @@ $INCLUDE dictionary.riverbed
 $INCLUDE dictionary.riverstone
 $INCLUDE dictionary.roaringpenguin
 $INCLUDE dictionary.ruckus
+$INCLUDE dictionary.ruggedcom
+$INCLUDE dictionary.sangoma
 $INCLUDE dictionary.shasta
 $INCLUDE dictionary.sg
 $INCLUDE dictionary.shiva
@@ -253,12 +279,14 @@ $INCLUDE dictionary.siemens
 $INCLUDE dictionary.slipstream
 $INCLUDE dictionary.sonicwall
 $INCLUDE dictionary.springtide
-$INCLUDE dictionary.starent
+#$INCLUDE dictionary.starent       Thes two are mutally exlusive I think, make the "old" one the default
+$INCLUDE dictionary.starent.vsa1
 $INCLUDE dictionary.surfnet
 $INCLUDE dictionary.symbol
 $INCLUDE dictionary.telebit
 $INCLUDE dictionary.terena
 $INCLUDE dictionary.trapeze
+$INCLUDE dictionary.travelping
 $INCLUDE dictionary.tropos
 $INCLUDE dictionary.t_systems_nova
 $INCLUDE dictionary.ukerna