diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-21 12:32:26 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-21 13:35:56 +1000 |
| commit | 8fdfcde56cc78e8ea5c0bc2aa6c1dfa5515ff2c0 (patch) | |
| tree | 5a553ed35c41a0b2f45dc9a93bff79bb7f4859ac /source4/setup/provision | |
| parent | b0a73fbf30ca73934be670c812acebc88255ba2b (diff) | |
| download | samba-8fdfcde56cc78e8ea5c0bc2aa6c1dfa5515ff2c0.tar.gz samba-8fdfcde56cc78e8ea5c0bc2aa6c1dfa5515ff2c0.tar.bz2 samba-8fdfcde56cc78e8ea5c0bc2aa6c1dfa5515ff2c0.zip | |
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>
Diffstat (limited to 'source4/setup/provision')
| -rwxr-xr-x | source4/setup/provision | 3 |
1 files changed, 2 insertions, 1 deletions
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!" |