diff options
| author | Jeremy Allison <jra@samba.org> | 2017-03-31 12:23:56 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-04-17 19:13:07 +0200 |
| commit | 1ae7028e47076bee2d779a306b5ecb283a02ac0f (patch) | |
| tree | bd24defe672f99c08cf2f669ba983556d9b011d9 /source4/smbd | |
| parent | d721b8d86b2f2355bd74c13da010843afcd8c3d2 (diff) | |
| download | samba-1ae7028e47076bee2d779a306b5ecb283a02ac0f.tar.gz | |
s4: server: Plumb server_state through the irpc messaging for samba_terminate().
Use it in the message print to avoid a "unused variable" compile error.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/server.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 96f9d9d2347..d80a94db785 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -227,15 +227,17 @@ static void prime_ldb_databases(struct tevent_context *event_ctx) static NTSTATUS samba_terminate(struct irpc_message *msg, struct samba_terminate *r) { - DEBUG(0,("samba_terminate of %d: %s\n", - (int)getpid(), r->in.reason)); + struct server_state *state = talloc_get_type(msg->private_data, + struct server_state); + DBG_ERR("samba_terminate of %s %d: %s\n", + state->binary_name, (int)getpid(), r->in.reason); exit(1); } /* setup messaging for the top level samba (parent) task */ -static NTSTATUS setup_parent_messaging(struct tevent_context *event_ctx, +static NTSTATUS setup_parent_messaging(struct server_state *state, struct loadparm_context *lp_ctx) { struct imessaging_context *msg; @@ -243,7 +245,8 @@ static NTSTATUS setup_parent_messaging(struct tevent_context *event_ctx, msg = imessaging_init(talloc_autofree_context(), lp_ctx, - cluster_id(0, SAMBA_PARENT_TASKID), event_ctx); + cluster_id(0, SAMBA_PARENT_TASKID), + state->event_ctx); NT_STATUS_HAVE_NO_MEMORY(msg); status = irpc_add_name(msg, "samba"); @@ -252,7 +255,7 @@ static NTSTATUS setup_parent_messaging(struct tevent_context *event_ctx, } status = IRPC_REGISTER(msg, irpc, SAMBA_TERMINATE, - samba_terminate, NULL); + samba_terminate, state); return status; } @@ -535,7 +538,7 @@ static int binary_smbd_main(const char *binary_name, prime_ldb_databases(state->event_ctx); - status = setup_parent_messaging(state->event_ctx, cmdline_lp_ctx); + status = setup_parent_messaging(state, cmdline_lp_ctx); if (!NT_STATUS_IS_OK(status)) { exit_daemon("Samba failed to setup parent messaging", NT_STATUS_V(status)); |