sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

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

Browse Source
This commit is contained in:
Andrew Tridgell 2010-04-21 13:35:52 +10:00
parent 2edff9f5ff
commit 5e695dec2a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/scripting/bin/upgradeprovision
View File

@ -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,

1
source4/setup/upgrade_from_s3
View File

@ -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")