[java-identity-provider] branch master updated: IDP-1322 use trustFile= short cut for LDAP DataConnector TLS TrustCert

[Rod Widdowson]

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

rdw 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=cfe9f21f5629e6323713d90272ad81d391d4b120

The following commit(s) were added to refs/heads/master by this push:
       new  cfe9f21   IDP-1322 use trustFile= short cut for LDAP DataConnector TLS TrustCert
cfe9f21 is described below

commit cfe9f21f5629e6323713d90272ad81d391d4b120
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Aug 23 08:33:39 2018 +0100

    IDP-1322 use trustFile= short cut for LDAP DataConnector TLS TrustCert
    
    https://issues.shibboleth.net/jira/browse/IDP-1322
    
    Revert previous (erroneous) change and does it properly.
---
 idp-conf/src/main/resources/conf/attribute-resolver-full.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/idp-conf/src/main/resources/conf/attribute-resolver-full.xml b/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
index 3068894..017b118 100644
--- a/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
+++ b/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
@@ -274,8 +274,8 @@
         principal="%{idp.attribute.resolver.LDAP.bindDN}"
         principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}"
         useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS:true}"
-        authCert="%{idp.attribute.resolver.LDAP.trustCertificates}"
         connectTimeout="%{idp.attribute.resolver.LDAP.connectTimeout}"
+		trustFile="%{idp.attribute.resolver.LDAP.trustCertificates}"
         responseTimeout="%{idp.attribute.resolver.LDAP.responseTimeout}">
         <FilterTemplate>
             <![CDATA[
@@ -284,4 +284,5 @@
         </FilterTemplate>
     </DataConnector>
 -->
+
 </AttributeResolver>

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