diff options
Diffstat (limited to 'ipa-admintools/ipa-deluser')
| -rw-r--r-- | ipa-admintools/ipa-deluser | 67 |
1 files changed, 36 insertions, 31 deletions
diff --git a/ipa-admintools/ipa-deluser b/ipa-admintools/ipa-deluser index 596a124c5..a05e528e4 100644 --- a/ipa-admintools/ipa-deluser +++ b/ipa-admintools/ipa-deluser @@ -18,16 +18,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -import sys -from optparse import OptionParser -import ipa -import ipa.ipaclient as ipaclient -import ipa.config -import errno - -import xmlrpclib -import kerberos - def usage(): print "ipa-deluser user" sys.exit(1) @@ -48,27 +38,42 @@ def main(): if options.usage or len(args) != 2: usage() - try: - client = ipaclient.IPAClient() - ret = client.delete_user(args[1]) - print args[1] + " successfully deleted" - except xmlrpclib.Fault, fault: - if fault.faultCode == errno.ECONNREFUSED: - print "The IPA XML-RPC service is not responding." - else: - print fault.faultString - return 1 - except kerberos.GSSError, e: - print "Could not initialize GSSAPI: %s/%s" % (e[0][0][0], e[0][1][0]) - return 1 - except xmlrpclib.ProtocolError, e: - print "Unable to connect to IPA server: %s" % (e.errmsg) - return 1 - except ipa.ipaerror.IPAError, e: - print "%s" % (e.message) - return 1 + client = ipaclient.IPAClient() + ret = client.delete_user(args[1]) + print args[1] + " 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.ipautil as ipautil + import ipa.config + import errno + + import xmlrpclib + import kerberos + + 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) |