From cf7c97d81b40f6ee92e1e8ccc60c4051f0baf266 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: May 13 2008 16:00:34 +0000 Subject: Catch name resolution errors coming from the socket module. 442650 --- diff --git a/ipa-admintools/ipa-adddelegation b/ipa-admintools/ipa-adddelegation index a7748cc..112a0d3 100644 --- a/ipa-admintools/ipa-adddelegation +++ b/ipa-admintools/ipa-adddelegation @@ -33,6 +33,7 @@ try: import krbV import ldap import errno + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -198,6 +199,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-addgroup b/ipa-admintools/ipa-addgroup index 6bf35f6..4f55224 100644 --- a/ipa-admintools/ipa-addgroup +++ b/ipa-admintools/ipa-addgroup @@ -32,6 +32,7 @@ try: import kerberos import ldap import errno + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -134,6 +135,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-addservice b/ipa-admintools/ipa-addservice index 67ec834..535fddf 100644 --- a/ipa-admintools/ipa-addservice +++ b/ipa-admintools/ipa-addservice @@ -35,6 +35,7 @@ try: import ldap import getpass import errno + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -101,6 +102,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser index be0912e..caff5a9 100644 --- a/ipa-admintools/ipa-adduser +++ b/ipa-admintools/ipa-adduser @@ -33,6 +33,7 @@ try: import ldap import getpass import errno + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -268,6 +269,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-deldelegation b/ipa-admintools/ipa-deldelegation index 1eeb517..624aefc 100644 --- a/ipa-admintools/ipa-deldelegation +++ b/ipa-admintools/ipa-deldelegation @@ -28,6 +28,7 @@ try: import kerberos import copy import errno + import socket import ipa.aci from ipa import ipaerror @@ -140,6 +141,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-delgroup b/ipa-admintools/ipa-delgroup index cf66ac1..629f79f 100644 --- a/ipa-admintools/ipa-delgroup +++ b/ipa-admintools/ipa-delgroup @@ -25,6 +25,7 @@ try: import ipa.config import ipa.ipautil as ipautil import errno + import socket import xmlrpclib import kerberos @@ -102,6 +103,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-delservice b/ipa-admintools/ipa-delservice index d980762..7397c75 100644 --- a/ipa-admintools/ipa-delservice +++ b/ipa-admintools/ipa-delservice @@ -30,6 +30,7 @@ try: import krbV import ldap import errno + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -106,6 +107,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-deluser b/ipa-admintools/ipa-deluser index 39bdff9..8a4b4ad 100644 --- a/ipa-admintools/ipa-deluser +++ b/ipa-admintools/ipa-deluser @@ -25,6 +25,7 @@ try: import ipa.ipautil as ipautil import ipa.config import errno + import socket import xmlrpclib import kerberos @@ -87,6 +88,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-findgroup b/ipa-admintools/ipa-findgroup index 0c0cf8e..d884977 100644 --- a/ipa-admintools/ipa-findgroup +++ b/ipa-admintools/ipa-findgroup @@ -29,6 +29,7 @@ try: import sys import xmlrpclib import kerberos + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -154,6 +155,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-findservice b/ipa-admintools/ipa-findservice index a5ae2be..d427e72 100644 --- a/ipa-admintools/ipa-findservice +++ b/ipa-admintools/ipa-findservice @@ -29,6 +29,7 @@ try: import sys import xmlrpclib import kerberos + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -102,6 +103,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-finduser b/ipa-admintools/ipa-finduser index c3b2177..40384a3 100644 --- a/ipa-admintools/ipa-finduser +++ b/ipa-admintools/ipa-finduser @@ -31,6 +31,7 @@ try: import sys import xmlrpclib import kerberos + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -165,6 +166,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-listdelegation b/ipa-admintools/ipa-listdelegation index b734ccb..73c070e 100644 --- a/ipa-admintools/ipa-listdelegation +++ b/ipa-admintools/ipa-listdelegation @@ -28,6 +28,7 @@ try: import xmlrpclib import kerberos import errno + import socket import ipa.aci from ipa import ipaerror @@ -119,6 +120,9 @@ except xmlrpclib.ProtocolError, e: except ipaerror.IPAError, e: print("Delegation list failed: " + str(e)) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-lockuser b/ipa-admintools/ipa-lockuser index c11f1ea..0fea7be 100644 --- a/ipa-admintools/ipa-lockuser +++ b/ipa-admintools/ipa-lockuser @@ -25,6 +25,7 @@ try: import ipa.config import ipa.ipautil as ipautil import errno + import socket import xmlrpclib import kerberos @@ -106,6 +107,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-moddelegation b/ipa-admintools/ipa-moddelegation index d6b09ff..39f6b22 100644 --- a/ipa-admintools/ipa-moddelegation +++ b/ipa-admintools/ipa-moddelegation @@ -33,6 +33,7 @@ try: import ldap import copy import errno + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -236,6 +237,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-modgroup b/ipa-admintools/ipa-modgroup index 6905f50..11aba4a 100644 --- a/ipa-admintools/ipa-modgroup +++ b/ipa-admintools/ipa-modgroup @@ -30,6 +30,7 @@ try: import kerberos import ldap import errno + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -227,6 +228,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-moduser b/ipa-admintools/ipa-moduser index a9fd223..39b0fab 100644 --- a/ipa-admintools/ipa-moduser +++ b/ipa-admintools/ipa-moduser @@ -31,6 +31,7 @@ try: import kerberos import ldap import errno + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -293,6 +294,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-passwd b/ipa-admintools/ipa-passwd index fc39b7f..e9d04a6 100644 --- a/ipa-admintools/ipa-passwd +++ b/ipa-admintools/ipa-passwd @@ -30,6 +30,7 @@ try: import ldap import getpass import errno + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -142,6 +143,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1) diff --git a/ipa-admintools/ipa-pwpolicy b/ipa-admintools/ipa-pwpolicy index 365444f..71f824c 100644 --- a/ipa-admintools/ipa-pwpolicy +++ b/ipa-admintools/ipa-pwpolicy @@ -29,6 +29,7 @@ try: import kerberos import errno import validate + import socket except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -147,6 +148,9 @@ except xmlrpclib.ProtocolError, e: except ipa.ipaerror.IPAError, e: print "%s" % (e.message) sys.exit(1) +except socket.error, e: + print e[1] + print "Re-run with -v flag for more details." except Exception, e: print "%s" % str(e) sys.exit(1)