[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: attribute-resolver-ldap.xml ldap.properties

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Oct 17 14:25:28 2016
New Revision: 8498

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8498&view=rev
Log:
IDP-1064 - Remove LDAP resolver return attributes property

https://issues.shibboleth.net/jira/browse/IDP-1064

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml?rev=8498&r1=8497&r2=8498&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml	Mon Oct 17 14:25:28 2016
@@ -81,7 +81,7 @@
                 %{idp.attribute.resolver.LDAP.searchFilter}
             ]]>
         </FilterTemplate>
-        <ReturnAttributes>%{idp.attribute.resolver.LDAP.returnAttributes}</ReturnAttributes>
+        <ReturnAttributes>eduPersonPrincipalName,mail,uid</ReturnAttributes>
 	<ConnectionPool
             minPoolSize="%{idp.pool.LDAP.minSize:3}"
             maxPoolSize="%{idp.pool.LDAP.maxSize:10}"

Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=8498&r1=8497&r2=8498&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties	Mon Oct 17 14:25:28 2016
@@ -21,7 +21,6 @@
 idp.authn.LDAP.trustStore                       = %{idp.home}/credentials/ldap-server.truststore
 
 ## Return attributes during authentication
-## NOTE: there is a separate property used for attribute resolution
 idp.authn.LDAP.returnAttributes                 = passwordExpirationTime,loginGraceRemaining
 
 ## DN resolution properties ##
@@ -51,7 +50,6 @@
 idp.attribute.resolver.LDAP.useStartTLS         = %{idp.authn.LDAP.useStartTLS:true}
 idp.attribute.resolver.LDAP.trustCertificates   = %{idp.authn.LDAP.trustCertificates:undefined}
 idp.attribute.resolver.LDAP.searchFilter        = (uid=$resolutionContext.principal)
-idp.attribute.resolver.LDAP.returnAttributes    = cn,homephone,mail
 
 # LDAP pool configuration, used for both authn and DN resolution
 #idp.pool.LDAP.minSize                          = 3