diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-03 17:32:55 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-07 13:22:00 +1100 |
| commit | b038aca5c869ba98f123f7107c3a6906c5f6bbdd (patch) | |
| tree | 0e8e14d3122de670f595e323bce01040170ab243 /source4/param | |
| parent | b2a080fb1d9a726ad30ff7b745e7b77615ba1002 (diff) | |
| download | samba-b038aca5c869ba98f123f7107c3a6906c5f6bbdd.tar.gz samba-b038aca5c869ba98f123f7107c3a6906c5f6bbdd.tar.bz2 samba-b038aca5c869ba98f123f7107c3a6906c5f6bbdd.zip | |
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>
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 6 | ||||
| -rw-r--r-- | source4/param/provision.c | 13 |
2 files changed, 3 insertions, 16 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 8e487fc959..07759c3e79 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 4ae1971c75..c5db6ec8aa 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, |