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

20 files changed, 58 insertions, 4 deletions

diff --git a/ipa-admintools/ipa-adddelegation b/ipa-admintools/ipa-adddelegation
index e2254fd2..bd55d053 100644
--- a/ipa-admintools/ipa-adddelegation
+++ b/ipa-admintools/ipa-adddelegation
@@ -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)
diff --git a/ipa-admintools/ipa-addgroup b/ipa-admintools/ipa-addgroup
index 1668dbab..58190c02 100644
--- a/ipa-admintools/ipa-addgroup
+++ b/ipa-admintools/ipa-addgroup
@@ -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)
diff --git a/ipa-admintools/ipa-addservice b/ipa-admintools/ipa-addservice
index cecd4810..1702069d 100644
--- a/ipa-admintools/ipa-addservice
+++ b/ipa-admintools/ipa-addservice
@@ -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)
diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser
index 6decde09..763cfe71 100644
--- a/ipa-admintools/ipa-adduser
+++ b/ipa-admintools/ipa-adduser
@@ -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)
diff --git a/ipa-admintools/ipa-deldelegation b/ipa-admintools/ipa-deldelegation
index bc05b283..fc33a9ba 100644
--- a/ipa-admintools/ipa-deldelegation
+++ b/ipa-admintools/ipa-deldelegation
@@ -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)
diff --git a/ipa-admintools/ipa-delgroup b/ipa-admintools/ipa-delgroup
index 51682022..34f5f271 100644
--- a/ipa-admintools/ipa-delgroup
+++ b/ipa-admintools/ipa-delgroup
@@ -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)
diff --git a/ipa-admintools/ipa-delservice b/ipa-admintools/ipa-delservice
index 91775dd9..610d79b6 100644
--- a/ipa-admintools/ipa-delservice
+++ b/ipa-admintools/ipa-delservice
@@ -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)
diff --git a/ipa-admintools/ipa-deluser b/ipa-admintools/ipa-deluser
index a05e528e..36f113db 100644
--- a/ipa-admintools/ipa-deluser
+++ b/ipa-admintools/ipa-deluser
@@ -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)
diff --git a/ipa-admintools/ipa-findgroup b/ipa-admintools/ipa-findgroup
index e6f27e9a..54a8ce52 100644
--- a/ipa-admintools/ipa-findgroup
+++ b/ipa-admintools/ipa-findgroup
@@ -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)
diff --git a/ipa-admintools/ipa-findservice b/ipa-admintools/ipa-findservice
index 499c7f89..fc4aa8b1 100644
--- a/ipa-admintools/ipa-findservice
+++ b/ipa-admintools/ipa-findservice
@@ -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)
diff --git a/ipa-admintools/ipa-finduser b/ipa-admintools/ipa-finduser
index a08c988f..e7754cc7 100644
--- a/ipa-admintools/ipa-finduser
+++ b/ipa-admintools/ipa-finduser
@@ -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)
diff --git a/ipa-admintools/ipa-listdelegation b/ipa-admintools/ipa-listdelegation
index 217b16dd..4dabc81e 100644
--- a/ipa-admintools/ipa-listdelegation
+++ b/ipa-admintools/ipa-listdelegation
@@ -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)
diff --git a/ipa-admintools/ipa-lockuser b/ipa-admintools/ipa-lockuser
index 54cebd90..65342e0b 100644
--- a/ipa-admintools/ipa-lockuser
+++ b/ipa-admintools/ipa-lockuser
@@ -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)
diff --git a/ipa-admintools/ipa-moddelegation b/ipa-admintools/ipa-moddelegation
index 61aab5e1..1c840e16 100644
--- a/ipa-admintools/ipa-moddelegation
+++ b/ipa-admintools/ipa-moddelegation
@@ -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)
diff --git a/ipa-admintools/ipa-modgroup b/ipa-admintools/ipa-modgroup
index b40df4be..a91d9a01 100644
--- a/ipa-admintools/ipa-modgroup
+++ b/ipa-admintools/ipa-modgroup
@@ -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)
diff --git a/ipa-admintools/ipa-moduser b/ipa-admintools/ipa-moduser
index af4b99f0..906a40f0 100644
--- a/ipa-admintools/ipa-moduser
+++ b/ipa-admintools/ipa-moduser
@@ -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)
diff --git a/ipa-admintools/ipa-passwd b/ipa-admintools/ipa-passwd
index 2494923f..22cffca8 100644
--- a/ipa-admintools/ipa-passwd
+++ b/ipa-admintools/ipa-passwd
@@ -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)
diff --git a/ipa-admintools/ipa-pwpolicy b/ipa-admintools/ipa-pwpolicy
index 534cba97..31dc242f 100644
--- a/ipa-admintools/ipa-pwpolicy
+++ b/ipa-admintools/ipa-pwpolicy
@@ -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)
diff --git a/ipa-python/config.py b/ipa-python/config.py
index 2f5c54f6..b6d959bc 100644
--- a/ipa-python/config.py
+++ b/ipa-python/config.py
@@ -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
diff --git a/ipa-python/ipa.conf b/ipa-python/ipa.conf
index 5243cf22..516f764d 100644
--- a/ipa-python/ipa.conf
+++ b/ipa-python/ipa.conf
@@ -1,3 +1,3 @@
 [defaults]
-realm = foo.bar
-server = realm.foo.bar
+# realm = EXAMPLE.COM
+# server = ipa.example.com