summaryrefslogtreecommitdiffstats
path: root/ipa-server/ipaserver/ipaldap.py
diff options
context:
space:
mode:
authorKevin McCarthy <kmccarth@redhat.com>2007-09-25 11:25:48 -0700
committerKevin McCarthy <kmccarth@redhat.com>2007-09-25 11:25:48 -0700
commit24c22a2ebc3852e880c18b7c572954f0f99ada1d (patch)
tree5c1eb4d2dee88338fc04f808ef57ebfaf1429dc8 /ipa-server/ipaserver/ipaldap.py
parent1725397a53ad133001b3c558904302cc91832b77 (diff)
downloadfreeipa.git-24c22a2ebc3852e880c18b7c572954f0f99ada1d.tar.gz
freeipa.git-24c22a2ebc3852e880c18b7c572954f0f99ada1d.tar.xz
freeipa.git-24c22a2ebc3852e880c18b7c572954f0f99ada1d.zip
Misc small fixes:
- Members of groups are clickable - Combine name and uid into a single column in find users - Remove license plate from searching - Mailto links on user emails - Add timelimit to finds. This is experimental... - Fix usersearch to only search on objectClass=Person - Change search to use get parameter
Diffstat (limited to 'ipa-server/ipaserver/ipaldap.py')
-rw-r--r--ipa-server/ipaserver/ipaldap.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ipa-server/ipaserver/ipaldap.py b/ipa-server/ipaserver/ipaldap.py
index 3dcb836d..b05201cb 100644
--- a/ipa-server/ipaserver/ipaldap.py
+++ b/ipa-server/ipaserver/ipaldap.py
@@ -343,7 +343,8 @@ class IPAdmin(SimpleLDAPObject):
for result in result_list:
entries.append(result)
type, result_list = self.result(msgid, 0)
- except (ldap.ADMINLIMIT_EXCEEDED, ldap.SIZELIMIT_EXCEEDED), e:
+ except (ldap.ADMINLIMIT_EXCEEDED, ldap.SIZELIMIT_EXCEEDED,
+ ldap.TIMELIMIT_EXCEEDED), e:
partial = 1
except ldap.LDAPError, e:
raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, None, e)