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

[Thomas Draier]

tdraier     2005/02/04 15:36:24 CET

  Modified files:        (Branch: JAHIA-4-1-BRANCH)
    src/java/org/jahia/services/usermanager 
                                            JahiaUserManagerLDAPProvider.java 
  Log:
  fixed referral attribute, changed user search filters
  
  Revision       Changes    Path
  1.32.4.10.2.1  +9 -6      
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&r2=1.32.4.10.2.1&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
  retrieving revision 1.32.4.10.2.1
  diff -u -r1.32.4.10 -r1.32.4.10.2.1
  --- JahiaUserManagerLDAPProvider.java 14 Jan 2005 14:53:49 -0000      
1.32.4.10
  +++ JahiaUserManagerLDAPProvider.java 4 Feb 2005 14:36:24 -0000       
1.32.4.10.2.1
  @@ -106,7 +106,7 @@
       private static String USERS_OBJECTCLASS_ATTRIBUTE =
           "users.ldap.search.objectclass";
   
  -    private static String LDAP_REFFERAL_PROP = "groups.ldap.refferal";
  +    private static String LDAP_REFFERAL_PROP = "users.ldap.refferal";
       private static String SEARCH_COUNT_LIMIT_PROP =
           "users.ldap.search.countlimit";
       private static String SEARCH_WILDCARD_ATTRIBUTE_LIST =
  @@ -1254,6 +1254,8 @@
                   ldapProperties.getProperty (AUTHENTIFICATION_MODE_PROP));
           publicEnv.put (Context.SECURITY_PRINCIPAL,
                   ldapProperties.getProperty (PUBLIC_BIND_DN_PROP));
  +        publicEnv.put (Context.REFERRAL,
  +                       ldapProperties.getProperty (LDAP_REFFERAL_PROP, 
"ignore"));
           if (ldapProperties.getProperty (PUBLIC_BIND_PASSWORD_PROP) != null) {
               logger.debug ("Using authentification mode to connect to public 
dir...");
               publicEnv.put (Context.SECURITY_CREDENTIALS,
  @@ -1426,16 +1428,15 @@
   
               return getUsers(ctx, thisFilter, thisBase, intScope);
           } else {
  -            filters.setProperty("objectClass",
  -                    ldapProperties.getProperty(
  -                            USERS_OBJECTCLASS_ATTRIBUTE, "*"));
  +            filterString.append("(&(objectClass=" + 
ldapProperties.getProperty(
  +                            USERS_OBJECTCLASS_ATTRIBUTE, "*") + ")");
   
               // let's translate Jahia properties to LDAP properties
               mapJahiaPropertiesToLDAP(filters);
   
   
               if (filters.size() > 1) {
  -                filterString.append("(&");
  +                filterString.append("(|");
               }
   
               Enumeration filterKeys = filters.keys();
  @@ -1485,8 +1486,10 @@
               if (filters.size() > 1) {
                   filterString.append(")");
               }
  -            return getUsers(ctx, filterString.toString(), searchBase, scope);
   
  +            filterString.append(")");
  +
  +            return getUsers(ctx, filterString.toString(), searchBase, scope);
           }
       }