X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=share%2Fdictionary;h=5cb0e2f6b4668bb22dbf0d8723c55b8c241bb013;hb=3fe7a409cbbc70bf0bee41c46a38d6fdfa77c697;hp=d9190a045f5bbcadaf9298302d547f18cb358f84;hpb=68ff900c0901ed6c314a8d82b2a3d73cb5a7d925;p=freeradius.git

diff --git a/share/dictionary b/share/dictionary
index d9190a0..5cb0e2f 100644
--- a/share/dictionary
+++ b/share/dictionary
@@ -71,9 +71,18 @@ $INCLUDE dictionary.rfc2869
 $INCLUDE dictionary.rfc3162
 $INCLUDE dictionary.rfc3576
 $INCLUDE dictionary.rfc3580
+$INCLUDE dictionary.rfc4072
 $INCLUDE dictionary.rfc4372
+$INCLUDE dictionary.rfc4603
 $INCLUDE dictionary.rfc4675
 $INCLUDE dictionary.rfc4679
+$INCLUDE dictionary.rfc4818
+$INCLUDE dictionary.rfc4849
+$INCLUDE dictionary.rfc5176
+$INCLUDE dictionary.rfc5580
+$INCLUDE dictionary.rfc5607
+$INCLUDE dictionary.rfc5904
+$INCLUDE dictionary.extended
 
 #
 #	Include vendor dictionaries after the standard ones.
@@ -82,17 +91,22 @@ $INCLUDE dictionary.3com
 $INCLUDE dictionary.3gpp
 $INCLUDE dictionary.3gpp2
 $INCLUDE dictionary.acc
+$INCLUDE dictionary.acme
 $INCLUDE dictionary.airespace
 $INCLUDE dictionary.alcatel
+$INCLUDE dictionary.alcatel.sr
 $INCLUDE dictionary.alteon
 $INCLUDE dictionary.alvarion
+$INCLUDE dictionary.apc
 $INCLUDE dictionary.aruba
 $INCLUDE dictionary.azaire
 $INCLUDE dictionary.ascend
+$INCLUDE dictionary.ascend.illegal
 $INCLUDE dictionary.bay
 $INCLUDE dictionary.bintec
 $INCLUDE dictionary.cablelabs
 $INCLUDE dictionary.cabletron
+$INCLUDE dictionary.chillispot
 $INCLUDE dictionary.cisco
 #
 #	 The Cisco VPN300 dictionary is the same as the altiga one.
@@ -101,14 +115,17 @@ $INCLUDE dictionary.cisco
 #$INCLUDE dictionary.cisco.vpn3000
 $INCLUDE dictionary.cisco.vpn5000
 $INCLUDE dictionary.cisco.bbsm
+$INCLUDE dictionary.clavister
 $INCLUDE dictionary.colubris
 $INCLUDE dictionary.cosine
+$INCLUDE dictionary.dhcp
 $INCLUDE dictionary.digium
 $INCLUDE dictionary.epygi
 $INCLUDE dictionary.erx
 $INCLUDE dictionary.ericsson
 $INCLUDE dictionary.extreme
 $INCLUDE dictionary.freeradius
+$INCLUDE dictionary.freeswitch
 $INCLUDE dictionary.fortinet
 $INCLUDE dictionary.foundry
 $INCLUDE dictionary.gandalf
@@ -116,25 +133,38 @@ $INCLUDE dictionary.gemtek
 $INCLUDE dictionary.h3c
 $INCLUDE dictionary.hp
 $INCLUDE dictionary.huawei
+$INCLUDE dictionary.iea
+$INCLUDE dictionary.infonet
 $INCLUDE dictionary.issanni
 $INCLUDE dictionary.itk
 $INCLUDE dictionary.ipunplugged
 $INCLUDE dictionary.juniper
 $INCLUDE dictionary.jradius
 $INCLUDE dictionary.karlnet
+$INCLUDE dictionary.lancom
 $INCLUDE dictionary.livingston
 $INCLUDE dictionary.localweb
 $INCLUDE dictionary.lucent
+$INCLUDE dictionary.manzara
+$INCLUDE dictionary.merit
 $INCLUDE dictionary.microsoft
-$INCLUDE dictionary.mikrotik
+$INCLUDE dictionary.motorola.wimax
 $INCLUDE dictionary.navini
 $INCLUDE dictionary.netscreen
+$INCLUDE dictionary.networkphysics
 $INCLUDE dictionary.nexans
 $INCLUDE dictionary.ntua
 $INCLUDE dictionary.nokia
+#
+#  Commented out because of attribute conflicts.
+#
 #$INCLUDE dictionary.nokia.conflict
 $INCLUDE dictionary.nomadix
 $INCLUDE dictionary.nortel
+#
+#  Commented out because of attribute conflicts.
+#
+#$INCLUDE dictionary.openser
 $INCLUDE dictionary.packeteer
 $INCLUDE dictionary.patton
 $INCLUDE dictionary.propel
@@ -147,6 +177,7 @@ $INCLUDE dictionary.riverstone
 $INCLUDE dictionary.roaringpenguin
 $INCLUDE dictionary.shasta
 $INCLUDE dictionary.shiva
+$INCLUDE dictionary.slipstream
 $INCLUDE dictionary.sonicwall
 $INCLUDE dictionary.springtide
 $INCLUDE dictionary.starent
@@ -155,11 +186,15 @@ $INCLUDE dictionary.trapeze
 $INCLUDE dictionary.tropos
 $INCLUDE dictionary.t_systems_nova
 $INCLUDE dictionary.usr
+#$INCLUDE dictionary.usr.illegal
+$INCLUDE dictionary.utstarcom
 $INCLUDE dictionary.valemount
 $INCLUDE dictionary.versanet
 $INCLUDE dictionary.vqp
 $INCLUDE dictionary.waverider
 $INCLUDE dictionary.walabi
+$INCLUDE dictionary.wichorus
+$INCLUDE dictionary.wimax
 $INCLUDE dictionary.wispr
 $INCLUDE dictionary.xedia
 $INCLUDE dictionary.xylan
@@ -195,4 +230,12 @@ VALUE	NAS-Port-Type			Wireless-UMTS		23
 VALUE	NAS-Port-Type			Wireless-1X-EV		24
 VALUE	NAS-Port-Type			IAPP			25
 
+VALUE   NAS-Port-Type                   FTTP                    26
+VALUE   NAS-Port-Type                   Wireless-802.16         27
+VALUE   NAS-Port-Type                   Wireless-802.20         28
+VALUE   NAS-Port-Type                   Wireless-802.22         29
+
+VALUE   NAS-Port-Type                   xPON                    35
+VALUE   NAS-Port-Type                   Wireless-XGP            36
+
 VALUE	Framed-Protocol			PPTP			9