summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 18:48:01 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 23:37:47 +0200
commitb71f2af1a6e0db46c6aaf3a732e8352f340fdfac (patch)
tree618edfc835b4485c2a14589078b73ce4aafd1d7d
parent37d71a56fd95dfa8687dcbf88eaa6114c316d96d (diff)
downloadsamba-b71f2af1a6e0db46c6aaf3a732e8352f340fdfac.tar.gz
samba-b71f2af1a6e0db46c6aaf3a732e8352f340fdfac.tar.bz2
samba-b71f2af1a6e0db46c6aaf3a732e8352f340fdfac.zip
s3: Remove some smbd_messaging_context references from smbd_process
-rw-r--r--source3/smbd/process.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index c57d580e13..afc30face8 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);
}