From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 15 Jan 2019 13:34:50 +0000 (-0500)
Subject: remove more spurious commits
X-Git-Tag: release_3_0_18~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6abea338d95c2cc92c3e7d7aeb504df4d7edcd18;p=thirdparty%2Ffreeradius-server.git

remove more spurious commits
---

diff --git a/raddb/dictionary b/raddb/dictionary
index b848eee3cb0..eed5d70f41b 100644
--- a/raddb/dictionary
+++ b/raddb/dictionary
@@ -47,15 +47,3 @@
 #ATTRIBUTE	My-Local-String		3000	string
 #ATTRIBUTE	My-Local-IPAddr		3001	ipaddr
 #ATTRIBUTE	My-Local-Integer	3002	integer
-
-VENDOR example	   65535
-
-BEGIN-VENDOR example
-ATTRIBUTE Example-Integer	1 integer
-ATTRIBUTE Example-String	2 string
-ATTRIBUTE Example-IP-Address	3 ipaddr
-
-VALUE	Example-Integer Name1	1
-VALUE	Example-Integer Name2	2
-
-END-VENDOR example
diff --git a/raddb/mods-available/echo b/raddb/mods-available/echo
index 0f00fb2cebb..ad3e15933f9 100644
--- a/raddb/mods-available/echo
+++ b/raddb/mods-available/echo
@@ -52,7 +52,7 @@ exec echo {
 	#  field, so things like the following example will
 	#  work.
 	#
-	program = "/bin/echo 'Filter-Id := %{User-Name}'"
+	program = "/bin/echo %{User-Name}"
 
 	#
 	#  The attributes which are placed into the
@@ -79,7 +79,7 @@ exec echo {
 	#  restrictions as to availability, are the same as
 	#  for the input_pairs.
 	#
-	output_pairs = coa
+	output_pairs = reply
 
 	#
 	#  When to execute the program.  If the packet
diff --git a/raddb/sites-available/default b/raddb/sites-available/default
index 83532936125..f0ad079f5db 100644
--- a/raddb/sites-available/default
+++ b/raddb/sites-available/default
@@ -566,14 +566,6 @@ authenticate {
 preacct {
 	preprocess
 
-	 update coa {
-                  User-Name="%{User-Name}"
-                  Acct-Session-Id="%{%{Acct-Multi-Session-Id}:-%{Acct-Session-ID}}"
-          }
-                 
-          echo
-
-
 	#
 	#  Merge Acct-[Input|Output]-Gigawords and Acct-[Input-Output]-Octets
 	#  into a single 64bit counter Acct-[Input|Output]-Octets64.