summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-04-21 13:35:52 +1000
committerAndrew Tridgell <tridge@samba.org>2010-04-21 13:35:56 +1000
commit5e695dec2af347dd9211a1dec45f10f751bbafb5 (patch)
tree97f5a15598fb1848c8eaf568dbb1aad46f0bd1dc
parent2edff9f5ff2e61f2d6c2705f05ebcab4d61b4307 (diff)
downloadsamba-5e695dec2af347dd9211a1dec45f10f751bbafb5.tar.gz
samba-5e695dec2af347dd9211a1dec45f10f751bbafb5.tar.bz2
samba-5e695dec2af347dd9211a1dec45f10f751bbafb5.zip
s4-upgradeprovision: fixed --realm option duplicate in upgrade_from_s3
-rwxr-xr-xsource4/scripting/bin/upgradeprovision2
-rwxr-xr-xsource4/setup/upgrade_from_s31
2 files changed, 1 insertions, 2 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index c33ef6fcb9..066fbe469c 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -862,7 +862,7 @@ def update_machine_account_password(paths, creds, session, names):
kvno = int(str(res[0]["msDs-keyVersionNumber"]))
secretsdb_self_join(secrets_ldb, domain=names.domain,
- realm=names.realm,
+ realm=names.realm or sambaopts._lp.get('realm'),
domainsid=names.domainsid,
dnsdomain=names.dnsdomain,
netbiosname=names.netbiosname,
diff --git a/source4/setup/upgrade_from_s3 b/source4/setup/upgrade_from_s3
index 7f31a0f0e9..adae0169fe 100755
--- a/source4/setup/upgrade_from_s3
+++ b/source4/setup/upgrade_from_s3
@@ -37,7 +37,6 @@ credopts = options.CredentialsOptions(parser)
parser.add_option_group(credopts)
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("--quiet", help="Be quiet")
parser.add_option("--blank",
help="do not add users or groups, just the structure")