From b038aca5c869ba98f123f7107c3a6906c5f6bbdd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 3 Feb 2011 17:32:55 +1100 Subject: [PATCH] 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 --- selftest/selftest.pl | 1 - selftest/target/Samba4.pm | 1 - source4/param/loadparm.c | 6 ------ source4/param/provision.c | 13 +++---------- .../scripting/python/samba/provision/__init__.py | 8 -------- source4/setup/provision.smb.conf.dc | 1 - source4/setup/provision.smb.conf.member | 1 - source4/setup/provision.smb.conf.standalone | 1 - 8 files changed, 3 insertions(+), 29 deletions(-) diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 3900ebbe337..4f1f1d422cc 100755 --- 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 a6e2ece705c..d4817bb5c7d 100644 --- 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 8e487fc9591..07759c3e79b 100644 --- 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 4ae1971c75a..c5db6ec8aa3 100644 --- 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 341f822cf29..d5d272d3a87 100644 --- 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 d3a7a818342..a8e98ba4bc9 100644 --- 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 49372f115dd..8241fc28f1c 100644 --- 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 49372f115dd..8241fc28f1c 100644 --- 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}