From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 14 Mar 2011 09:25:45 +0000 (+0100)
Subject: Moved USR/ascend illegal dictionaries back to share/
X-Git-Tag: release_2_1_11~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=878a336e16378b0b60e3db8b6f4de8bbb652d7a5;p=thirdparty%2Ffreeradius-server.git

Moved USR/ascend illegal dictionaries back to share/

raddb/dictionary is *not* changed on an upgrade, so removing those
dictionaries from share/dictionary means that they might be
surprisingly removed from the local configuration, and break things.
That would be bad.
---

diff --git a/raddb/dictionary.in b/raddb/dictionary.in
index 2fbd1fb0bc2..7e84794b445 100644
--- a/raddb/dictionary.in
+++ b/raddb/dictionary.in
@@ -8,22 +8,6 @@
 #	$Id$
 #
 
-#
-#  These two dictionaries define attributes which conflict with the
-#  IANA assigned attributes.  They define attributes for equipment which
-#  is 5-10 years old, and which should *no longer* be used.
-#
-#  Moving the dictionaries here has the following effect:
-#
-#	1) The "old" names in the dictionaries can still be used in
-#	   SQL, the "users" file, etc.
-#
-#	2) Access-Request and Accounting-Request packets will use the
-#	   "new" names.
-#
-$INCLUDE	@prefix@/dictionary.ascend.illegal
-$INCLUDE	@prefix@/dictionary.usr.illegal
-
 #
 #  The DHCP dictionary is used only when the server is built with
 #  "configure --with-dhcp".  It is not (and should not) be used in
@@ -36,7 +20,6 @@ $INCLUDE	@prefix@/dictionary.usr.illegal
 #
 #$INCLUDE	@prefix@/dictionary.dhcp
 
-
 #
 #	The filename given here should be an absolute path. 
 #
diff --git a/share/dictionary b/share/dictionary
index 3b50702076c..63865e3c01a 100644
--- a/share/dictionary
+++ b/share/dictionary
@@ -27,15 +27,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 +58,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.