Story 1731 ac2. Fixed merge conflicts.

# This are the configuration fields required by the Ldap ldap-dao unit tests

# Tests are more accurate running on Port 636.  If it fails due to SSL/Security

# issues, then make very sure the ca.crt (gimli2.cadc.dao.nrc.ca:~miscsw/ca.crt)

# is installed in your Java Keystore:

# scp gimli2.cadc.dao.nrc.ca:~miscsw/ca.crt /tmp/ca.crt

# ${JAVA_HOME}/bin/keytool -importcert -keystore ${JAVA_HOME}/jre/lib/security/cacerts -file /tmp/ca.crt

server = proc5-03.cadc.dao.nrc.ca

port = 636

proxyUser = testproxy

usersDn = ou=Users,ou=ds,dc=testcanfar

userRequestsDN = ou=UserRequests,ou=ds,dc=testcanfar

groupsDn = ou=Groups,ou=ds,dc=testcanfar

adminGroupsDn = ou=adminGroups,ou=ds,dc=testcanfar

 No newline at end of file