From 2eebbfb7c9a69e4900b137b5e8b561acb9d1dd9a Mon Sep 17 00:00:00 2001
From: Dustin Jenkins <Dustin.Jenkins@nrc-cnrc.gc.ca>
Date: Thu, 16 Jul 2015 15:39:38 -0700
Subject: [PATCH] Story 1734: Fix for public PUT.
---
.../src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
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 8ed1561c..0d508a60 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
@@ -266,18 +266,15 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
}
AddRequest addRequest = new AddRequest(userDN, attributes);
- addRequest.addControl(
- new ProxiedAuthorizationV2RequestControl(
- "dn:" + getSubjectDN().toNormalizedString()));
-
LDAPResult result = getConnection().add(addRequest);
LdapDAO.checkLdapResult(result.getResultCode());
+
// AD: Search results sometimes come incomplete if
// connection is not reset - not sure why.
getConnection().reconnect();
try
{
- return getUser(user.getUserID(), config.getUserRequestsDN());
+ return getUser(user.getUserID(), config.getUserRequestsDN());
}
catch (UserNotFoundException e)
{
--
GitLab