s4-upgradeprovision: fixed --realm option duplicate in upgrade_from_s3

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index c33ef6fcb999f04c2df95b93f6cb0933fe7513a1..066fbe469ceb3223be4d5ee0baa408f805bc16e8 100755 (executable)
--- 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 7f31a0f0e93f8e147520b84ade7dd9402b0d3c82..adae0169fe8cac1b736938e59df87c4438ce5c52 100755 (executable)
--- 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")