Don't define bogus realm/server in configuration file by default

Add default exception handler to avoid backtraces in cmdline tools
Enhance error message when the IPA server or realm can't be found

437565
This commit is contained in:
Rob Crittenden 2008-03-17 13:16:56 -04:00
parent a39f38f65b
commit c3fedca013
20 changed files with 58 additions and 4 deletions

View File

@ -188,3 +188,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -124,3 +124,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -91,3 +91,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -258,3 +258,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -130,3 +130,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -92,3 +92,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -94,3 +94,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -77,3 +77,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -144,3 +144,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -92,3 +92,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -154,3 +154,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -109,3 +109,6 @@ except xmlrpclib.ProtocolError, e:
except ipaerror.IPAError, e:
print("Delegation list failed: " + str(e))
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -96,3 +96,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -226,3 +226,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -217,3 +217,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -283,3 +283,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -132,3 +132,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -137,3 +137,6 @@ except xmlrpclib.ProtocolError, e:
except ipa.ipaerror.IPAError, e:
print "%s" % (e.message)
sys.exit(1)
except Exception, e:
print "%s" % str(e)
sys.exit(1)

View File

@ -146,9 +146,9 @@ def init_config(args=None):
__parse_config()
if not config.default_realm:
raise IPAConfigError("realm not found, nor specified in config file or on command line")
raise IPAConfigError("IPA realm not found in DNS, in the config file (/etc/ipa/ipa.conf) or on the command line.")
if not config.default_server:
raise IPAConfigError("server not found, nor specified in config file or on command line")
raise IPAConfigError("IPA server not found in DNS, in the config file (/etc/ipa/ipa.conf) or on the command line.")
if out_args:
return out_args

View File

@ -1,3 +1,3 @@
[defaults]
realm = foo.bar
server = realm.foo.bar
# realm = EXAMPLE.COM
# server = ipa.example.com