From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 15 Jan 2019 12:27:24 +0000 (-0500)
Subject: typo.  Fixes #2357
X-Git-Tag: release_3_0_18~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=862530c90f2da4e70096e13e5f1691f687c628bd;p=thirdparty%2Ffreeradius-server.git

typo.  Fixes #2357
---

diff --git a/raddb/dictionary b/raddb/dictionary
index eed5d70f41b..b848eee3cb0 100644
--- a/raddb/dictionary
+++ b/raddb/dictionary
@@ -47,3 +47,15 @@
 #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 ad3e15933f9..0f00fb2cebb 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 %{User-Name}"
+	program = "/bin/echo 'Filter-Id := %{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 = reply
+	output_pairs = coa
 
 	#
 	#  When to execute the program.  If the packet
diff --git a/raddb/mods-config/files/authorize b/raddb/mods-config/files/authorize
index 67e0cd4e8ae..be3e1ddb57e 100644
--- a/raddb/mods-config/files/authorize
+++ b/raddb/mods-config/files/authorize
@@ -1,3 +1,7 @@
+bob	Cleartext-Password := "bob"
+	Session-Timeout := 1234,
+	Example-Integer := 6809
+
 #
 # 	Configuration file for the rlm_files module.
 # 	Please see rlm_files(5) manpage for more information.
diff --git a/raddb/mods-config/preprocess/hints b/raddb/mods-config/preprocess/hints
index 84d4d78d5dc..5f246fda6fb 100644
--- a/raddb/mods-config/preprocess/hints
+++ b/raddb/mods-config/preprocess/hints
@@ -1,3 +1,10 @@
+<<<<<<< Updated upstream
+=======
+DEFAULT User-Name =~ "^([^@]+)@realm.com", NAS-IP-Address == "127.0.0.1"
+     User-Name := "%{1}"
+
+# hints
+>>>>>>> Stashed changes
 #
 #  hints
 #
diff --git a/raddb/mods-config/sql/main/postgresql/queries.conf b/raddb/mods-config/sql/main/postgresql/queries.conf
index e006430e366..f4fb9f7b5bd 100644
--- a/raddb/mods-config/sql/main/postgresql/queries.conf
+++ b/raddb/mods-config/sql/main/postgresql/queries.conf
@@ -643,7 +643,7 @@ post-auth {
 			(username, pass, reply, authdate) \
 		VALUES(\
 			'%{User-Name}', \
-			'%{%{User-Password}:-Chap-Password}', \
+			'%{%{User-Password}:-%{Chap-Password}}', \
 			'%{reply:Packet-Type}', \
 			NOW())"
 }
diff --git a/raddb/sites-available/default b/raddb/sites-available/default
index f0ad079f5db..83532936125 100644
--- a/raddb/sites-available/default
+++ b/raddb/sites-available/default
@@ -566,6 +566,14 @@ 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.