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 <abartlet@samba.org>

diff --git a/source4/setup/provision b/source4/setup/provision
index 117433de4d14927c7e0b6e10594b3e2907d4fe6b..78965c69570fa101474d8728e3ef59ec674879af 100755 (executable)
--- 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!"