diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-02-11 16:32:54 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-02-11 16:32:54 -0500 |
| commit | 73a674ed497c8f39c9c2aa9d352b20cb1d95abd9 (patch) | |
| tree | ce907d41a396b0ab5a066933f044c4992a3c2cbe /ipa-server/xmlrpc-server/ipaxmlrpc.py | |
| parent | 5b1e7e3a5f65d193f850e2b282c611e9e2541b5c (diff) | |
| download | freeipa-73a674ed497c8f39c9c2aa9d352b20cb1d95abd9.tar.gz freeipa-73a674ed497c8f39c9c2aa9d352b20cb1d95abd9.tar.xz freeipa-73a674ed497c8f39c9c2aa9d352b20cb1d95abd9.zip | |
Fix bug that prevented single-character fields
Fix bug in exception handling where we were sending the wrong thing as detail.
Basically we were catching an LDAP error, generating an IPAError from it,
catching that, then setting the detail of the 2nd exception to another IPAError
rather than the root exception. This caused anything looking at e.detail to
crap out
Resolves 432136
Diffstat (limited to 'ipa-server/xmlrpc-server/ipaxmlrpc.py')
| -rw-r--r-- | ipa-server/xmlrpc-server/ipaxmlrpc.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipa-server/xmlrpc-server/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py index 59f5e596c..0634f59ac 100644 --- a/ipa-server/xmlrpc-server/ipaxmlrpc.py +++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py @@ -175,8 +175,8 @@ class ModXMLRPCRequestHandler(object): except ipaerror.IPAError, e: self.traceback = True - if (isinstance(e.detail, ldap.LDAPError)): - err = ": %s: %s" % (e.detail.args[0]['desc'], e.detail.args[0].get('info','')) + if (isinstance(e.detail, ldap.LDAPError)) and len(e.detail[0].get('desc') > 1): + err = ": %s: %s" % (e.detail[0].get('desc'), e.detail[0].get('info','')) response = dumps(Fault(e.code, str(e) + err)) else: response = dumps(Fault(e.code, str(e))) |