cvs commit: jahia/src/java/org/jahia/services/usermanager JahiaGroupManagerLDAPProvider.java

[Thomas Draier]

tdraier     2005/02/16 14:02:45 CET

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/java/org/jahia/services/usermanager 
                                            JahiaGroupManagerLDAPProvider.java 
  Log:
  fixed dynamic ldap groups with multiple objectClass
  
  Revision      Changes    Path
  1.16.4.9.2.2  +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.2.1&r2=1.16.4.9.2.2&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.2.1
  retrieving revision 1.16.4.9.2.2
  diff -u -r1.16.4.9.2.1 -r1.16.4.9.2.2
  --- JahiaGroupManagerLDAPProvider.java        2 Feb 2005 17:59:15 -0000       
1.16.4.9.2.1
  +++ JahiaGroupManagerLDAPProvider.java        16 Feb 2005 13:02:45 -0000      
1.16.4.9.2.2
  @@ -1008,7 +1008,7 @@
               mapLDAPToJahiaProperties (groupProps);
               // FIXME : Quick hack for merging Jahia DB group properties with 
LDAP group
               mapDBToJahiaProperties (groupProps, usingGroupKey);
  -            boolean dynamic = ldapProperties.getProperty 
(JahiaGroupManagerLDAPProvider.DYNGROUP_OBJECTCLASS_ATTRIBUTE, 
"groupOfURLs").equals(groupProps.getProperty("objectClass"));
  +            boolean dynamic = 
groupProps.getProperty("objectClass").indexOf(ldapProperties.getProperty 
(JahiaGroupManagerLDAPProvider.DYNGROUP_OBJECTCLASS_ATTRIBUTE, "groupOfURLs")) 
!= -1;
               Hashtable members = null;
               try {
                   members = getGroupMembers (sr, dynamic);