From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 31 Dec 2015 00:40:35 +0000 (-0500)
Subject: set Module-Failure-Message, not Reply-Message
X-Git-Tag: release_3_0_11~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a87b4b883d6130d0124fffb8ac5f886507e708bb;p=thirdparty%2Ffreeradius-server.git

set Module-Failure-Message, not Reply-Message
---

diff --git a/raddb/policy.d/filter b/raddb/policy.d/filter
index 9bdee4c50e0..24ca3eb3977 100644
--- a/raddb/policy.d/filter
+++ b/raddb/policy.d/filter
@@ -29,8 +29,8 @@ filter_username {
 		#  e.g. "user@ site.com", or "us er", or " user", or "user "
 		#
 		if (&User-Name =~ / /) {
-			update reply {
-				&Reply-Message += 'Rejected: Username contains whitespace'
+			update request {
+				&Module-Failure-Message += 'Rejected: Username contains whitespace'
 			}
 			reject
 		}
@@ -40,8 +40,8 @@ filter_username {
 		#  e.g. "user@site.com@site.com"
 		#
 		if (&User-Name =~ /@[^@]*@/ ) {
-			update reply {
-				&Reply-Message += 'Rejected: Multiple @ in username'
+			update request {
+				&Module-Failure-Message += 'Rejected: Multiple @ in username'
 			}
 			reject
 		}
@@ -51,8 +51,8 @@ filter_username {
 		#  e.g. "user@site..com"
 		#
 		if (&User-Name =~ /\.\./ ) {
-			update reply {
-				&Reply-Message += 'Rejected: Username contains ..s'
+			update request {
+				&Module-Failure-Message += 'Rejected: Username contains ..s'
 			}
 			reject
 		}
@@ -62,8 +62,8 @@ filter_username {
 		#  e.g. "user@site.com"
 		#
 		if ((&User-Name =~ /@/) && (&User-Name !~ /@(.+)\.(.+)$/))  {
-			update reply {
-				&Reply-Message += 'Rejected: Realm does not have at least one dot separator'
+			update request {
+				&Module-Failure-Message += 'Rejected: Realm does not have at least one dot separator'
 			}
 			reject
 		}
@@ -73,8 +73,8 @@ filter_username {
 		#  e.g. "user@site.com."
 		#
 		if (&User-Name =~ /\.$/)  {
-			update reply {
-				&Reply-Message += 'Rejected: Realm ends with a dot'
+			update request {
+				&Module-Failure-Message += 'Rejected: Realm ends with a dot'
 			}
 			reject
 		}
@@ -84,8 +84,8 @@ filter_username {
 		#  e.g. "user@.site.com"
 		#
 		if (&User-Name =~ /@\./)  {
-			update reply {
-				&Reply-Message += 'Rejected: Realm begins with a dot'
+			update request {
+				&Module-Failure-Message += 'Rejected: Realm begins with a dot'
 			}
 			reject
 		}