diff options
| author | Christof Schmitt <cs@samba.org> | 2018-08-21 12:35:11 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-10-09 11:29:24 +0200 |
| commit | 4d9a78ca3dbcb0d3aee1d663d6b49d65dcd9227d (patch) | |
| tree | a8380a98cc756a0c0d615a339992a8c300696f42 | |
| parent | 6a0ae3b5f95b3072c6fa9e53f67d3493b5e98031 (diff) | |
| download | samba-4d9a78ca3dbcb0d3aee1d663d6b49d65dcd9227d.tar.gz | |
s3:smbcontrol: Use cmdline_messaging_context
Initialize the messaging context through cmdline_messaging_context to
allow access to config in clustered Samba.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13465
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit de040eafbd7d729316d757c14c44df163a4b36ad)
| -rw-r--r-- | source3/utils/smbcontrol.c | 19 | ||||
| -rw-r--r-- | source3/utils/wscript_build | 1 |
2 files changed, 12 insertions, 8 deletions
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index b024f3afbd9..5f7c2e8de0d 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -35,6 +35,7 @@ #include "util_tdb.h" #include "../lib/util/pidfile.h" #include "serverid.h" +#include "cmdline_contexts.h" #if HAVE_LIBUNWIND_H #include <libunwind.h> @@ -1643,21 +1644,23 @@ int main(int argc, const char **argv) if (argc <= 1) usage(pc); + msg_ctx = cmdline_messaging_context(get_dyn_CONFIGFILE()); + if (msg_ctx == NULL) { + fprintf(stderr, + "Could not init messaging context, not root?\n"); + TALLOC_FREE(frame); + exit(1); + } + + evt_ctx = server_event_context(); + lp_load_global(get_dyn_CONFIGFILE()); /* Need to invert sense of return code -- samba * routines mostly return True==1 for success, but * shell needs 0. */ - if (!(evt_ctx = samba_tevent_context_init(NULL)) || - !(msg_ctx = messaging_init(NULL, evt_ctx))) { - fprintf(stderr, "could not init messaging context\n"); - TALLOC_FREE(frame); - exit(1); - } - ret = !do_command(evt_ctx, msg_ctx, argc, argv); - TALLOC_FREE(msg_ctx); TALLOC_FREE(frame); return ret; } diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build index 42aaf683695..4b1893f79b7 100644 --- a/source3/utils/wscript_build +++ b/source3/utils/wscript_build @@ -18,6 +18,7 @@ bld.SAMBA3_BINARY('smbcontrol', talloc smbconf popt_samba3 + cmdline_contexts PRINTBASE''') bld.SAMBA3_BINARY('smbtree', |