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

[Thomas Draier]

tdraier     2005/04/20 17:54:31 CEST

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/java/org/jahia/services/usermanager 
                                            JahiaUserManagerLDAPProvider.java 
  Log:
  fixed ldap dynamic group membership bug
  
  Revision       Changes    Path
  1.32.4.10.2.9  +1 -1      
jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java.diff?r1=1.32.4.10.2.8&r2=1.32.4.10.2.9&f=h
  
  
  
  Index: JahiaUserManagerLDAPProvider.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/usermanager/Attic/JahiaUserManagerLDAPProvider.java,v
  retrieving revision 1.32.4.10.2.8
  retrieving revision 1.32.4.10.2.9
  diff -u -r1.32.4.10.2.8 -r1.32.4.10.2.9
  --- JahiaUserManagerLDAPProvider.java 1 Apr 2005 15:36:21 -0000       
1.32.4.10.2.8
  +++ JahiaUserManagerLDAPProvider.java 20 Apr 2005 15:54:30 -0000      
1.32.4.10.2.9
  @@ -1445,7 +1445,7 @@
                   intScope = SearchControls.SUBTREE_SCOPE;
               }
               if (filters.containsKey("user.key")) {
  -                thisFilter = "(&("+ldapProperties.getProperty 
(UID_SEARCH_ATTRIBUTE_PROP)+"="+filters.get("user.key")+")"+filterString+")";
  +                thisFilter = "(&("+ldapProperties.getProperty 
(UID_SEARCH_ATTRIBUTE_PROP)+"="+filters.get("user.key")+")"+thisFilter+")";
               }
               return getUsers(ctx, thisFilter, thisBase, intScope);
           } else {