Changeset 2039

Show
Ignore:
Timestamp:
01/24/05 16:38:51 (20 years ago)
Author:
jalet
Message:

Fixed some ldap filters

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • pykota/trunk/pykota/storages/ldapstorage.py

    r2030 r2039  
    2222# 
    2323# $Log$ 
     24# Revision 1.96  2005/01/24 15:38:51  jalet 
     25# Fixed some ldap filters 
     26# 
    2427# Revision 1.95  2005/01/18 19:47:50  jalet 
    2528# Big bug fix wrt the datelimit attribute 
     
    599602        ldapfilter = "objectClass=pykotaPrinter" 
    600603        if printername : 
    601             ldapfilter = "&(%s)(pykotaPrinterName=%s)" % (ldapfilter, printername) 
     604            ldapfilter = "(&(%s)(pykotaPrinterName=%s))" % (ldapfilter, printername) 
    602605        result = self.doSearch(ldapfilter, ["pykotaPrinterName"], base=self.info["printerbase"]) 
    603606        if result : 
     
    610613        ldapfilter = "objectClass=pykotaAccount" 
    611614        if username : 
    612             ldapfilter = "&(%s)(pykotaUserName=%s)" % (ldapfilter, username) 
     615            ldapfilter = "(&(%s)(pykotaUserName=%s))" % (ldapfilter, username) 
    613616        result = self.doSearch(ldapfilter, ["pykotaUserName"], base=self.info["userbase"]) 
    614617        if result : 
     
    621624        ldapfilter = "objectClass=pykotaGroup" 
    622625        if groupname : 
    623             ldapfilter = "&(%s)(pykotaGroupName=%s)" % (ldapfilter, groupname) 
     626            ldapfilter = "(&(%s)(pykotaGroupName=%s))" % (ldapfilter, groupname) 
    624627        result = self.doSearch(ldapfilter, ["pykotaGroupName"], base=self.info["groupbase"]) 
    625628        if result :