diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java index 77c635c5ea45a18901cee811781aa48a497ebed5..4e588eb5646c2744957c7589f591f8d5ce3ebc68 100755 --- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java +++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java @@ -472,7 +472,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO User<X500Principal> owner; try { - owner = userPersist.getMember(groupOwner); + owner = userPersist.getX500User(groupOwner); } catch (UserNotFoundException e) { @@ -504,7 +504,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO User<X500Principal> user; try { - user = userPersist.getMember(memberDN); + user = userPersist.getX500User(memberDN); } catch (UserNotFoundException e) { @@ -972,7 +972,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO } Group group = new Group(searchResult.getAttributeValue("cn"), - userPersist.getMember( + userPersist.getX500User( new DN(searchResult.getAttributeValue( "owner")))); group.description = searchResult.getAttributeValue("description"); @@ -1076,7 +1076,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO try { User<X500Principal> subjectUser = - userPersist.getMember(getSubjectDN()); + userPersist.getX500User(getSubjectDN()); if (subjectUser.equals(owner)) { return true; 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 e7bf2dc988d1e82e371f101ff36afae836ab13d2..3150e2768ae61c800546b76209a37f3e2378e15c 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 @@ -831,7 +831,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO * @throws UserNotFoundException * @throws LDAPException */ - User<X500Principal> getMember(DN userDN) + User<X500Principal> getX500User(DN userDN) throws UserNotFoundException, LDAPException { Filter filter = diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java index 68c0c6468659b82000c82bc37e13c0cd273aa1fa..647af875c103090c284eb71cb4a507932d648264 100644 --- a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java +++ b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java @@ -311,7 +311,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest { try { - User<X500Principal> actual = getUserDAO().getMember(new DN(testUserDN)); + User<X500Principal> actual = getUserDAO().getX500User(new DN(testUserDN)); check(testUser, actual); return null; } @@ -334,7 +334,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest { try { - User<X500Principal> actual = getUserDAO().getMember(new DN(testUserDN)); + User<X500Principal> actual = getUserDAO().getX500User(new DN(testUserDN)); check(testUser, actual); return null; }