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-findservice | |
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-findservice')
-rw-r--r-- | ipa-admintools/ipa-findservice | 93 |
1 files changed, 47 insertions, 46 deletions
diff --git a/ipa-admintools/ipa-findservice b/ipa-admintools/ipa-findservice index 41688e79..499c7f89 100644 --- a/ipa-admintools/ipa-findservice +++ b/ipa-admintools/ipa-findservice @@ -18,19 +18,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -import sys -from optparse import OptionParser -import ipa.ipaclient as ipaclient -import ipa.config -import ipa.ipautil as ipautil -import ipa.ipaadminutil as ipaadminutil -import base64 - -import errno -import sys -import xmlrpclib -import kerberos - def usage(): print "ipa-findservice host" sys.exit() @@ -53,41 +40,55 @@ def main(): if options.usage or len(args) != 2: usage() - try: - client = ipaclient.IPAClient() - hosts = client.find_service_principal(args[1], sattrs=None) - - counter = hosts[0] - hosts = hosts[1:] - userindex = 0 - if counter == 0: - print "No entries found for", args[1] - return 2 - elif counter == -1: - print "These results are truncated." - print "Please refine your search and try again." + client = ipaclient.IPAClient() + hosts = client.find_service_principal(args[1], sattrs=None) - - for ent in hosts: - print ent.krbprincipalname + counter = hosts[0] + hosts = hosts[1:] + userindex = 0 + if counter == 0: + print "No entries found for", args[1] + return 2 + elif counter == -1: + print "These results are truncated." + print "Please refine your search and try again." - 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 + for ent in hosts: + print ent.krbprincipalname return 0 -if __name__ == "__main__": - sys.exit(main()) +try: + import sys + from optparse import OptionParser + import ipa.ipaclient as ipaclient + import ipa.config + import ipa.ipautil as ipautil + import ipa.ipaadminutil as ipaadminutil + + import errno + import sys + 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) |