From efff48c40621a9da8005a250f0fa405834ec4369 Mon Sep 17 00:00:00 2001
From: Alinga Yeung <Alinga.Yeung@nrc-cnrc.gc.ca>
Date: Fri, 21 Aug 2015 13:37:31 -0700
Subject: [PATCH] Story ac2. Removed unnecessary type casts.
---
.../src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java | 4 ++--
.../src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
index affb8c52..625901a8 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
@@ -186,12 +186,12 @@ public abstract class LdapDAO
}
if (p instanceof NumericPrincipal)
{
- ldapField = "(&(objectclass=cadcaccount)(numericid=" + p.getName() + "))";
+ ldapField = "(numericid=" + p.getName() + ")";
break;
}
if (p instanceof X500Principal)
{
- ldapField = "(&(objectclass=cadcaccount)(distinguishedname=" + p.getName() + "))";
+ ldapField = "(distinguishedname=" + p.getName() + ")";
break;
}
if (p instanceof OpenIdPrincipal)
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 219728d8..44a91260 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
@@ -466,8 +466,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
"Unsupported principal type " + userID.getClass());
}
- searchField = "(&(objectclass=inetorgperson)(objectclass=cadcaccount)(" +
- searchField + "=" + userID.getName() + "))";
+ searchField = "(" + searchField + "=" + userID.getName() + ")";
logger.debug(searchField);
SearchResultEntry searchResult = null;
--
GitLab