diff options
author | Rob Crittenden <rcritten@redhat.com> | 2008-04-24 10:25:30 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2008-04-25 10:35:05 -0400 |
commit | a3a749cf5ea27fe46f12d866b93f94623f698efd (patch) | |
tree | 29756a022f9ee691250cc71e2a06165b8938ab8b /ipa-admintools/ipa-finduser | |
parent | 5eeb01edc75e4461ccbace0a129d9dfc7f26647a (diff) | |
download | freeipa-a3a749cf5ea27fe46f12d866b93f94623f698efd.tar.gz freeipa-a3a749cf5ea27fe46f12d866b93f94623f698efd.tar.xz freeipa-a3a749cf5ea27fe46f12d866b93f94623f698efd.zip |
Add --verbose option so the HTTP headers and XML request/response can be seen.
Also re-do the way modules are imported. I was attemping to have ^C handled
gracefully but the way I did it could mask other problems.
443987
Diffstat (limited to 'ipa-admintools/ipa-finduser')
-rw-r--r-- | ipa-admintools/ipa-finduser | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/ipa-admintools/ipa-finduser b/ipa-admintools/ipa-finduser index e7754cc7..c3b21778 100644 --- a/ipa-admintools/ipa-finduser +++ b/ipa-admintools/ipa-finduser @@ -18,8 +18,30 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +import sys +try: + 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 +except ImportError: + print >> sys.stderr, """\ +There was a problem importing one of the required Python modules. The +error was: + + %s +""" % sys.exc_value + sys.exit(1) + def usage(): - print "ipa-finduser [-a|--all] [-n|--notranslate] user" + print "ipa-finduser [-a|--all] [-n|--notranslate] [-v|--verbose] user" sys.exit() def parse_options(): @@ -32,6 +54,8 @@ def parse_options(): help="Don't translate LDAP attributes into readable labels") parser.add_option("--usage", action="store_true", help="Program usage") + parser.add_option("-v", "--verbose", action="store_true", dest="verbose", + help="Verbose output of the XML-RPC connection") args = ipa.config.init_config(sys.argv) options, args = parser.parse_args(args) @@ -66,7 +90,7 @@ def main(): if options.usage or len(args) != 2: usage() - client = ipaclient.IPAClient() + client = ipaclient.IPAClient(verbose=options.verbose) if options.all is None: users = client.find_users(args[1], sattrs=['uid','cn','homeDirectory','loginshell']) else: @@ -120,19 +144,6 @@ def main(): return 0 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 base64 - - import errno - import sys - import xmlrpclib - import kerberos - if __name__ == "__main__": sys.exit(main()) except SystemExit, e: |