From 922624d2157366d6549e20933a301745b95abe03 Mon Sep 17 00:00:00 2001 From: mindless Date: Wed, 4 Mar 2009 20:09:03 +0000 Subject: [PATCH] [FIXED HUDSON-2256] DeferredCreationLdapAuthoritiesPopulator was deprecated in 1.280, so the groupSearchFilter used there was lost. Moved this to groovy file so the uniqueMember query works again, and changed {0} to {1} in the memberUid query to fix that one. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@16009 71c3de6d-444a-0410-be80-ed276b4c234a Originally-Committed-As: 701805226e77a3cbc90c9ca396ccdaf6145cacef --- war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy b/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy index 9cdefc3..2f77800 100644 --- a/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy +++ b/war/resources/WEB-INF/security/LDAPBindSecurityRealm.groovy @@ -64,6 +64,7 @@ bindAuthenticator(BindAuthenticator2,initialDirContextFactory) { authoritiesPopulator(AuthoritiesPopulatorImpl, initialDirContextFactory, Util.fixNull(instance.groupSearchBase)) { // see DefaultLdapAuthoritiesPopulator for other possible configurations searchSubtree = true; + groupSearchFilter = "(| (member={0}) (uniqueMember={0}) (memberUid={1}))"; } authenticationManager(ProviderManager) { @@ -82,4 +83,4 @@ authenticationManager(ProviderManager) { key = "anonymous" } ] -} \ No newline at end of file +}