diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-28 16:39:03 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-28 16:39:03 +1100 |
| commit | c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67 (patch) | |
| tree | 8efaf6b885543a006a91294923324fc580d01bbf /source4/scripting/python/samba/upgrade.py | |
| parent | 11061499e182b9c41ec793d4eefb8a2cf7c88bfe (diff) | |
| parent | cab677a33f0376cd1bf96ec561dc0463bbf80edd (diff) | |
| download | samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.gz samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.xz samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit f0a4db22e58d393be5b28f767ee6d0abfc8f11dc)
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index abf1127c36..a118af2526 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -7,7 +7,7 @@ """Support code for upgrading from Samba 3 to Samba 4.""" -from provision import findnss, provision +from provision import findnss, provision, FILL_DRS import grp import ldb import pwd @@ -245,7 +245,8 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp, else: machinepass = None - domaindn = provision(lp=lp, setup_dir=setup_dir, message=message, blank=True, ldapbackend=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, domain=domainname, domainsid=domainsid, domainguid=domainguid, machinepass=machinepass, serverrole=serverrole) |