summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-05-31 15:28:11 +0200
committerStefan Metzmacher <metze@samba.org>2012-05-31 18:08:05 +0200
commit671874726817f3dd1c448fca193bd97002f6971d (patch)
treebe2ff11c6f7bebf8c96aa03ee1eaaf70964193d7
parent2ea963b260864b6a0b281c63d407c4e1df065abd (diff)
downloadsamba-671874726817f3dd1c448fca193bd97002f6971d.tar.gz
samba-671874726817f3dd1c448fca193bd97002f6971d.tar.bz2
samba-671874726817f3dd1c448fca193bd97002f6971d.zip
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 <vl@samba.org> for finding this! metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Thu May 31 18:08:06 CEST 2012 on sn-devel-104
-rw-r--r--source3/smbd/server_exit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 20f7b4dbba..aa22c158bf 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