[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  4117c29 s4:upgrade_from_s3 - old s3 versions < 3.4.x don't have a "state directory" param
      from  94bebb9 talloc: change version to 2.0.7

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4117c291387344c94bbda596e4615181793e56b1
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Wed Sep 14 10:12:30 2011 +0200

    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 at samba.org>
    Autobuild-Date: Fri Sep 16 00:07:30 CEST 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/python/samba/netcmd/domain.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index b8f1e92..6f7001a 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])
     


-- 
Samba Shared Repository