From a5b7e3f56b8a3bddfafa1811061cd146f7c818e1 Mon Sep 17 00:00:00 2001 From: "rcritten@redhat.com" Date: Mon, 27 Aug 2007 13:45:28 -0400 Subject: Include any LDAP error strings in XML-RPC Fault exceptions Put a try/except around attempts to determine user uniqueness --- ipa-server/xmlrpc-server/funcs.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'ipa-server/xmlrpc-server/funcs.py') diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py index f388f3f4..8994be91 100644 --- a/ipa-server/xmlrpc-server/funcs.py +++ b/ipa-server/xmlrpc-server/funcs.py @@ -192,11 +192,10 @@ class IPAServer: uid = self.__safe_filter(uid) filter = "(&(uid=%s)(objectclass=posixAccount))" % uid - entry = self.__get_entry(self.basedn, filter, ['dn','uid'], opts) - - if entry is not None: + try: + entry = self.__get_entry(self.basedn, filter, ['dn','uid'], opts) return 0 - else: + except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND): return 1 def get_user_by_uid (self, uid, sattrs=None, opts=None): -- cgit