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 88055dc2648ee4da686d5190e1110b077a835278..283a6eb6820a178b687532a9ce569aa5c3fabe43 100644 (file)
--- 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 2a8fb9a9991d7ad0a26ba8ffc021451c1ccc8bc5..27dc489ee71987ef54c29a11c5d1e9c15023e337 100644 (file)
--- 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 f7f2b218523c73265693ba940d4f469ac1275c09..cb9658c42d208ea4eaeed1c24fcebc4b8e274dfd 100644 (file)
--- 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 66b33c08611e25884cea94c2d7fc463b7778f6f3..a1ba2c3b7133f224810233a39b4711692c120e16 100644 (file)
--- 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.