Merge in with upstream

1 files changed, 10 insertions, 4 deletions

diff --git a/ipa-server/xmlrpc-server/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py
index 3f30f8fb..16ced2cd 100644
--- a/ipa-server/xmlrpc-server/ipaxmlrpc.py
+++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py
@@ -35,7 +35,8 @@ from mod_python import apache
 
 import ipaserver
 import funcs
-from ipa import ipaerror
+from ipa import ipaerror, ipautil
+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)):
+                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
@@ -167,14 +173,14 @@ class ModXMLRPCRequestHandler(object):
         if func is None:
              raise Fault(1, "Invalid method: %s" % method)
 
-        args = list(params)
+        args = list(ipautil.unwrap_binary_data(params))
         for i in range(len(args)):
           if args[i] == '__NONE__':
               args[i] = None 
 
         ret = func(*args)
 
-        return ret
+        return ipautil.wrap_binary_data(ret)
 
     def multiCall(self, calls):
         """Execute a multicall.  Execute each method call in the calls list, collecting