[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Dec 17 18:44:38 2014
New Revision: 7157

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7157&view=rev
Log:
Fix integration tests by adding default for 'idp.authn.LDAP.subtreeSearch' property if it is not set in ldap.properties.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml?rev=7157&r1=7156&r2=7157&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml Wed Dec 17 18:44:38 2014
@@ -73,7 +73,7 @@
         <constructor-arg index="1" ref="authHandler" />
     </bean>
     <bean id="anonSearchDnResolver" class="org.ldaptive.auth.PooledSearchDnResolver" p:baseDn="%{idp.authn.LDAP.baseDN}"
-        p:subtreeSearch="%{idp.authn.LDAP.subtreeSearch}" p:userFilter="%{idp.authn.LDAP.userFilter}"
+        p:subtreeSearch="%{idp.authn.LDAP.subtreeSearch:false}" p:userFilter="%{idp.authn.LDAP.userFilter}"
         p:connectionFactory-ref="anonSearchPooledConnectionFactory" />
     <bean id="anonSearchPooledConnectionFactory" class="org.ldaptive.pool.PooledConnectionFactory"
         p:connectionPool-ref="anonSearchConnectionPool" />