Changeset 2039 for pykota/trunk

Timestamp:

01/24/05 16:38:51 (20 years ago)

Author:

jalet

Message:

Fixed some ldap filters

Files:

• pykota/trunk/pykota/storages/ldapstorage.py (modified) (4 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.96  2005/01/24 15:38:51  jalet
+# Fixed some ldap filters
+#
 # Revision 1.95  2005/01/18 19:47:50  jalet
 # Big bug fix wrt the datelimit attribute
@@ -599 +602 @@
         ldapfilter = "objectClass=pykotaPrinter"
         if printername :
-            ldapfilter = "&(%s)(pykotaPrinterName=%s)" % (ldapfilter, printername)
+            ldapfilter = "(&(%s)(pykotaPrinterName=%s))" % (ldapfilter, printername)
         result = self.doSearch(ldapfilter, ["pykotaPrinterName"], base=self.info["printerbase"])
         if result :
@@ -610 +613 @@
         ldapfilter = "objectClass=pykotaAccount"
         if username :
-            ldapfilter = "&(%s)(pykotaUserName=%s)" % (ldapfilter, username)
+            ldapfilter = "(&(%s)(pykotaUserName=%s))" % (ldapfilter, username)
         result = self.doSearch(ldapfilter, ["pykotaUserName"], base=self.info["userbase"])
         if result :
@@ -621 +624 @@
         ldapfilter = "objectClass=pykotaGroup"
         if groupname :
-            ldapfilter = "&(%s)(pykotaGroupName=%s)" % (ldapfilter, groupname)
+            ldapfilter = "(&(%s)(pykotaGroupName=%s))" % (ldapfilter, groupname)
         result = self.doSearch(ldapfilter, ["pykotaGroupName"], base=self.info["groupbase"])
         if result :