tdraier 2005/02/02 18:59:15 CET
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/services/usermanager
JahiaGroupManagerLDAPProvider.java
Log:
put group keys instead of objects in getUserMembership for dynamic ldap groups
Revision Changes Path
1.16.4.9.2.1 +1 -1
jahia/src/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaGroupManagerLDAPProvider.java.diff?r1=1.16.4.9&r2=1.16.4.9.2.1&f=h
Index: JahiaGroupManagerLDAPProvider.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaGroupManagerLDAPProvider.java,v
retrieving revision 1.16.4.9
retrieving revision 1.16.4.9.2.1
diff -u -r1.16.4.9 -r1.16.4.9.2.1
--- JahiaGroupManagerLDAPProvider.java 17 Jan 2005 13:48:25 -0000
1.16.4.9
+++ JahiaGroupManagerLDAPProvider.java 2 Feb 2005 17:59:15 -0000
1.16.4.9.2.1
@@ -388,7 +388,7 @@
JahiaLDAPGroup jahiaLDAPGroup = (JahiaLDAPGroup)
lookupGroup(groupKey);
if (jahiaLDAPGroup.isDynamic()) {
if (jahiaLDAPGroup.isMember(user)) {
- result.add(jahiaLDAPGroup);
+ result.add(groupKey);
}
}
}