mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-15 01:53:50 -06:00
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:
parent
a39f38f65b
commit
c3fedca013
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
@ -1,3 +1,3 @@
|
||||
[defaults]
|
||||
realm = foo.bar
|
||||
server = realm.foo.bar
|
||||
# realm = EXAMPLE.COM
|
||||
# server = ipa.example.com
|
||||
|
Loading…
Reference in New Issue
Block a user