s4:upgrade_from_s3 - old s3 versions (3.0.x) don't have a distinct state directory

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

diff --git a/source4/scripting/python/samba/samba3/__init__.py b/source4/scripting/python/samba/samba3/__init__.py
index dd2f927aa4ae3bbad98e8d44ca13b2b942032d26..cdac071b5b8ed8be36cd2404bfb7cbc0893e338b 100644 (file)
--- a/source4/scripting/python/samba/samba3/__init__.py
+++ b/source4/scripting/python/samba/samba3/__init__.py
@@ -373,7 +373,10 @@ class Samba3(object):
     def statedir_path(self, path):
         if path[0] == "/" or path[0] == ".":
             return path
-        return os.path.join(self.lp.get("state directory"), path)
+        elif self.lp.get("state directory"):
+            return os.path.join(self.lp.get("state directory"), path)
+        else:
+            return os.path.join(self.lp.get("lock directory"), path)
 
     def privatedir_path(self, path):
         if path[0] == "/" or path[0] == ".":