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.

diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index b8f1e92e1975174346d7b325d7fe2b3811badd28..6f7001a9c74157b48952186ea96485441e0764f9 100644 (file)
--- 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])