From 2d38d87bb5c21b61a2abd6a6d754880c648f7b16 Mon Sep 17 00:00:00 2001 From: Nicolas Dandrimont Date: Wed, 9 Jan 2013 21:41:18 +0100 Subject: [PATCH] =?UTF-8?q?On=20pr=C3=A9pare=20l'arriv=C3=A9e=20du=20ldif?= =?UTF-8?q?=20dans=20search?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lc_ldap.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lc_ldap.py b/lc_ldap.py index 940c981..2ad870b 100644 --- a/lc_ldap.py +++ b/lc_ldap.py @@ -152,8 +152,11 @@ class lc_ldap(ldap.ldapobject.LDAPObject): def search(self, filterstr='(objectClass=*)', mode='ro', dn= base_dn, scope= 2, sizelimit=400): """La fonction de recherche dans la base ldap qui renvoie un liste de CransLdapObjects. On utilise la feature de sizelimit de python ldap""" - res = self.search_ext_s(dn, scope, filterstr, sizelimit=sizelimit) - return [ new_cransldapobject(self, r[0], mode=mode) for r in res ] + ldap_res = self.search_ext_s(dn, scope, filterstr, sizelimit=sizelimit) + ret = [] + for dn, ldif in ldap_res: + ret.append(new_cransldapobject(self, dn, mode=mode)) + return ret def allMachinesAdherents(self): """Renvoie la liste de toutes les machines et de tous les adherents