summaryrefslogtreecommitdiffstats
path: root/source4/scripting/python/samba/upgrade.py
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-08-22 06:58:19 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-08-22 01:31:57 +0200
commit97b13799ce4786f03602fba8eb6ad5da7023bb5c (patch)
tree7beddc08b0949c871a2c5c375be35fbbef2ef3b9 /source4/scripting/python/samba/upgrade.py
parentb5c2747cad0f9bbb69cceb4b90aab20546a5cf66 (diff)
downloadsamba-97b13799ce4786f03602fba8eb6ad5da7023bb5c.tar.gz
samba-97b13799ce4786f03602fba8eb6ad5da7023bb5c.tar.xz
samba-97b13799ce4786f03602fba8eb6ad5da7023bb5c.zip
s4-classicupgrade: Add --use-ntvfs option
This is an odd option, but is needed because I wish to add assertions about ACL setting that will not work in make test without the vfs_fake_acls module loaded. Andrew Bartlett
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
-rw-r--r--source4/scripting/python/samba/upgrade.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 8ce080b52f9..f363a9c02dd 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -545,7 +545,8 @@ def get_posix_attr_from_ldap_backend(logger, ldb_object, base_dn, user, attr):
logger.warning("LDAP entry for user %s contains more than one %s", user, attr)
return None
-def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, useeadb=False, dns_backend=None):
+def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, useeadb=False, dns_backend=None,
+ use_ntvfs=False):
"""Upgrade from samba3 database to samba4 AD database
:param samba3: samba3 object
@@ -779,7 +780,8 @@ Please fix this account before attempting to upgrade again
dom_for_fun_level=dsdb.DS_DOMAIN_FUNCTION_2003,
hostname=netbiosname.lower(), machinepass=machinepass,
serverrole=serverrole, samdb_fill=FILL_FULL,
- useeadb=useeadb, dns_backend=dns_backend, use_rfc2307=True)
+ useeadb=useeadb, dns_backend=dns_backend, use_rfc2307=True,
+ use_ntvfs=use_ntvfs)
result.report_logger(logger)
# Import WINS database