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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar 17 22:36:27 2015
New Revision: 7427

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7427&view=rev
Log:
IDP-652 - add a note about the returnAttributes property

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

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=7427&r1=7426&r2=7427&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties Tue Mar 17 22:36:27 2015
@@ -9,14 +9,16 @@
 #idp.authn.LDAP.useSSL                          = false
 #idp.authn.LDAP.connectTimeout                  = 3000
 
-## SSL configuration, either jvmTrust, certificateTrust, or keyStoreTrust ##
+## SSL configuration, either jvmTrust, certificateTrust, or keyStoreTrust
 #idp.authn.LDAP.sslConfig                       = certificateTrust
 ## If using certificateTrust above, set to the trusted certificate's path
 idp.authn.LDAP.trustCertificates                = %{idp.home}/credentials/ldap-server.crt
 ## If using keyStoreTrust above, set to the truststore path
 idp.authn.LDAP.trustStore                       = %{idp.home}/credentials/ldap-server.truststore
 
-## Return attributes ##
+## Return attributes during authentication
+## NOTE: this is not used during attribute resolution; configure that directly in the
+## attribute-resolver.xml configuration via a DataConnector's <dc:ReturnAttributes> element
 idp.authn.LDAP.returnAttributes                 = cn,businessCategory,mail
 
 ## DN resolution properties ##