From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 19 Jun 2019 14:06:19 +0000 (-0400)
Subject: formatting
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=415dbf2b40bfd5103b8e9a24de2e58593b0a1e2d;p=thirdparty%2Ffreeradius-server.git

formatting
---

diff --git a/doc/unlang/xlat.adoc b/doc/unlang/xlat.adoc
index d4501124c14..f556fd7880d 100644
--- a/doc/unlang/xlat.adoc
+++ b/doc/unlang/xlat.adoc
@@ -42,8 +42,8 @@ or to modules that will return a string value.
 == Character Escaping
 
 Some characters need to be escaped within a dynamically expanded
-string %{...}. The % character is used for variable expansion, so a
-literal % character can be created by using %%.
+string `%{...}`. The `%` character is used for variable expansion, so a
+literal `%` character can be created by using `%%`.
 
 Other than within a dynamically expanded string, very little
 character escaping is needed. The rules of the enclosing string context
diff --git a/raddb/mods-available/eap b/raddb/mods-available/eap
index 2195a5c7fc7..cd54e474b25 100644
--- a/raddb/mods-available/eap
+++ b/raddb/mods-available/eap
@@ -70,7 +70,7 @@ eap {
 	#  type:: Only EAP types listed below with a `type = <EAP-Type>` pair will be allowed.
 	#
 	type = md5
-#	type = pwd
+	type = pwd
 #	type = leap
 	type = gtc
 	type = tls
@@ -99,16 +99,16 @@ eap {
 	#  as is done by other modules. The change from v3 is that the `inner-tunnel` virtual server
 	#  is no not used.
 	#
-#	pwd {
-#		group = 19
+	pwd {
+		group = 19
 
-#		server_id = theserver@example.com
+		server_id = theserver@example.com
 
 		#
 		#  fragment_size:: This has the same meaning as for TLS.
 		#
-#		fragment_size = 1020
-#	}
+		fragment_size = 1020
+	}
 
 	#
 	#  ### Cisco LEAP
diff --git a/raddb/mods-config/files/authorize b/raddb/mods-config/files/authorize
index 94380eef665..e6b519d89a7 100644
--- a/raddb/mods-config/files/authorize
+++ b/raddb/mods-config/files/authorize
@@ -1,3 +1,5 @@
+bob	Cleartext-Password := "bob"
+
 #
 # 	Configuration file for the rlm_files module.
 # 	Please see rlm_files(5) manpage for more information.
diff --git a/raddb/sites-available/default b/raddb/sites-available/default
index e6d7e3c1b5f..6a8fb52333a 100644
--- a/raddb/sites-available/default
+++ b/raddb/sites-available/default
@@ -732,6 +732,13 @@ server default {
 #  ### Receive Access-Request packets
 #
 recv Access-Request {
+	#
+
+	map csv "%{User-Name}" {
+	    &reply:Filter-Id := field3
+	    &reply:Reply-Message := field4
+	}
+
 	#
 	#  Take a `User-Name`, and perform some checks on it, for
 	#  spaces and other invalid characters. If the `User-Name`
diff --git a/raddb/sites-available/dhcp b/raddb/sites-available/dhcp
index 2936197fd9d..7bb226a723b 100644
--- a/raddb/sites-available/dhcp
+++ b/raddb/sites-available/dhcp
@@ -44,6 +44,7 @@ listen {
 	type = DHCP-Inform
 	type = DHCP-Release
 	type = DHCP-Decline
+	type = DHCP-Lease-Query
 
 	transport = udp