s4-loadparm: removed "setup directory" option

the correct setup directory is known at both build time and install
time using dyn_SETUPDIR, so we no longer have any need to override it

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 3900ebbe337788830a3c4ce631683f883886b3f2..4f1f1d422cc7cdf077fca5198583374bf8fc4deb 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -606,7 +606,6 @@ sub write_clientconf($$$)
        torture:basedir = $clientdir
 #We don't want to pass our self-tests if the PAC code is wrong
        gensec:require_pac = true
-       setup directory = ./setup
        resolv:host file = $prefix_abs/dns_host_file
 #We don't want to run 'speed' tests for very long
         torture:timelimit = 1

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index a6e2ece705c2752eda1d6e9fd48d1635ca224035..d4817bb5c7d08e711fa280473ad85a586fd39d74 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -596,7 +596,6 @@ sub provision_raw_step1($$)
        pid directory = $ctx->{piddir}
        ncalrpc dir = $ctx->{ncalrpcdir}
        lock dir = $ctx->{lockdir}
-       setup directory = $self->{srcdir}/source4/setup
        winbindd socket directory = $ctx->{winbindd_socket_dir}
        winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir}
        ntp signd socket directory = $ctx->{ntp_signd_socket_dir}

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 8e487fc95912a70024b531c1099bdd255ed20b75..07759c3e79b57daedda35221e59d880521a92754 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -90,7 +90,6 @@ struct loadparm_global
        char *szLockDir;
        char *szModulesDir;
        char *szPidDir;
-       char *szSetupDir;
        char *szServerString;
        char *szAutoServices;
        char *szPasswdChat;
@@ -482,7 +481,6 @@ static struct parm_struct parm_table[] = {
        {"lock directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szLockDir), NULL, NULL},
        {"modules dir", P_STRING, P_GLOBAL, GLOBAL_VAR(szModulesDir), NULL, NULL},
        {"pid directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szPidDir), NULL, NULL}, 
-       {"setup directory", P_STRING, P_GLOBAL, GLOBAL_VAR(szSetupDir), NULL, NULL},
 
        {"socket address", P_STRING, P_GLOBAL, GLOBAL_VAR(szSocketAddress), NULL, NULL},
        {"copy", P_STRING, P_LOCAL, LOCAL_VAR(szCopy), handle_copy, NULL},
@@ -669,7 +667,6 @@ FN_GLOBAL_STRING(private_dir, szPrivateDir)
 FN_GLOBAL_STRING(serverstring, szServerString)
 FN_GLOBAL_STRING(lockdir, szLockDir)
 FN_GLOBAL_STRING(modulesdir, szModulesDir)
-FN_GLOBAL_STRING(setupdir, szSetupDir)
 FN_GLOBAL_STRING(ncalrpc_dir, ncalrpc_dir)
 FN_GLOBAL_STRING(dos_charset, dos_charset)
 FN_GLOBAL_STRING(unix_charset, unix_charset)
@@ -2506,9 +2503,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lpcfg_do_global_parameter(lp_ctx, "tls keyfile", "tls/key.pem");
        lpcfg_do_global_parameter(lp_ctx, "tls certfile", "tls/cert.pem");
        lpcfg_do_global_parameter(lp_ctx, "tls cafile", "tls/ca.pem");
-       lpcfg_do_global_parameter_var(lp_ctx, "setup directory", "%s",
-                                     dyn_SETUPDIR);
-
        lpcfg_do_global_parameter(lp_ctx, "prefork children:smb", "4");
 
        lpcfg_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR);

diff --git a/source4/param/provision.c b/source4/param/provision.c
index 4ae1971c75a95504f5ceb27fae1e3c76f114bdca..c5db6ec8aa3d3d1b2d41037f5bc6122b582154c1 100644 (file)
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -131,13 +131,8 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
        if (settings->targetdir != NULL)
                PyDict_SetItemString(parameters, "targetdir", 
                                                         PyString_FromString(settings->targetdir));
-       if (file_exist("setup/provision.smb.conf.dc")) {
-               PyDict_SetItemString(parameters, "setup_dir",
-                                    PyString_FromString("setup"));
-       } else {
-               PyDict_SetItemString(parameters, "setup_dir",
-                                    PyString_FromString(dyn_SETUPDIR));
-       }
+       PyDict_SetItemString(parameters, "setup_dir",
+                            PyString_FromString(dyn_SETUPDIR));
        PyDict_SetItemString(parameters, "hostname", 
                                                 PyString_FromString(settings->netbios_name));
        PyDict_SetItemString(parameters, "domain", 
@@ -340,7 +335,6 @@ failure:
 struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
                                         DATA_BLOB *override_prefixmap)
 {
-       const char *setupdir;
        PyObject *schema_mod, *schema_dict, *schema_fn, *py_result, *parameters;
        
        Py_Initialize();
@@ -370,9 +364,8 @@ struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_co
        
        parameters = PyDict_New();
 
-       setupdir = lpcfg_setupdir(lp_ctx);
        PyDict_SetItemString(parameters, "setup_dir", 
-                            PyString_FromString(setupdir));
+                            PyString_FromString(dyn_SETUPDIR));
        if (override_prefixmap) {
                PyDict_SetItemString(parameters, "override_prefixmap",
                                     PyString_FromStringAndSize((const char *)override_prefixmap->data,

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 341f822cf29dffc710d0153a354394f1776d798d..d5d272d3a87a6f4080a2be90627a482f00ed01fe 100644 (file)
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -624,13 +624,6 @@ 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 = lp.get("setup directory")
-    setupdir_line = ""
-    if used_setup_dir != default_setup_dir:
-        setupdir_line = "setup directory = %s" % used_setup_dir
-        lp.set("setup directory", used_setup_dir)
-
     sysvol = os.path.join(lp.get("lock dir"), "sysvol")
     netlogon = os.path.join(sysvol, realm.lower(), "scripts")
 
@@ -642,7 +635,6 @@ 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 d3a7a818342fd70c19318535a7c5d9297f86ba63..a8e98ba4bc9bce9285863f44d0e722de54942f2c 100644 (file)
--- a/source4/setup/provision.smb.conf.dc
+++ b/source4/setup/provision.smb.conf.dc
@@ -3,7 +3,6 @@
        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 49372f115dd72c5ffb79d5795be1c6603d176bfd..8241fc28f1cf92df9ead85a4f5ae8ce20e989512 100644 (file)
--- a/source4/setup/provision.smb.conf.member
+++ b/source4/setup/provision.smb.conf.member
@@ -3,7 +3,6 @@
        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 49372f115dd72c5ffb79d5795be1c6603d176bfd..8241fc28f1cf92df9ead85a4f5ae8ce20e989512 100644 (file)
--- a/source4/setup/provision.smb.conf.standalone
+++ b/source4/setup/provision.smb.conf.standalone
@@ -3,7 +3,6 @@
        workgroup       = ${DOMAIN}
        realm           = ${REALM}
        server role     = ${SERVERROLE}
-       ${SETUPDIRECTORY_LINE}
        ${SIDGENERATOR_LINE}
        ${PRIVATEDIR_LINE}
        ${LOCKDIR_LINE}