From 93e8d3b38185538e3549aee0ee4c1134118626c9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 11 Aug 2011 16:19:24 +1000 Subject: s4-scripting Rename passdb upgrade routine to avoid conflict with upgradeprovision --- source4/setup/upgrade_from_s3 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/setup') 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] ") 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) -- cgit