From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 2 Dec 2009 10:55:03 +0000 (+0100)
Subject: Revert "Moved illegal attributes to the new dictionary"
X-Git-Tag: release_2_1_8~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2903289d5702d73a65fcec230c14946f7413be99;p=thirdparty%2Ffreeradius-server.git

Revert "Moved illegal attributes to the new dictionary"

This reverts commit 4ba2853439bba32f979009fcc04b48a829bf83d4.

While these dictionaries are unfortunate, making this change
in a point release is likely a bad idea.
---

diff --git a/share/dictionary b/share/dictionary
index c57dec365c1..c84ada83449 100644
--- a/share/dictionary
+++ b/share/dictionary
@@ -179,7 +179,6 @@ $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
diff --git a/share/dictionary.usr b/share/dictionary.usr
index 8f38e3c36cc..966ae4ca5ae 100644
--- a/share/dictionary.usr
+++ b/share/dictionary.usr
@@ -8,6 +8,44 @@
 # Version:	$Id$
 #
 
+#
+#	USR specific attributes
+#
+# Prompt value should be 1 for echo, 0 for no echo, default 1.
+#ATTRIBUTE	Prompt			64	integer
+ATTRIBUTE	Multi-Link-Flag				126	integer
+ATTRIBUTE	Char-Noecho				250	integer
+
+#
+#	USR specific Integer Translations
+#
+
+VALUE	Termination-Action		Manage-Resources	2
+
+VALUE	Acct-Status-Type		Modem-Start		4
+VALUE	Acct-Status-Type		Modem-Stop		5
+VALUE	Acct-Status-Type		Cancel			6
+
+VALUE	Multi-Link-Flag			True			1
+VALUE	Multi-Link-Flag			False			0
+
+#	USR specific Authentication Types
+
+#
+#  These are commented out because the conflict with the standard
+#  definitions.
+#
+#VALUE		Acct-Authentic		None			0
+#VALUE		Acct-Authentic		Remote			3
+#VALUE		Acct-Authentic		RADIUS			4
+#VALUE		Acct-Authentic		MNET			5
+#VALUE		Acct-Authentic		KCHAP			6
+#VALUE		Acct-Authentic		TACACS			7
+#VALUE		Acct-Authentic		Realm			8
+#VALUE		Acct-Authentic		Local			9
+#VALUE		Acct-Authentic		File			10
+#VALUE		Acct-Authentic		Local-VPN		11
+
 #
 #	USR Extensions: USR Vendor-Specific stuff.
 #
diff --git a/share/dictionary.usr.illegal b/share/dictionary.usr.illegal
deleted file mode 100644
index 498624b1467..00000000000
--- a/share/dictionary.usr.illegal
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- text -*-
-##############################################################################
-#
-#	USE dictionary that illegally uses the RFC space.
-#
-#	$Id$
-#
-##############################################################################
-#
-#	USR specific attributes
-#
-# Prompt value should be 1 for echo, 0 for no echo, default 1.
-#ATTRIBUTE	Prompt			64	integer
-ATTRIBUTE	Multi-Link-Flag				126	integer
-ATTRIBUTE	Char-Noecho				250	integer
-
-#
-#	USR specific Integer Translations
-#
-
-VALUE	Termination-Action		Manage-Resources	2
-
-VALUE	Acct-Status-Type		Modem-Start		4
-VALUE	Acct-Status-Type		Modem-Stop		5
-VALUE	Acct-Status-Type		Cancel			6
-
-VALUE	Multi-Link-Flag			True			1
-VALUE	Multi-Link-Flag			False			0
-
-#	USR specific Authentication Types
-
-#
-#  These are commented out because the conflict with the standard
-#  definitions.
-#
-#VALUE		Acct-Authentic		None			0
-#VALUE		Acct-Authentic		Remote			3
-#VALUE		Acct-Authentic		RADIUS			4
-#VALUE		Acct-Authentic		MNET			5
-#VALUE		Acct-Authentic		KCHAP			6
-#VALUE		Acct-Authentic		TACACS			7
-#VALUE		Acct-Authentic		Realm			8
-#VALUE		Acct-Authentic		Local			9
-#VALUE		Acct-Authentic		File			10
-#VALUE		Acct-Authentic		Local-VPN		11
-