s4:provision: remember the setup directory if it wasn't the default

This fixes make test without a make install.

metze

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 59787dadc340124bddb9dcfbcf4e2e00a78d1a66..ef5852090f7d7dc94ffd7ee5f91cf9b6d44ec9cf 100644 (file)
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -569,6 +569,13 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
     else:
         sid_generator_line = "sid generator = " + sid_generator
 
+    used_setup_dir = setup_path("")
+    default_setup_dir = default_lp.get("setup directory")
+    setupdir_line = ""
+    if used_setup_dir != default_setup_dir:
+        setupdir_line = "setup directory = %s" % used_setup_dir
+        default_lp.set("setup directory", used_setup_dir)
+
     sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
     netlogon = os.path.join(sysvol, realm.lower(), "scripts")
 
@@ -580,6 +587,7 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
             "SERVERROLE": serverrole,
             "NETLOGONPATH": netlogon,
             "SYSVOLPATH": sysvol,
+            "SETUPDIRECTORY_LINE": setupdir_line,
             "SIDGENERATOR_LINE": sid_generator_line,
             "PRIVATEDIR_LINE": privatedir_line,
             "LOCKDIR_LINE": lockdir_line,

diff --git a/source4/setup/provision.smb.conf.dc b/source4/setup/provision.smb.conf.dc
index 0449f75ffed5dd5702226abc1fe1a6e050b74034..e720900eb454800064cf1da308018dc2f1ec66d1 100644 (file)
--- a/source4/setup/provision.smb.conf.dc
+++ b/source4/setup/provision.smb.conf.dc
@@ -3,6 +3,7 @@
        workgroup       = ${DOMAIN}
        realm           = ${REALM}
        server role     = ${SERVERROLE}
+       ${SETUPDIRECTORY_LINE}
        ${SIDGENERATOR_LINE}
        ${PRIVATEDIR_LINE}
        ${LOCKDIR_LINE}

diff --git a/source4/setup/provision.smb.conf.member b/source4/setup/provision.smb.conf.member
index 4d32ef478cf90ea12ceef119ad328b67b9a4bc70..9fe8995723b65a94617dd748823158f4ac05efae 100644 (file)
--- a/source4/setup/provision.smb.conf.member
+++ b/source4/setup/provision.smb.conf.member
@@ -3,6 +3,7 @@
        workgroup       = ${DOMAIN}
        realm           = ${REALM}
        server role     = ${SERVERROLE}
+       ${SETUPDIRECTORY_LINE}
        ${SIDGENERATOR_LINE}
        ${PRIVATEDIR_LINE}
        ${LOCKDIR_LINE}

diff --git a/source4/setup/provision.smb.conf.standalone b/source4/setup/provision.smb.conf.standalone
index 4d32ef478cf90ea12ceef119ad328b67b9a4bc70..9fe8995723b65a94617dd748823158f4ac05efae 100644 (file)
--- a/source4/setup/provision.smb.conf.standalone
+++ b/source4/setup/provision.smb.conf.standalone
@@ -3,6 +3,7 @@
        workgroup       = ${DOMAIN}
        realm           = ${REALM}
        server role     = ${SERVERROLE}
+       ${SETUPDIRECTORY_LINE}
        ${SIDGENERATOR_LINE}
        ${PRIVATEDIR_LINE}
        ${LOCKDIR_LINE}