diff options
| author | Kevin McCarthy <kmccarth@redhat.com> | 2007-08-28 09:20:12 -0700 |
|---|---|---|
| committer | Kevin McCarthy <kmccarth@redhat.com> | 2007-08-28 09:20:12 -0700 |
| commit | ef2dc5cefa2f9ba94edea7cfce8913e3f25723bd (patch) | |
| tree | 1ebf9baee02663d9972e0bb19fd9dcbdfd267a42 /ipa-server/ipaserver/ipaldap.py | |
| parent | eebaa73d3df425e309893d30f1f9dd6f43124439 (diff) | |
| download | freeipa-ef2dc5cefa2f9ba94edea7cfce8913e3f25723bd.tar.gz freeipa-ef2dc5cefa2f9ba94edea7cfce8913e3f25723bd.tar.xz freeipa-ef2dc5cefa2f9ba94edea7cfce8913e3f25723bd.zip | |
Changes for larger data demo.
Add fields to search results
Put result() call inside try block - it's throwing an exception
Trap ADMINLIMIT and SIZELIMIT exceptions
Diffstat (limited to 'ipa-server/ipaserver/ipaldap.py')
| -rw-r--r-- | ipa-server/ipaserver/ipaldap.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ipa-server/ipaserver/ipaldap.py b/ipa-server/ipaserver/ipaldap.py index 188d9be5..f626f2f3 100644 --- a/ipa-server/ipaserver/ipaldap.py +++ b/ipa-server/ipaserver/ipaldap.py @@ -260,12 +260,12 @@ class IPAdmin(SimpleLDAPObject): try: res = self.search(*args) + type, obj = self.result(res) # res = self.search_ext(args[0], args[1], filterstr=args[2], attrlist=args[3], serverctrls=sctrl) except ldap.LDAPError, e: raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, None, e) - type, obj = self.result(res) if not obj: raise ipaerror.gen_exception(ipaerror.LDAP_NOT_FOUND, "no such entry for " + str(args)) @@ -283,10 +283,13 @@ class IPAdmin(SimpleLDAPObject): try: res = self.search(*args) + type, obj = self.result(res) + except (ldap.ADMINLIMIT_EXCEEDED, ldap.SIZELIMIT_EXCEEDED), e: + raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, + "Too many results returned by search", e) except ldap.LDAPError, e: raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, None, e) - type, obj = self.result(res) if not obj: raise ipaerror.gen_exception(ipaerror.LDAP_NOT_FOUND, "no such entry for " + str(args)) |