diff options
| author | rcritten@redhat.com <rcritten@redhat.com> | 2007-08-27 13:45:28 -0400 |
|---|---|---|
| committer | rcritten@redhat.com <rcritten@redhat.com> | 2007-08-27 13:45:28 -0400 |
| commit | a5b7e3f56b8a3bddfafa1811061cd146f7c818e1 (patch) | |
| tree | c033d05a1fd0dcdf3e4417a6be567398b1a91c78 /ipa-server/xmlrpc-server/ipaxmlrpc.py | |
| parent | c7c8aa09269895a9cb9c02e87c5289a2461d647a (diff) | |
| download | freeipa-a5b7e3f56b8a3bddfafa1811061cd146f7c818e1.tar.gz freeipa-a5b7e3f56b8a3bddfafa1811061cd146f7c818e1.tar.xz freeipa-a5b7e3f56b8a3bddfafa1811061cd146f7c818e1.zip | |
Include any LDAP error strings in XML-RPC Fault exceptions
Put a try/except around attempts to determine user uniqueness
Diffstat (limited to 'ipa-server/xmlrpc-server/ipaxmlrpc.py')
| -rw-r--r-- | ipa-server/xmlrpc-server/ipaxmlrpc.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ipa-server/xmlrpc-server/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py index 3f30f8fbd..32a7e8089 100644 --- a/ipa-server/xmlrpc-server/ipaxmlrpc.py +++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py @@ -36,6 +36,7 @@ from mod_python import apache import ipaserver import funcs from ipa import ipaerror +import ldap import string import base64 @@ -150,7 +151,12 @@ class ModXMLRPCRequestHandler(object): response = dumps(response, methodresponse=1, allow_none=1) except ipaerror.IPAError, e: self.traceback = True - response = dumps(Fault(e.code, str(e))) + + if (isinstance(e.detail, ldap.LDAPError)): +u err = ": %s: %s" % (e.detail.args[0]['desc'], e.detail.args[0].get('info','')) + response = dumps(Fault(e.code, str(e) + err)) + else: + response = dumps(Fault(e.code, str(e))) except: self.traceback = True # report exception back to server |