summaryrefslogtreecommitdiffstats
path: root/ipalib/rpc.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-01-17 16:23:53 -0500
committerSimo Sorce <ssorce@redhat.com>2011-01-18 10:03:55 -0500
commit886e417fd76b25a28cde70be8de2851047ed0338 (patch)
tree3eeeae423ce3f9fb199dcf415f8143039af33eee /ipalib/rpc.py
parentec3e7f1202935e4c82fd8b7c76a4d03d9ee6a19b (diff)
downloadfreeipa-886e417fd76b25a28cde70be8de2851047ed0338.tar.gz
freeipa-886e417fd76b25a28cde70be8de2851047ed0338.tar.xz
freeipa-886e417fd76b25a28cde70be8de2851047ed0338.zip
Set the default Int maxvalue to the maximum XML-RPC can handle.
Also handle marshalling errors thrown by xmlrpclib more gracefully. ticket 770
Diffstat (limited to 'ipalib/rpc.py')
-rw-r--r--ipalib/rpc.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index dd8507630..3457640e4 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -38,7 +38,7 @@ import errno
from xmlrpclib import Binary, Fault, dumps, loads, ServerProxy, Transport, ProtocolError
import kerberos
from ipalib.backend import Connectible
-from ipalib.errors import public_errors, PublicError, UnknownError, NetworkError, KerberosError
+from ipalib.errors import public_errors, PublicError, UnknownError, NetworkError, KerberosError, XMLRPCMarshallError
from ipalib import errors
from ipalib.request import context
from ipapython import ipautil, dnsclient
@@ -373,3 +373,5 @@ class xmlclient(Connectible):
raise NetworkError(uri=server, error=e.errmsg)
except socket.error, e:
raise NetworkError(uri=server, error=str(e))
+ except (OverflowError, TypeError), e:
+ raise XMLRPCMarshallError(error=str(e))