diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-01-25 23:16:34 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-01-25 23:16:34 +1100 |
| commit | 98d2b00dbe08b1303858be5f85704fa4bd1e7233 (patch) | |
| tree | 565407437cc94938e7a8988eaa2d92f6dd9b1261 /source4/scripting/python/samba/upgrade.py | |
| parent | 8ef7ddbf895d0126f578fcc46d2cb292addddf2b (diff) | |
| parent | 21f5f4d4409e5a7076194639570f11ec32cf3257 (diff) | |
| download | samba-98d2b00dbe08b1303858be5f85704fa4bd1e7233.tar.gz samba-98d2b00dbe08b1303858be5f85704fa4bd1e7233.tar.xz samba-98d2b00dbe08b1303858be5f85704fa4bd1e7233.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 1e042908992cdf3149ffc24472c7f0b1c3f9edef)
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) |