Attachment 298288 Details for Bug 437565 – Play nice on unconfigured systems

[patch] Play nice on unconfigured systems

freeipa-720-client.patch (text/plain), 8.44 KB, created by Rob Crittenden on 2008-03-17 17:39:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Crittenden

Created: 2008-03-17 17:39:02 UTC

Size: 8.44 KB

patch

obsolete

># HG changeset patch
># User Rob Crittenden <rcritten@redhat.com>
># Date 1205774216 14400
># Node ID 3681cce7799f1b165dda017ea431e35838fd4d26
># Parent  a2d52205c61670ec17f0ce7a4395af329fe031a1
>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
>
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-adddelegation
>--- a/ipa-admintools/ipa-adddelegation	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-adddelegation	Mon Mar 17 13:16:56 2008 -0400
>@@ -188,3 +188,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-addgroup
>--- a/ipa-admintools/ipa-addgroup	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-addgroup	Mon Mar 17 13:16:56 2008 -0400
>@@ -124,3 +124,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-addservice
>--- a/ipa-admintools/ipa-addservice	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-addservice	Mon Mar 17 13:16:56 2008 -0400
>@@ -91,3 +91,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-adduser
>--- a/ipa-admintools/ipa-adduser	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-adduser	Mon Mar 17 13:16:56 2008 -0400
>@@ -258,3 +258,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-deldelegation
>--- a/ipa-admintools/ipa-deldelegation	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-deldelegation	Mon Mar 17 13:16:56 2008 -0400
>@@ -130,3 +130,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-delgroup
>--- a/ipa-admintools/ipa-delgroup	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-delgroup	Mon Mar 17 13:16:56 2008 -0400
>@@ -92,3 +92,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-delservice
>--- a/ipa-admintools/ipa-delservice	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-delservice	Mon Mar 17 13:16:56 2008 -0400
>@@ -94,3 +94,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-deluser
>--- a/ipa-admintools/ipa-deluser	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-deluser	Mon Mar 17 13:16:56 2008 -0400
>@@ -77,3 +77,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-findgroup
>--- a/ipa-admintools/ipa-findgroup	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-findgroup	Mon Mar 17 13:16:56 2008 -0400
>@@ -144,3 +144,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-findservice
>--- a/ipa-admintools/ipa-findservice	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-findservice	Mon Mar 17 13:16:56 2008 -0400
>@@ -92,3 +92,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-finduser
>--- a/ipa-admintools/ipa-finduser	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-finduser	Mon Mar 17 13:16:56 2008 -0400
>@@ -154,3 +154,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-listdelegation
>--- a/ipa-admintools/ipa-listdelegation	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-listdelegation	Mon Mar 17 13:16:56 2008 -0400
>@@ -109,3 +109,6 @@ except ipaerror.IPAError, 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 -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-lockuser
>--- a/ipa-admintools/ipa-lockuser	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-lockuser	Mon Mar 17 13:16:56 2008 -0400
>@@ -96,3 +96,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-moddelegation
>--- a/ipa-admintools/ipa-moddelegation	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-moddelegation	Mon Mar 17 13:16:56 2008 -0400
>@@ -226,3 +226,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-modgroup
>--- a/ipa-admintools/ipa-modgroup	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-modgroup	Mon Mar 17 13:16:56 2008 -0400
>@@ -217,3 +217,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-moduser
>--- a/ipa-admintools/ipa-moduser	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-moduser	Mon Mar 17 13:16:56 2008 -0400
>@@ -283,3 +283,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-passwd
>--- a/ipa-admintools/ipa-passwd	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-passwd	Mon Mar 17 13:16:56 2008 -0400
>@@ -132,3 +132,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-admintools/ipa-pwpolicy
>--- a/ipa-admintools/ipa-pwpolicy	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-admintools/ipa-pwpolicy	Mon Mar 17 13:16:56 2008 -0400
>@@ -137,3 +137,6 @@ except ipa.ipaerror.IPAError, e:
> except ipa.ipaerror.IPAError, e:
>     print "%s" % (e.message)
>     sys.exit(1)
>+except Exception, e:
>+    print "%s" % str(e)
>+    sys.exit(1)
>diff -r a2d52205c616 -r 3681cce7799f ipa-python/config.py
>--- a/ipa-python/config.py	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-python/config.py	Mon Mar 17 13:16:56 2008 -0400
>@@ -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 -r a2d52205c616 -r 3681cce7799f ipa-python/ipa.conf
>--- a/ipa-python/ipa.conf	Mon Mar 10 11:36:04 2008 -0400
>+++ b/ipa-python/ipa.conf	Mon Mar 17 13:16:56 2008 -0400
>@@ -1,3 +1,3 @@
> [defaults]
>-realm = foo.bar
>-server = realm.foo.bar
>+# realm = EXAMPLE.COM
>+# server = ipa.example.com

Actions: View | Diff

Attachments on bug 437565: 298288