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

s4:upgrade_from_s3 - old s3 versions < 3.4.x don't have a "state directory" param

Browse Source 
Hence the "lock directory" path has to be used instead.

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Fri Sep 16 00:07:30 CEST 2011 on sn-devel-104
This commit is contained in:
Matthias Dieter Wallnöfer
2011-09-14 10:12:30 +02:00
parent 94bebb96c5
commit 4117c29138
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source4/scripting/python/samba/netcmd/domain.py
View File

@ -614,7 +614,11 @@ samba3 testparm utility (with --testparm)."""
paths["state directory"] = get_testparm_var(testparm, smbconf, "state directory")
paths["private dir"] = get_testparm_var(testparm, smbconf, "private dir")
paths["lock directory"] = get_testparm_var(testparm, smbconf, "lock directory")
# "testparm" from Samba 3 < 3.4.x is not aware of the parameter
# "state directory", instead make use of "lock directory"
if len(paths["state directory"]) == 0:
paths["state directory"] = paths["lock directory"]
for p in paths:
s3conf.set(p, paths[p])