summaryrefslogtreecommitdiff
path: root/source4/setup/upgrade_from_s3
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/setup/upgrade_from_s3
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/setup/upgrade_from_s3')
-rwxr-xr-xsource4/setup/upgrade_from_s38
1 files changed, 4 insertions, 4 deletions
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)