summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-08-11 16:19:24 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-08-13 12:30:49 +1000
commit93e8d3b38185538e3549aee0ee4c1134118626c9 (patch)
tree04ffd897680bcf1317cfc67fbf31775d8a4b8c39 /source4/scripting
parent00364e4e0d3d091e1b8cc9dd2b1b30eb84f2f085 (diff)
downloadsamba-93e8d3b38185538e3549aee0ee4c1134118626c9.tar.gz
samba-93e8d3b38185538e3549aee0ee4c1134118626c9.tar.bz2
samba-93e8d3b38185538e3549aee0ee4c1134118626c9.zip
s4-scripting Rename passdb upgrade routine to avoid conflict with upgradeprovision
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/upgrade.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 0f7511aa17..1002af53ef 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -375,8 +375,8 @@ def import_registry(samba4_registry, samba3_regdb):
key_handle.set_value(value_name, value_type, value_data)
-def upgrade_provision(samba3, logger, credentials, session_info,
- smbconf, targetdir):
+def upgrade_from_passdb(samba3, logger, credentials, session_info,
+ smbconf, targetdir):
oldconf = samba3.get_conf()
if oldconf.get("domain logons") == "True":