Changeset 2039 for pykota/trunk/pykota/storages/ldapstorage.py
- Timestamp:
- 01/24/05 16:38:51 (20 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/storages/ldapstorage.py
r2030 r2039 22 22 # 23 23 # $Log$ 24 # Revision 1.96 2005/01/24 15:38:51 jalet 25 # Fixed some ldap filters 26 # 24 27 # Revision 1.95 2005/01/18 19:47:50 jalet 25 28 # Big bug fix wrt the datelimit attribute … … 599 602 ldapfilter = "objectClass=pykotaPrinter" 600 603 if printername : 601 ldapfilter = " &(%s)(pykotaPrinterName=%s)" % (ldapfilter, printername)604 ldapfilter = "(&(%s)(pykotaPrinterName=%s))" % (ldapfilter, printername) 602 605 result = self.doSearch(ldapfilter, ["pykotaPrinterName"], base=self.info["printerbase"]) 603 606 if result : … … 610 613 ldapfilter = "objectClass=pykotaAccount" 611 614 if username : 612 ldapfilter = " &(%s)(pykotaUserName=%s)" % (ldapfilter, username)615 ldapfilter = "(&(%s)(pykotaUserName=%s))" % (ldapfilter, username) 613 616 result = self.doSearch(ldapfilter, ["pykotaUserName"], base=self.info["userbase"]) 614 617 if result : … … 621 624 ldapfilter = "objectClass=pykotaGroup" 622 625 if groupname : 623 ldapfilter = " &(%s)(pykotaGroupName=%s)" % (ldapfilter, groupname)626 ldapfilter = "(&(%s)(pykotaGroupName=%s))" % (ldapfilter, groupname) 624 627 result = self.doSearch(ldapfilter, ["pykotaGroupName"], base=self.info["groupbase"]) 625 628 if result :