summaryrefslogtreecommitdiff
path: root/source3/smbd/server.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-14 20:31:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:04 -0500
commitfad7dd8a60e6637598b17fa89ec92d98db51fffe (patch)
tree23e6622f52c1b25502b6a622d81782dbdd89c0e4 /source3/smbd/server.c
parent1f073a0319b040b25a16046b9e1b37520109ecb8 (diff)
downloadsamba-fad7dd8a60e6637598b17fa89ec92d98db51fffe.tar.gz
samba-fad7dd8a60e6637598b17fa89ec92d98db51fffe.tar.bz2
samba-fad7dd8a60e6637598b17fa89ec92d98db51fffe.zip
r22868: Replace some message_send_pid calls with messaging_send_pid calls. More
tomorrow. (This used to be commit 74fa57ca5d7fa8eace72bbe948a08a0bca3cc4ca)
Diffstat (limited to 'source3/smbd/server.c')
-rw-r--r--source3/smbd/server.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index b869a1a48e..9cdc083bf6 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -646,7 +646,8 @@ static void exit_server_common(enum server_exit_reason how,
invalidate_all_vuids();
- print_notify_send_messages(3); /* 3 second timeout. */
+ /* 3 second timeout. */
+ print_notify_send_messages(smbd_messaging_context(), 3);
/* delete our entry in the connections database. */
yield_connection(NULL,"");
@@ -755,7 +756,8 @@ static BOOL deadtime_fn(const struct timeval *now, void *private_data)
if ((conn_num_open() == 0)
|| (conn_idle_all(now->tv_sec))) {
DEBUG( 2, ( "Closing idle connection\n" ) );
- message_send_pid(procid_self(), MSG_SHUTDOWN, NULL, 0, False);
+ messaging_send(smbd_messaging_context(), procid_self(),
+ MSG_SHUTDOWN, &data_blob_null);
return False;
}
@@ -1062,7 +1064,7 @@ extern void build_options(BOOL screen);
}
/* Setup oplocks */
- if (!init_oplocks())
+ if (!init_oplocks(smbd_messaging_context()))
exit(1);
/* Setup aio signal handler. */