From 7e4fb523893e681659e2e64586f6bcf0af36a588 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Dieter=20Walln=C3=B6fer?= Date: Wed, 14 Sep 2011 10:12:30 +0200 Subject: [PATCH] s4:upgrade_from_s3 - old s3 versions < 3.4.x don't have a "state directory" param Hence the "lock directory" path has to be used instead. --- source4/scripting/python/samba/netcmd/domain.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index b8f1e92e19..6f7001a9c7 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -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]) -- 2.34.1