[java-identity-provider] branch master updated: IDP-1552 - Password flow seems to require ldapURL property to load

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=1afded95ded036ef3b4c8d72fcdb4a7345825ad5

The following commit(s) were added to refs/heads/master by this push:
       new  1afded9   IDP-1552 - Password flow seems to require ldapURL property to load
1afded9 is described below

commit 1afded95ded036ef3b4c8d72fcdb4a7345825ad5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Feb 19 13:12:48 2020 -0500

    IDP-1552 - Password flow seems to require ldapURL property to load
    
    https://issues.shibboleth.net/jira/browse/IDP-1552
    
    Added default value for property.
---
 idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml            | 2 +-
 idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml b/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
index 22824d0..22a760b 100644
--- a/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
+++ b/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
@@ -27,6 +27,6 @@
     <bean id="shibboleth.authn.LDAP.truststore" parent="shibboleth.KeystoreResourceCredentialConfig"
         p:truststore="%{idp.authn.LDAP.trustStore:undefined}" />
         
-    <bean id="shibboleth.authn.LDAP.authenticator" parent="shibboleth.LDAPAuthenticationFactory" />
+    <bean id="shibboleth.authn.LDAP.authenticator" parent="shibboleth.LDAPAuthenticationFactory" lazy-init="true" />
 
 </beans>
diff --git a/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml b/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
index 1ce91f9..2e55715 100644
--- a/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
@@ -116,7 +116,7 @@
         class="net.shibboleth.idp.authn.config.LDAPAuthenticationFactoryBean"
         p:authenticatorType="%{idp.authn.LDAP.authenticator:anonSearchAuthenticator}"
         p:trustType="%{idp.authn.LDAP.sslConfig:certificateTrust}"
-        p:ldapUrl="%{idp.authn.LDAP.ldapURL}"
+        p:ldapUrl="%{idp.authn.LDAP.ldapURL:ldap://localhost:10389}"
         p:useStartTLS="%{idp.authn.LDAP.useStartTLS:true}"
         p:connectTimeout="%{idp.authn.LDAP.connectTimeout:PT3S}"
         p:responseTimeout="%{idp.authn.LDAP.responseTimeout:PT3S}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.