From: Nick Porter Date: Fri, 15 Dec 2023 20:48:22 +0000 (+0000) Subject: Simplify policy since failed edits will fail the section X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=165d6db83fd53b18f092ad22549e461b65dbfa9b;p=thirdparty%2Ffreeradius-server.git Simplify policy since failed edits will fail the section --- diff --git a/raddb/sites-available/ldap_sync b/raddb/sites-available/ldap_sync index 771d703d96e..3c4522425bd 100644 --- a/raddb/sites-available/ldap_sync +++ b/raddb/sites-available/ldap_sync @@ -371,11 +371,7 @@ server ldap_sync { # string csn # # &csn := %ldap("ldap:///%{LDAP-Sync.Directory-Root-DN}?contextCSN?base") -# if (&csn) { -# &reply.LDAP-Sync.Cookie := "rid=000,csn=%{csn}" -# } else { -# fail -# } +# &reply.LDAP-Sync.Cookie := "rid=000,csn=%{csn}" # } } diff --git a/src/tests/ldap_sync/rfc4533/config/radiusd.conf b/src/tests/ldap_sync/rfc4533/config/radiusd.conf index 7eff5a4235f..7f0b5ce3644 100644 --- a/src/tests/ldap_sync/rfc4533/config/radiusd.conf +++ b/src/tests/ldap_sync/rfc4533/config/radiusd.conf @@ -181,12 +181,10 @@ server test { } load Cookie { - &control.Tmp-String-0 := %ldap("ldap:///%{LDAP-Sync.Directory-Root-DN}?contextCSN?base") + string csn - if (&control.Tmp-String-0 != "") { - &reply.LDAP-Sync.Cookie := "rid=000,csn=%{control.Tmp-String-0}" - updated - } + &csn := %ldap("ldap:///%{LDAP-Sync.Directory-Root-DN}?contextCSN?base") + &reply.LDAP-Sync.Cookie := "rid=000,csn=%{csn}" } store Cookie {