From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 7 Mar 2025 14:01:23 +0000 (-0500)
Subject: remove one more '&' from files and ldap
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2733dfabe6ebc517928818f85f8ec105d64f7c7;p=thirdparty%2Ffreeradius-server.git

remove one more '&' from files and ldap
---

diff --git a/doc/antora/modules/reference/pages/raddb/mods-available/files.adoc b/doc/antora/modules/reference/pages/raddb/mods-available/files.adoc
index 88055dc264..283a6eb682 100644
--- a/doc/antora/modules/reference/pages/raddb/mods-available/files.adoc
+++ b/doc/antora/modules/reference/pages/raddb/mods-available/files.adoc
@@ -68,7 +68,7 @@ files {
 #	v3_compat = false
 }
 files files_accounting {
-#	key = "%{Stripped-User-Name || &User-Name}"
+#	key = "%{Stripped-User-Name || User-Name}"
 	filename = ${modconfdir}/files/accounting
 }
 ```
diff --git a/doc/antora/modules/reference/pages/raddb/mods-available/ldap.adoc b/doc/antora/modules/reference/pages/raddb/mods-available/ldap.adoc
index 2a8fb9a999..27dc489ee7 100644
--- a/doc/antora/modules/reference/pages/raddb/mods-available/ldap.adoc
+++ b/doc/antora/modules/reference/pages/raddb/mods-available/ldap.adoc
@@ -911,7 +911,7 @@ ldap {
 #	edir_autz = no
 	user {
 		base_dn = "${..base_dn}"
-		filter = "(uid=%{&Stripped-User-Name || User-Name})"
+		filter = "(uid=%{Stripped-User-Name || User-Name})"
 #		filter = "(&(objectClass=user)(sAMAccountName=%{Stripped-User-Name || User-Name})(memberOf:1.2.840.113556.1.4.1941:=cn=group,${..base_dn}))"
 		sasl {
 #			mech = 'PLAIN'
diff --git a/raddb/mods-available/files b/raddb/mods-available/files
index f7f2b21852..cb9658c42d 100644
--- a/raddb/mods-available/files
+++ b/raddb/mods-available/files
@@ -67,6 +67,6 @@ files {
 #  ## An instance of the `files` module for use in processing accounting packets
 #
 files files_accounting {
-#	key = "%{Stripped-User-Name || &User-Name}"
+#	key = "%{Stripped-User-Name || User-Name}"
 	filename = ${modconfdir}/files/accounting
 }
diff --git a/raddb/mods-available/ldap b/raddb/mods-available/ldap
index 66b33c0861..a1ba2c3b71 100644
--- a/raddb/mods-available/ldap
+++ b/raddb/mods-available/ldap
@@ -250,7 +250,7 @@ ldap {
 		#  filter:: Filter for user objects, should be specific enough
 		#  to identify a single user object.
 		#
-		filter = "(uid=%{&Stripped-User-Name || User-Name})"
+		filter = "(uid=%{Stripped-User-Name || User-Name})"
 
 		#  For Active Directory nested group, you should comment out the previous 'filter = ...'
 		#  and use the below. Where 'group' is the group you are querying for.