From e11e8235ac9af09a587262368ef795cddbdd0e4e Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Wed, 19 Nov 2014 12:00:07 +0100 Subject: baseldap: Handle missing parent objects properly in *-find commands The find_entries function in ipaldap does not differentiate between a LDAP search that returns error code 32 (No such object) and LDAP search returning error code 0 (Success), but returning no results. In both cases errors.NotFound is raised. In turn, LDAPSearch commands interpret NotFound exception as no results. To differentiate between the cases, a new error EmptyResult was added, which inherits from NotFound to preserve the compatibility with the new code. This error is raised by ipaldap.find_entries in case it is performing a search with and the target dn does not exist. https://fedorahosted.org/freeipa/ticket/4659 Reviewed-By: Jan Cholasta --- ipalib/errors.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'ipalib/errors.py') diff --git a/ipalib/errors.py b/ipalib/errors.py index f0426583d..89b1ef2e0 100644 --- a/ipalib/errors.py +++ b/ipalib/errors.py @@ -1329,6 +1329,21 @@ class PosixGroupViolation(ExecutionError): errno = 4030 format = _('This is already a posix group and cannot be converted to external one') +class EmptyResult(NotFound): + """ + **4031** Raised when a LDAP search returned no results. + + For example: + + >>> raise EmptyResult(reason='no matching entry found') + Traceback (most recent call last): + ... + EmptyResult: no matching entry found + + """ + + errno = 4031 + class BuiltinError(ExecutionError): """ **4100** Base class for builtin execution errors (*4100 - 4199*). -- cgit