From: Volker Lendecke <vl@samba.org>
Date: Sun, 8 Aug 2010 16:48:01 +0000 (+0200)
Subject: s3: Remove some smbd_messaging_context references from smbd_process
X-Git-Tag: release-4-0-0alpha13~1392
X-Git-Url: http://git.samba.org/?p=amitay%2Fsamba.git;a=commitdiff_plain;h=b71f2af1a6e0db46c6aaf3a732e8352f340fdfac

s3: Remove some smbd_messaging_context references from smbd_process
---

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index c57d580e13f..afc30face88 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3008,24 +3008,24 @@ void smbd_process(struct smbd_server_connection *sconn)
 	}
 
 	/* Setup oplocks */
-	if (!init_oplocks(smbd_messaging_context()))
+	if (!init_oplocks(sconn->msg_ctx))
 		exit_server("Failed to init oplocks");
 
 	/* register our message handlers */
-	messaging_register(smbd_messaging_context(), NULL,
+	messaging_register(sconn->msg_ctx, NULL,
 			   MSG_SMB_FORCE_TDIS, msg_force_tdis);
-	messaging_register(smbd_messaging_context(), NULL,
+	messaging_register(sconn->msg_ctx, NULL,
 			   MSG_SMB_RELEASE_IP, msg_release_ip);
-	messaging_register(smbd_messaging_context(), NULL,
+	messaging_register(sconn->msg_ctx, NULL,
 			   MSG_SMB_CLOSE_FILE, msg_close_file);
 
 	/*
 	 * Use the default MSG_DEBUG handler to avoid rebroadcasting
 	 * MSGs to all child processes
 	 */
-	messaging_deregister(smbd_messaging_context(),
+	messaging_deregister(sconn->msg_ctx,
 			     MSG_DEBUG, NULL);
-	messaging_register(smbd_messaging_context(), NULL,
+	messaging_register(sconn->msg_ctx, NULL,
 			   MSG_DEBUG, debug_message);
 
 	if ((lp_keepalive() != 0)
@@ -3047,7 +3047,7 @@ void smbd_process(struct smbd_server_connection *sconn)
 	if (!(event_add_idle(smbd_event_context(), NULL,
 			     timeval_set(SMBD_SELECT_TIMEOUT, 0),
 			     "housekeeping", housekeeping_fn,
-			     smbd_messaging_context()))) {
+			     sconn->msg_ctx))) {
 		DEBUG(0, ("Could not add housekeeping event\n"));
 		exit(1);
 	}