s4-scripting Rename passdb upgrade routine to avoid conflict with upgradeprovision

2 files changed, 6 insertions, 6 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":
diff --git a/source4/setup/upgrade_from_s3 b/source4/setup/upgrade_from_s3
index e0d4604b6e..e3af2019e6 100755
--- a/source4/setup/upgrade_from_s3
+++ b/source4/setup/upgrade_from_s3
@@ -26,7 +26,7 @@ sys.path.insert(0, "bin/python")
 import samba
 import samba.getopt as options
 from samba.auth import system_session
-from samba.upgrade import upgrade_provision
+from samba.upgrade import upgrade_from_passdb
 from samba.samba3 import Samba3
 parser = optparse.OptionParser("upgrade_from_s3 [options] <libdir> <smbconf>")
 sambaopts = options.SambaOptions(parser)
@@ -73,6 +73,6 @@ lp = sambaopts.get_loadparm()
 smbconf = lp.configfile
 creds = credopts.get_credentials(lp)
 
-upgrade_provision(samba3, logger, credentials=creds,
-                  session_info=system_session(), smbconf=smbconf,
-                  targetdir=opts.targetdir)
+upgrade_from_passdb(samba3, logger, credentials=creds,
+		    session_info=system_session(), smbconf=smbconf,
+		    targetdir=opts.targetdir)