From 885103c32127d10250564e25c5895464fb366f9e Mon Sep 17 00:00:00 2001 From: Martin Nagy Date: Fri, 15 Aug 2008 18:08:01 +0200 Subject: 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 --- ipa-radius-admintools/ipa-modradiusclient | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ipa-radius-admintools/ipa-modradiusclient') diff --git a/ipa-radius-admintools/ipa-modradiusclient b/ipa-radius-admintools/ipa-modradiusclient index 9e973b12..2a37929e 100644 --- a/ipa-radius-admintools/ipa-modradiusclient +++ b/ipa-radius-admintools/ipa-modradiusclient @@ -82,13 +82,15 @@ def main(): opt_parser.set_usage("Usage: %s [options] %s" % (distinguished_attr, os.path.basename(sys.argv[0]))) - args = ipa.config.init_config(sys.argv) - options, args = opt_parser.parse_args(args) + ipa.config.add_standard_options(opt_parser) + options, args = opt_parser.parse_args() - if len(args) < 2: + if len(args) < 1: opt_parser.error('missing %s' % (distinguished_attr)) - ip_addr = args[1] + ipa.config.init_config(options) + + ip_addr = args[0] # Verify entity previously exists and get current values ipa_client = ipaclient.IPAClient() -- cgit