Added attributes for RFC 5447

[freeradius.git] / share / dictionary

diff --git a/share/dictionary b/share/dictionary
index ab112a8..a2e3592 100644 (file)
--- a/share/dictionary
+++ b/share/dictionary
@@ -1,4 +1,5 @@
 # -*- text -*-
+# Copyright (C) 2011 The FreeRADIUS Server project and contributors
 #
 # Version $Id$
 #
@@ -27,15 +28,18 @@
 #      ifid       - 8 octets in network byte order
 #      ipv6addr   - 16 octets in network byte order
 #      ipv6prefix - 18 octets in network byte order
-#      ether      - 6 octets of hh:hh:hh:hh:hh:hh
-#                   where 'h' is hex digits, upper or lowercase.
 #
 #      FreeRADIUS includes extended data types which are not defined
 #      in the RFC's.  These data types are:
 #
 #      abinary - Ascend's binary filter format.
+#      byte    - 8 bit unsigned integer
+#      ether   - 6 octets of hh:hh:hh:hh:hh:hh
+#                where 'h' is hex digits, upper or lowercase.
+#      short   - 16-bit unsigned integer 
 #      octets  - raw octets, printed and input as hex strings.
 #                e.g.: 0x123456789abcdef
+#      tlv     - type-length-value (only for certain WiMAX attributes)
 #
 #
 #      Enumerated values are stored in the user file with dictionary
@@ -55,6 +59,8 @@
 #      old names in the logfiles, INSTEAD OF the new names.
 #
 $INCLUDE dictionary.compat
+$INCLUDE dictionary.usr.illegal
+$INCLUDE dictionary.ascend.illegal
 
 #
 #      Include the RFC dictionaries next.
@@ -79,7 +85,11 @@ $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.extended
 
 #
 #      Include vendor dictionaries after the standard ones.
@@ -98,7 +108,6 @@ $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
@@ -115,12 +124,13 @@ $INCLUDE dictionary.cisco.bbsm
 $INCLUDE dictionary.clavister
 $INCLUDE dictionary.colubris
 $INCLUDE dictionary.cosine
-$INCLUDE dictionary.dhcp
 $INCLUDE dictionary.digium
+$INCLUDE dictionary.eltex
 $INCLUDE dictionary.epygi
 $INCLUDE dictionary.erx
 $INCLUDE dictionary.ericsson
 $INCLUDE dictionary.extreme
+$INCLUDE dictionary.f5
 $INCLUDE dictionary.freeradius
 $INCLUDE dictionary.freeswitch
 $INCLUDE dictionary.fortinet
@@ -146,6 +156,8 @@ $INCLUDE dictionary.manzara
 $INCLUDE dictionary.merit
 $INCLUDE dictionary.microsoft
 $INCLUDE dictionary.mikrotik
+$INCLUDE dictionary.motorola
+$INCLUDE dictionary.motorola.wimax
 $INCLUDE dictionary.navini
 $INCLUDE dictionary.netscreen
 $INCLUDE dictionary.networkphysics
@@ -174,16 +186,19 @@ $INCLUDE dictionary.riverstone
 $INCLUDE dictionary.roaringpenguin
 $INCLUDE dictionary.shasta
 $INCLUDE dictionary.shiva
+$INCLUDE dictionary.siemens
 $INCLUDE dictionary.slipstream
 $INCLUDE dictionary.sonicwall
 $INCLUDE dictionary.springtide
 $INCLUDE dictionary.starent
+$INCLUDE dictionary.symbol
 $INCLUDE dictionary.telebit
 $INCLUDE dictionary.trapeze
 $INCLUDE dictionary.tropos
 $INCLUDE dictionary.t_systems_nova
+$INCLUDE dictionary.ukerna
+$INCLUDE dictionary.unix
 $INCLUDE dictionary.usr
-#$INCLUDE dictionary.usr.illegal
 $INCLUDE dictionary.utstarcom
 $INCLUDE dictionary.valemount
 $INCLUDE dictionary.versanet
@@ -195,6 +210,7 @@ $INCLUDE dictionary.wimax
 $INCLUDE dictionary.wispr
 $INCLUDE dictionary.xedia
 $INCLUDE dictionary.xylan
+$INCLUDE dictionary.zyxel
 
 #
 #      And finally the server internal attributes.