From 8c3f8e5697f29f1a9829298e0561ff7305b62082 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 15 May 2007 15:49:55 +0000 Subject: r22911: Pass a messaging_context to message_send_all (This used to be commit cc92ce665dcfe9054d09429219883b18a4cab090) --- source3/lib/messages.c | 3 ++- source3/nmbd/nmbd_processlogon.c | 4 ++-- source3/rpc_server/srv_netlog_nt.c | 3 ++- source3/rpc_server/srv_spoolss_nt.c | 6 ++++-- source3/rpc_server/srv_srvsvc_nt.c | 9 ++++++--- source3/smbd/lanman.c | 3 ++- source3/smbd/statcache.c | 3 ++- source3/utils/smbcontrol.c | 2 +- 8 files changed, 21 insertions(+), 12 deletions(-) diff --git a/source3/lib/messages.c b/source3/lib/messages.c index 55eed105b3..9c1eba7b1c 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -659,7 +659,8 @@ static int traverse_fn(TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf, void * * @retval True for success. **/ -BOOL message_send_all(int msg_type, +BOOL message_send_all(struct messaging_context *msg_ctx, + int msg_type, const void *buf, size_t len, BOOL duplicates_allowed, int *n_sent) diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c index 15be7f59c0..0d869f1586 100644 --- a/source3/nmbd/nmbd_processlogon.c +++ b/source3/nmbd/nmbd_processlogon.c @@ -40,8 +40,8 @@ static void send_repl_message(uint32 low_serial) { DEBUG(3, ("sending replication message, serial = 0x%04x\n", low_serial)); - message_send_all(MSG_SMB_SAM_REPL, &low_serial, - sizeof(low_serial), False, NULL); + message_send_all(nmbd_messaging_context(), MSG_SMB_SAM_REPL, + &low_serial, sizeof(low_serial), False, NULL); } /**************************************************************************** diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index e110f39289..4dd04c0288 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -76,7 +76,8 @@ Send a message to smbd to do a sam synchronisation static void send_sync_message(void) { DEBUG(3, ("sending sam synchronisation message\n")); - message_send_all(MSG_SMB_SAM_SYNC, NULL, 0, False, NULL); + message_send_all(smbd_messaging_context(), MSG_SMB_SAM_SYNC, NULL, 0, + False, NULL); } /************************************************************************* diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index cbc44a224a..e2dd773c04 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -311,7 +311,8 @@ WERROR delete_printer_hook( NT_USER_TOKEN *token, const char *sharename ) if ( (ret = smbrun(command, NULL)) == 0 ) { /* Tell everyone we updated smb.conf. */ - message_send_all(MSG_SMB_CONF_UPDATED, NULL, 0, False, NULL); + message_send_all(smbd_messaging_context(), + MSG_SMB_CONF_UPDATED, NULL, 0, False, NULL); } if ( is_print_op ) @@ -6255,7 +6256,8 @@ BOOL add_printer_hook(NT_USER_TOKEN *token, NT_PRINTER_INFO_LEVEL *printer) if ( (ret = smbrun(command, &fd)) == 0 ) { /* Tell everyone we updated smb.conf. */ - message_send_all(MSG_SMB_CONF_UPDATED, NULL, 0, False, NULL); + message_send_all(smbd_messaging_context(), + MSG_SMB_CONF_UPDATED, NULL, 0, False, NULL); } if ( is_print_op ) diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index bb60f57a14..cf3268d44d 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -1421,7 +1421,8 @@ static WERROR add_share(const char *share_name, const char *path, if ( (ret = smbrun(command, NULL)) == 0 ) { /* Tell everyone we updated smb.conf. */ - message_send_all(MSG_SMB_CONF_UPDATED, + message_send_all(smbd_messaging_context(), + MSG_SMB_CONF_UPDATED, NULL, 0, False, NULL); } @@ -1517,7 +1518,8 @@ static WERROR delete_share(const char *sharename, if ( (ret = smbrun(command, NULL)) == 0 ) { /* Tell everyone we updated smb.conf. */ - message_send_all(MSG_SMB_CONF_UPDATED, + message_send_all(smbd_messaging_context(), + MSG_SMB_CONF_UPDATED, NULL, 0, False, NULL); } @@ -1575,7 +1577,8 @@ static WERROR change_share(const char *share_name, const char *path, if ( (ret = smbrun(command, NULL)) == 0 ) { /* Tell everyone we updated smb.conf. */ - message_send_all(MSG_SMB_CONF_UPDATED, + message_send_all(smbd_messaging_context(), + MSG_SMB_CONF_UPDATED, NULL, 0, False, NULL); } diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index b235fd1698..fae6312080 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -1894,7 +1894,8 @@ static BOOL api_RNetShareAdd(connection_struct *conn,uint16 vuid, goto error_exit; } else { SAFE_FREE(command); - message_send_all(MSG_SMB_CONF_UPDATED, NULL, 0, + message_send_all(smbd_messaging_context(), + MSG_SMB_CONF_UPDATED, NULL, 0, False, NULL); } } else { diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c index 7c2c968d8d..1d6646257a 100644 --- a/source3/smbd/statcache.c +++ b/source3/smbd/statcache.c @@ -292,7 +292,8 @@ BOOL stat_cache_lookup(connection_struct *conn, pstring name, pstring dirpath, void send_stat_cache_delete_message(const char *name) { #ifdef DEVELOPER - message_send_all(MSG_SMB_STAT_CACHE_DELETE, + message_send_all(smbd_messaging_context(), + MSG_SMB_STAT_CACHE_DELETE, name, strlen(name)+1, True, diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 7dfa385306..f9e39329f1 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -60,7 +60,7 @@ static BOOL send_message(struct messaging_context *msg_ctx, messaging_send_buf(msg_ctx, pid, msg_type, (uint8 *)buf, len)); - ret = message_send_all(msg_type, buf, len, duplicates, + ret = message_send_all(msg_ctx, msg_type, buf, len, duplicates, &n_sent); DEBUG(10,("smbcontrol/send_message: broadcast message to " "%d processes\n", n_sent)); -- cgit