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

diff --git a/radius/dictionary b/radius/dictionary
index ffa6c43ab8..06166d8cb1 100644
--- a/radius/dictionary
+++ b/radius/dictionary
@@ -1,6 +1,22 @@
 # -*- text -*-
 #
 # Version $Id$
+# 2014-11-03 Comment out
+# dictionary.rfc6929
+# dictionary.rfc6930
+# dictionary.rfc7155
+# dictionary.rfc7268
+# As they give errors in the test, something may have changed in the free rasdius syntax
+#
+# 2014-10-26 Updated based upon FreeRadius v3.0.4 dictionary file
+#	     - Added : actelis, aerohive, alvarion.wimax.v2_2, bluecoat, broadsoft, brocade, bskyb,
+#	       bt, camiant, cisco.asa, citrix, compatible, dante, dlink, dragonwave, efficientip,
+#	       equallogic, ericsson.packet.core.networks, f5, fdxtended, freedhcp, iana, infoblox,
+#	       kineto, meru, paloalto, proxim, purewave, riverbed, ruckus, sg, siemens, starent.vsa1,
+#	       surfnet, symbol, terena, wimax.alvarion, yubico, zeus, zte
+#	     - Added : rfc6677, rfc6911, rfc6929, rfc6930, rfc7055, rfc7155, rfc7268
+#	     - Renamed Redback to Ericsson-AB
+#	     - Renamed Alcatel-lucent.xylan to Xylan
 #
 # 2011-05-24 Updated based upon FreeRadius v2.1.10 dictionary file
 #            - Added: acme, alcatel.sr, iea, motorola.wimax, rfc4603, rfc 5580, rfc5607, rfc5904, wichorus
@@ -91,9 +107,45 @@ $INCLUDE dictionary.rfc4679
 $INCLUDE dictionary.rfc4818
 $INCLUDE dictionary.rfc4849
 $INCLUDE dictionary.rfc5176
+$INCLUDE dictionary.rfc5447
 $INCLUDE dictionary.rfc5580
 $INCLUDE dictionary.rfc5607
 $INCLUDE dictionary.rfc5904
+$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
+#	"expert review", but which don't have an RFC associated with them.
+#
+$INCLUDE dictionary.iana
 
 #
 #	Include vendor dictionaries after the standard ones.
@@ -103,22 +155,31 @@ $INCLUDE dictionary.3gpp
 $INCLUDE dictionary.3gpp2
 $INCLUDE dictionary.acc
 $INCLUDE dictionary.acme
+$INCLUDE dictionary.actelis
 $INCLUDE dictionary.airespace
 $INCLUDE dictionary.alcatel
 $INCLUDE dictionary.alcatel.sr
-$INCLUDE dictionary.alcatel-lucent.xylan
+$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
 $INCLUDE dictionary.bay
 $INCLUDE dictionary.bintec
+$INCLUDE dictionary.bluecoat
+$INCLUDE dictionary.broadsoft
+$INCLUDE dictionary.brocade
+$INCLUDE dictionary.bskyb
+$INCLUDE dictionary.bt
 $INCLUDE dictionary.cablelabs
 $INCLUDE dictionary.cabletron
+$INCLUDE dictionary.camiant
 $INCLUDE dictionary.chillispot
 $INCLUDE dictionary.cisco
+$INCLUDE dictionary.cisco.asa
 #
 #	 The Cisco VPN300 dictionary is the same as the altiga one.
 #	 You shouldn't use both at the same time.
@@ -126,16 +187,27 @@ $INCLUDE dictionary.cisco
 $INCLUDE dictionary.cisco.vpn3000
 $INCLUDE dictionary.cisco.vpn5000
 $INCLUDE dictionary.cisco.bbsm
+$INCLUDE dictionary.citrix
 $INCLUDE dictionary.clavister
 $INCLUDE dictionary.colubris
+$INCLUDE dictionary.compatible
 $INCLUDE dictionary.cosine
+$INCLUDE dictionary.dante
 #$INCLUDE dictionary.dhcp
+$INCLUDE dictionary.dlink
 $INCLUDE dictionary.digium
+$INCLUDE dictionary.dragonwave
+$INCLUDE dictionary.efficientip
 $INCLUDE dictionary.eltex
 $INCLUDE dictionary.epygi
 $INCLUDE dictionary.erx
+$INCLUDE dictionary.equallogic
 $INCLUDE dictionary.ericsson
+$INCLUDE dictionary.ericsson.ab
+$INCLUDE dictionary.ericsson.packet.core.networks
 $INCLUDE dictionary.extreme
+$INCLUDE dictionary.f5
+$INCLUDE dictionary.fdxtended
 $INCLUDE dictionary.freeradius
 $INCLUDE dictionary.freeswitch
 $INCLUDE dictionary.fortinet
@@ -153,14 +225,19 @@ $INCLUDE dictionary.ipunplugged
 $INCLUDE dictionary.juniper
 $INCLUDE dictionary.jradius
 $INCLUDE dictionary.karlnet
+$INCLUDE dictionary.kineto
 $INCLUDE dictionary.lancom
 $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
 $INCLUDE dictionary.motorola.wimax
 $INCLUDE dictionary.navini
 $INCLUDE dictionary.netscreen
@@ -179,25 +256,41 @@ $INCLUDE dictionary.nortel
 #
 #$INCLUDE dictionary.openser
 $INCLUDE dictionary.packeteer
+$INCLUDE dictionary.paloalto
 $INCLUDE dictionary.patton
+$INCLUDE dictionary.perle
 $INCLUDE dictionary.propel
 $INCLUDE dictionary.prosoft
+$INCLUDE dictionary.proxim
+$INCLUDE dictionary.purewave
 $INCLUDE dictionary.quiconnect
 $INCLUDE dictionary.quintum
-$INCLUDE dictionary.redback
 $INCLUDE dictionary.redcreek
+$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
+$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
+$INCLUDE dictionary.unix
 $INCLUDE dictionary.usr
 $INCLUDE dictionary.utstarcom
 $INCLUDE dictionary.valemount
@@ -209,6 +302,12 @@ $INCLUDE dictionary.wichorus
 $INCLUDE dictionary.wimax
 $INCLUDE dictionary.wispr
 $INCLUDE dictionary.xedia
+$INCLUDE dictionary.xylan
+$INCLUDE dictionary.yubico
+$INCLUDE dictionary.zeus
+$INCLUDE dictionary.zte
+$INCLUDE dictionary.zyxel
+$INCLUDE custom.includes
 
 #
 #	And finally the server internal attributes.