sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s3_upgrade: Set lock directory to correct directory

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Amitay Isaacs
2011-08-26 10:01:29 +10:00
committed by Andrew Bartlett
parent eebb37c9b2
commit 76ff9bffd8
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source4/scripting/python/samba/upgrade.py
View File

@ -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"))

3
source4/setup/upgrade_from_s3
View File

@ -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])