From 8fdfcde56cc78e8ea5c0bc2aa6c1dfa5515ff2c0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 21 Apr 2010 12:32:26 +1000 Subject: s4-provision: cope with --realm being in getopt.py we still need to allow for interactive querying of the realm Pair-Programmed-With: Andrew Bartlett --- source4/setup/provision | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/setup/provision') diff --git a/source4/setup/provision b/source4/setup/provision index 117433de4d..78965c6957 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -52,7 +52,6 @@ parser.add_option_group(credopts) parser.add_option("--interactive", help="Ask for names", action="store_true") parser.add_option("--setupdir", type="string", metavar="DIR", help="directory with setup files") -parser.add_option("--realm", type="string", metavar="REALM", help="set realm") parser.add_option("--domain", type="string", metavar="DOMAIN", help="set domain") parser.add_option("--domain-guid", type="string", metavar="GUID", @@ -165,6 +164,8 @@ if opts.interactive: else: break else: + if opts.realm in (None, ""): + opts.realm = sambaopts._lp.get('realm') if opts.realm is None or opts.domain is None: if opts.realm is None: print >>sys.stderr, "No realm set!" -- cgit