Adding upstream version 2:4.17.12+dfsg.upstream/2%4.17.12+dfsgupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 125 insertions, 0 deletions

diff --git a/lib/cmdline/cmdline_s4.c b/lib/cmdline/cmdline_s4.c
new file mode 100644
index 0000000..f8be4ed
--- /dev/null
+++ b/lib/cmdline/cmdline_s4.c
@@ -0,0 +1,125 @@
+/*
+ * 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 "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_s4(void)
+{
+	struct loadparm_context *lp_ctx = samba_cmdline_get_lp_ctx();
+	const char *config_file = NULL;
+	const struct samba_cmdline_daemon_cfg *cmdline_daemon_cfg = \
+		samba_cmdline_get_daemon_cfg();
+	bool ok;
+
+	/* 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);
+			}
+		}
+	}
+
+	switch (_config_type) {
+	case SAMBA_CMDLINE_CONFIG_SERVER:
+		if (!cmdline_daemon_cfg->interactive) {
+			setup_logging(getprogname(), DEBUG_FILE);
+		}
+		break;
+	default:
+		break;
+	}
+
+	config_file = get_dyn_CONFIGFILE();
+	ok = lpcfg_load(lp_ctx, config_file);
+	if (!ok) {
+		fprintf(stderr,
+			"Can't load %s - run testparm to debug it\n",
+			config_file);
+
+		if (_require_smbconf) {
+			return false;
+		}
+	}
+
+	switch (_config_type) {
+	case SAMBA_CMDLINE_CONFIG_SERVER:
+		/*
+		 * We need to setup_logging *again* to ensure multi-file
+		 * logging is set up as specified in smb.conf.
+		 */
+		if (!cmdline_daemon_cfg->interactive) {
+			setup_logging(getprogname(), DEBUG_FILE);
+		}
+		break;
+	default:
+		break;
+	}
+
+	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_global(false);
+	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_s4);
+
+	return true;
+}