s3_upgrade: Set lock directory to correct directory

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index ff4db9bb2b260bce3c1c360aef4300dec0898abe..7386d0b4b159c9088896bd4658bcd6b3d669fa01 100644 (file)
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -562,6 +562,7 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None):
     new_lp_ctx.load(result.lp.configfile)
     new_lp_ctx.set("private dir", result.lp.get("private dir"))
     new_lp_ctx.set("state directory", result.lp.get("state directory"))
+    new_lp_ctx.set("lock directory", result.lp.get("lock directory"))
 
     # Connect to samba4 backend
     s4_passdb = passdb.PDB(new_lp_ctx.get("passdb backend"))

diff --git a/source4/setup/upgrade_from_s3 b/source4/setup/upgrade_from_s3
index c7a4b97ef4e8a289ea98988921167e15d16b7471..81609e034933a5d50f8e80805ba2ce2488019009 100755 (executable)
--- a/source4/setup/upgrade_from_s3
+++ b/source4/setup/upgrade_from_s3
@@ -87,16 +87,17 @@ else:
        logger.setLevel(logging.INFO)
 
 s3conf = s3param.get_context()
-#s3conf.load_default()
 
 # Set correct default values from libdir or testparm
 paths = {}
 if libdir:
     paths["state directory"] = libdir
     paths["private dir"] = libdir
+    paths["lock directory"] = libdir
 else:
     paths["state directory"] = get_testparm_var(testparm, "state directory")
     paths["private dir"] = get_testparm_var(testparm, "private dir")
+    paths["lock directory"] = get_testparm_var(testparm, "lock directory")
 
 for p in paths:
     s3conf.set(p, paths[p])