diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-09 14:03:25 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-09 14:03:25 +1100 |
| commit | fa2eb3447361457557d84ed8afd0757638410584 (patch) | |
| tree | ff303a0f8dacafd1a4619d0a2d30b0395685d894 | |
| parent | 19fcdb2e8ad2be30903d694eb2b76a08db54a205 (diff) | |
| parent | 4932e4bb7ad11c6ef8ad3187063dba4e7481afa7 (diff) | |
| download | samba-fa2eb3447361457557d84ed8afd0757638410584.tar.gz samba-fa2eb3447361457557d84ed8afd0757638410584.tar.bz2 samba-fa2eb3447361457557d84ed8afd0757638410584.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 774b54141a3549448b7bbc5bc69a661ac525df48)
| -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) |