mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
877183ac0b
For servers ensure logging is configured to go to a logfile unless in interactive mode by calling setup_logging() before lp_load_global() is called. In 4.14 servers had the chance to call setup_logging(getprogname(), DEBUG_FILE) before they called lp_load_*() explicitly in the server. Now in 4.15 lp_load_*() is called internally when parsing the command line arguments triggered by the server running the poptGetNextOpt() loop, so it's too late when the server calls setup_logging(getprogname(), DEBUG_FILE) as lots of debugging from lp_load_()* was already written to DEBUG_DEFAULT_STDERR. Note that there's a chicken and egg problem *within* this patchset: this change here breaks stdout logging for servers until the servers are converted to use the new POPT_COMMON_DAEMON. The only way to address that would be squashing all changes into one patchset, but for the sake of reviewability (is that an actual english word? :)) I chose to split the changes. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14803 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org>
125 lines
2.9 KiB
C
125 lines
2.9 KiB
C
/*
|
|
* Copyright (c) 2020 Andreas Schneider <asn@samba.org>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "lib/replace/replace.h"
|
|
#include <talloc.h>
|
|
#include "lib/param/param.h"
|
|
#include "lib/util/debug.h"
|
|
#include "lib/util/fault.h"
|
|
#include "source3/param/loadparm.h"
|
|
#include "dynconfig/dynconfig.h"
|
|
#include "source3/lib/interface.h"
|
|
#include "auth/credentials/credentials.h"
|
|
#include "dynconfig/dynconfig.h"
|
|
#include "cmdline_private.h"
|
|
|
|
static bool _require_smbconf;
|
|
static enum samba_cmdline_config_type _config_type;
|
|
|
|
static bool _samba_cmdline_load_config_s3(void)
|
|
{
|
|
struct loadparm_context *lp_ctx = samba_cmdline_get_lp_ctx();
|
|
const char *config_file = NULL;
|
|
bool ok = false;
|
|
|
|
/* Load smb conf */
|
|
config_file = lpcfg_configfile(lp_ctx);
|
|
if (config_file == NULL) {
|
|
if (is_default_dyn_CONFIGFILE()) {
|
|
const char *env = getenv("SMB_CONF_PATH");
|
|
if (env != NULL && strlen(env) > 0) {
|
|
set_dyn_CONFIGFILE(env);
|
|
}
|
|
}
|
|
}
|
|
|
|
config_file = get_dyn_CONFIGFILE();
|
|
|
|
switch (_config_type) {
|
|
case SAMBA_CMDLINE_CONFIG_NONE:
|
|
return true;
|
|
case SAMBA_CMDLINE_CONFIG_CLIENT:
|
|
ok = lp_load_client(config_file);
|
|
break;
|
|
case SAMBA_CMDLINE_CONFIG_SERVER:
|
|
{
|
|
const struct samba_cmdline_daemon_cfg *cmdline_daemon_cfg =
|
|
samba_cmdline_get_daemon_cfg();
|
|
|
|
if (!cmdline_daemon_cfg->interactive) {
|
|
setup_logging(getprogname(), DEBUG_FILE);
|
|
}
|
|
|
|
ok = lp_load_global(config_file);
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (!ok) {
|
|
fprintf(stderr,
|
|
"Can't load %s - run testparm to debug it\n",
|
|
config_file);
|
|
|
|
if (_require_smbconf) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
load_interfaces();
|
|
|
|
return true;
|
|
}
|
|
|
|
bool samba_cmdline_init(TALLOC_CTX *mem_ctx,
|
|
enum samba_cmdline_config_type config_type,
|
|
bool require_smbconf)
|
|
{
|
|
struct loadparm_context *lp_ctx = NULL;
|
|
struct cli_credentials *creds = NULL;
|
|
bool ok;
|
|
|
|
ok = samba_cmdline_init_common(mem_ctx);
|
|
if (!ok) {
|
|
return false;
|
|
}
|
|
|
|
lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_helpers());
|
|
if (lp_ctx == NULL) {
|
|
return false;
|
|
}
|
|
ok = samba_cmdline_set_lp_ctx(lp_ctx);
|
|
if (!ok) {
|
|
return false;
|
|
}
|
|
|
|
_require_smbconf = require_smbconf;
|
|
_config_type = config_type;
|
|
|
|
creds = cli_credentials_init(mem_ctx);
|
|
if (creds == NULL) {
|
|
return false;
|
|
}
|
|
ok = samba_cmdline_set_creds(creds);
|
|
if (!ok) {
|
|
return false;
|
|
}
|
|
|
|
samba_cmdline_set_load_config_fn(_samba_cmdline_load_config_s3);
|
|
|
|
return true;
|
|
}
|