summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2011-09-14 10:12:30 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2011-09-16 00:07:30 +0200
commit4117c291387344c94bbda596e4615181793e56b1 (patch)
tree36d18619b5aecf7b10adaee5a6131948dff5573c
parent94bebb96c54011b6e00256309cbf0a5b9e6688d5 (diff)
downloadsamba-4117c291387344c94bbda596e4615181793e56b1.tar.gz
samba-4117c291387344c94bbda596e4615181793e56b1.tar.bz2
samba-4117c291387344c94bbda596e4615181793e56b1.zip
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. Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org> Autobuild-Date: Fri Sep 16 00:07:30 CEST 2011 on sn-devel-104
-rw-r--r--source4/scripting/python/samba/netcmd/domain.py6
1 files changed, 5 insertions, 1 deletions
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])