diff options
author | Rob Crittenden <rcritten@redhat.com> | 2008-02-27 10:40:18 -0500 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2008-02-27 10:40:18 -0500 |
commit | ad8096b51f1f8de2c05a5c53952fcb2cb5bbd116 (patch) | |
tree | a2e09d2c28e203b483b304bab72bae11dfecbf69 /ipa-admintools/ipa-delservice | |
parent | d5f5026454db98727d217fc109c7410bb80c3c4a (diff) | |
download | freeipa-ad8096b51f1f8de2c05a5c53952fcb2cb5bbd116.tar.gz freeipa-ad8096b51f1f8de2c05a5c53952fcb2cb5bbd116.tar.xz freeipa-ad8096b51f1f8de2c05a5c53952fcb2cb5bbd116.zip |
- Centralize try/except so the entire program is covered. This make it
possible to catch KeyboardInterrupt during the import process.
- Add function for handling python differences with GSSError
434798
Diffstat (limited to 'ipa-admintools/ipa-delservice')
-rw-r--r-- | ipa-admintools/ipa-delservice | 80 |
1 files changed, 46 insertions, 34 deletions
diff --git a/ipa-admintools/ipa-delservice b/ipa-admintools/ipa-delservice index 1796babf4..91775dd91 100644 --- a/ipa-admintools/ipa-delservice +++ b/ipa-admintools/ipa-delservice @@ -18,23 +18,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -import sys -from optparse import OptionParser -import ipa -import ipa.user -import ipa.ipaclient as ipaclient -import ipa.ipavalidate as ipavalidate -import ipa.config - -import base64 - -import xmlrpclib -import kerberos -import krbV -import ldap -import getpass -import errno - def usage(): print "ipa-delservice principal" sys.exit(1) @@ -59,26 +42,55 @@ def main(): client = ipaclient.IPAClient() - try: - hosts = client.find_service_principal(args[1], sattrs=None) - counter = hosts[0] - hosts = hosts[1:] + hosts = client.find_service_principal(args[1], sattrs=None) + counter = hosts[0] + hosts = hosts[1:] - if counter == 0: - print "Service Principal '%s' not found." % args[1] - return 2 - if counter != 1: - print "An exact match was not found. Found %d principals for %s" % (counter, args[1]) - return 2 + if counter == 0: + print "Service Principal '%s' not found." % args[1] + return 2 + if counter != 1: + print "An exact match was not found. Found %d principals for %s" % (counter, args[1]) + return 2 - client.delete_service_principal(hosts[0].dn) + client.delete_service_principal(hosts[0].dn) - except Exception, e: - print str(e) - return 1 + print "Successfully deleted" - print hosts[0] + " successfully deleted" return 0 -if __name__ == "__main__": - sys.exit(main()) +try: + import sys + from optparse import OptionParser + import ipa + import ipa.ipaclient as ipaclient + import ipa.config + import ipa.ipautil as ipautil + + import xmlrpclib + import kerberos + import krbV + import ldap + import errno + + if __name__ == "__main__": + sys.exit(main()) +except SystemExit, e: + sys.exit(e) +except KeyboardInterrupt, e: + sys.exit(1) +except xmlrpclib.Fault, fault: + if fault.faultCode == errno.ECONNREFUSED: + print "The IPA XML-RPC service is not responding." + else: + print fault.faultString + sys.exit(1) +except kerberos.GSSError, e: + print "Could not initialize GSSAPI: %s/%s" % (ipautil.get_gsserror(e)) + sys.exit(1) +except xmlrpclib.ProtocolError, e: + print "Unable to connect to IPA server: %s" % (e.errmsg) + sys.exit(1) +except ipa.ipaerror.IPAError, e: + print "%s" % (e.message) + sys.exit(1) |