diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-02-09 14:13:58 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-09 14:13:58 +1100 |
commit | a5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521 (patch) | |
tree | bc204af36200a4481d2f9fc158471267d47d4454 /source4/scripting/python/samba/upgrade.py | |
parent | d08eabdf91cade7f034468811d6228e75c69c1b5 (diff) | |
parent | fa2eb3447361457557d84ed8afd0757638410584 (diff) | |
download | samba-a5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521.tar.gz samba-a5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521.tar.xz samba-a5acc6654ba5a7d2dcf7ae1e4cbb727a29fe5521.zip |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 4aff02ecf18d52ae8e64e0c938ac5edf82a6dcef)
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
-rw-r--r-- | source4/scripting/python/samba/upgrade.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index a118af2526..b332bb89ae 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -246,8 +246,8 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp, machinepass = None domaindn = provision(lp=lp, setup_dir=setup_dir, message=message, - samdb_fill=FILL_DRS, ldapbackend=None, - paths=paths, session_info=session_info, credentials=credentials, realm=realm, + samdb_fill=FILL_DRS, paths=paths, session_info=session_info, + credentials=credentials, realm=realm, domain=domainname, domainsid=domainsid, domainguid=domainguid, machinepass=machinepass, serverrole=serverrole) |