From: Stefan Metzmacher Date: Thu, 31 May 2012 13:28:11 +0000 (+0200) Subject: s3:smbd: use server_messaging_context() instead of sconn->msg_ctx in exit_server_common() X-Git-Tag: samba-4.0.0beta1~76 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=671874726817f3dd1c448fca193bd97002f6971d;p=thirdparty%2Fsamba.git s3:smbd: use server_messaging_context() instead of sconn->msg_ctx in exit_server_common() sconn is not available in the parent anymore. Thanks to Volker Lendecke for finding this! metze Autobuild-User: Stefan Metzmacher Autobuild-Date: Thu May 31 18:08:06 CEST 2012 on sn-devel-104 --- diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c index 20f7b4dbba6..aa22c158bf8 100644 --- a/source3/smbd/server_exit.c +++ b/source3/smbd/server_exit.c @@ -87,6 +87,7 @@ static void exit_server_common(enum server_exit_reason how, bool had_open_conn = false; struct smbXsrv_connection *conn = global_smbXsrv_connection; struct smbd_server_connection *sconn = NULL; + struct messaging_context *msg_ctx = server_messaging_context(); if (conn != NULL) { sconn = conn->sconn; @@ -112,14 +113,14 @@ static void exit_server_common(enum server_exit_reason how, } /* 3 second timeout. */ - print_notify_send_messages(sconn->msg_ctx, 3); + print_notify_send_messages(msg_ctx, 3); /* delete our entry in the serverid database. */ if (am_parent) { /* * For children the parent takes care of cleaning up */ - serverid_deregister(messaging_server_id(sconn->msg_ctx)); + serverid_deregister(messaging_server_id(msg_ctx)); } #ifdef WITH_DFS