Rework config.py and change cli tools. Maintain order of IPA servers from command line, config and DNS. Parse options before detecting IPA configuration. Don't ignore rest of the options if one is missing in ipa.conf. Drop the --usage options, we will rely on --help. Fixes: 458869, 459070, 458980, 459234

1 files changed, 8 insertions, 14 deletions

diff --git a/ipa-admintools/ipa-findservice b/ipa-admintools/ipa-findservice
index 690c22e2e..c9aa4c058 100644
--- a/ipa-admintools/ipa-findservice
+++ b/ipa-admintools/ipa-findservice
@@ -39,20 +39,17 @@ error was:
 """ % sys.exc_value
     sys.exit(1)
 
-def usage():
-    print "ipa-findservice [-v|--verbose] host"
-    sys.exit()
-
 def parse_options():
-    parser = OptionParser()
+    usage = "%prog [-v|--verbose] host"
+    parser = OptionParser(usage=usage)
 
-    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)
+    ipa.config.add_standard_options(parser)
+    options, args = parser.parse_args()
+    ipa.config.verify_args(parser, args, "host")
+    ipa.config.init_config(options)
 
     return options, args
 
@@ -60,17 +57,14 @@ def main():
     user={}
     options, args = parse_options()
 
-    if options.usage or len(args) != 2:
-        usage()
-
     client = ipaclient.IPAClient(verbose=options.verbose)
-    hosts = client.find_service_principal(args[1], sattrs=None)
+    hosts = client.find_service_principal(args[0], sattrs=None)
 
     counter = hosts[0]
     hosts = hosts[1:]
     userindex = 0
     if counter == 0:
-        print "No entries found for", args[1]
+        print "No entries found for", args[0]
         return 2
     elif counter == -1:
         print "These results are truncated."