From f8368ec8d50105f1fab371329e2b14835e0df761 Mon Sep 17 00:00:00 2001
From: Dustin Jenkins <Dustin.Jenkins@nrc-cnrc.gc.ca>
Date: Wed, 18 Feb 2015 11:47:32 -0800
Subject: [PATCH] Story 1736: Remove cannonization and refactor PUT.
---
.../src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java | 5 ++---
.../test/LdapConfig.test.properties | 7 +++++++
2 files changed, 9 insertions(+), 3 deletions(-)
create mode 100644 projects/cadcAccessControl-Server/test/LdapConfig.test.properties
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
index 33eebfbc..63e12252 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
@@ -407,9 +407,8 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
.getClass());
}
- searchField = "(" + searchField + "=" +
- AuthenticationUtil.canonizeDistinguishedName(
- user.getUserID().getName()) + ")";
+ searchField = "(" + searchField + "=" + user.getUserID().getName()
+ + ")";
SearchResultEntry searchResult = null;
try
diff --git a/projects/cadcAccessControl-Server/test/LdapConfig.test.properties b/projects/cadcAccessControl-Server/test/LdapConfig.test.properties
new file mode 100644
index 00000000..efcdb0ce
--- /dev/null
+++ b/projects/cadcAccessControl-Server/test/LdapConfig.test.properties
@@ -0,0 +1,7 @@
+# This are the configuration fields required by the Ldap ldap-dao unit tests
+server = proc5-03.cadc.dao.nrc.ca
+port = 636
+proxyUser = webproxy
+usersDn = ou=Users,ou=ds,dc=canfar,dc=net
+groupsDn = ou=Groups,ou=ds,dc=canfar,dc=net
+adminGroupsDn = ou=adminGroups,ou=ds,dc=canfar,dc=net
\ No newline at end of file
--
GitLab