- 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

1 files changed, 82 insertions, 79 deletions

diff --git a/ipa-admintools/ipa-finduser b/ipa-admintools/ipa-finduser
index 30a6cd257..a08c988f5 100644
--- a/ipa-admintools/ipa-finduser
+++ b/ipa-admintools/ipa-finduser
@@ -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-finduser [-a|--all] [-n|--notranslate] user"
     sys.exit()
@@ -79,75 +66,91 @@ def main():
     if options.usage or len(args) != 2:
         usage()
 
-    try:
-        client = ipaclient.IPAClient()
-        if options.all is None:
-            users = client.find_users(args[1], sattrs=['uid','cn','homeDirectory','loginshell'])
+    client = ipaclient.IPAClient()
+    if options.all is None:
+        users = client.find_users(args[1], sattrs=['uid','cn','homeDirectory','loginshell'])
+    else:
+        users = client.find_users(args[1], sattrs=None)
+
+    counter = users[0]
+    users = users[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."
+
+    if counter > 1:
+        try:
+            userindex = ipaadminutil.select_user(counter, users)
+        except KeyboardInterrupt:
+            return 1
+        if userindex == "q":
+            return 0
+
+    if userindex >= 0:
+        users = [users[userindex]]
+
+    for ent in users:
+        attr = ent.attrList()
+        attr.sort()
+        if options.notranslate:
+            labels = {}
+            for a in attr:
+                labels[a] = a
         else:
-            users = client.find_users(args[1], sattrs=None)
-
-        counter = users[0]
-        users = users[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."
-
-        if counter > 1:
-            try:
-                userindex = ipaadminutil.select_user(counter, users)
-            except KeyboardInterrupt:
-                return 1
-            if userindex == "q":
-                return 0
-
-        if userindex >= 0:
-            users = [users[userindex]]
-         
-        for ent in users:
-            attr = ent.attrList()
-            attr.sort()
-            if options.notranslate:
-                labels = {}
-                for a in attr:
-                    labels[a] = a
-            else:
-                labels = client.attrs_to_labels(attr)
+            labels = client.attrs_to_labels(attr)
 
-            if options.all is True:
-                print "dn: " + ent.dn
+        if options.all is True:
+            print "dn: " + ent.dn
 
-            for a in attr:
-                value = ent.getValues(a)
-                if isinstance(value,str):
-                    print labels[a] + ": " + str(wrap_binary_data(value)).rstrip()
-                else:
-                    print labels[a] + ": "
-                    for l in value:
-                        print "\t" + wrap_binary_data(l)
-            # blank line between results
-            print 
-
-    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 a in attr:
+            value = ent.getValues(a)
+            if isinstance(value,str):
+                print labels[a] + ": " + str(wrap_binary_data(value)).rstrip()
+            else:
+                print labels[a] + ": "
+                for l in value:
+                    print "\t" + wrap_binary_data(l)
+        # blank line between results
+        print 
 
     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 base64
+
+    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)