s3: Remove some references to smbd_messaging_context()

diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 56b5027958a8ef966cff11fe2cf8e817bb83f5e2..300d2d4bf6f0f5c1b2897a809824c4cada0416a4 100644 (file)
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -76,11 +76,10 @@ WERROR _netr_LogonControl(struct pipes_struct *p,
 Send a message to smbd to do a sam synchronisation
 **************************************************************************/
 
-static void send_sync_message(void)
+static void send_sync_message(struct messaging_context *msg_ctx)
 {
         DEBUG(3, ("sending sam synchronisation message\n"));
-        message_send_all(smbd_messaging_context(), MSG_SMB_SAM_SYNC, NULL, 0,
-                        NULL);
+        message_send_all(msg_ctx, MSG_SMB_SAM_SYNC, NULL, 0, NULL);
 }
 
 /*************************************************************************
@@ -379,7 +378,7 @@ WERROR _netr_LogonControl2Ex(struct pipes_struct *p,
        }
 
         if (lp_server_role() == ROLE_DOMAIN_BDC) {
-                send_sync_message();
+                send_sync_message(p->msg_ctx);
        }
 
        return WERR_OK;
@@ -1694,7 +1693,7 @@ WERROR _netr_GetDcName(struct pipes_struct *p,
        flags = DS_PDC_REQUIRED | DS_IS_FLAT_NAME | DS_RETURN_FLAT_NAME;
 
        status = dsgetdcname(p->mem_ctx,
-                            smbd_messaging_context(),
+                            p->msg_ctx,
                             r->in.domainname,
                             NULL,
                             NULL,
@@ -1739,7 +1738,7 @@ WERROR _netr_GetAnyDCName(struct pipes_struct *p,
        flags = DS_IS_FLAT_NAME | DS_RETURN_FLAT_NAME;
 
        status = dsgetdcname(p->mem_ctx,
-                            smbd_messaging_context(),
+                            p->msg_ctx,
                             r->in.domainname,
                             NULL,
                             NULL,

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 35c030a9b3743a775c99b23c1b49a1d5ac4f66ee..9b8e97cafb822de8594f8983525542d8a8ee19de 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -1327,7 +1327,7 @@ WERROR _srvsvc_NetSessDel(struct pipes_struct *p,
                                become_root();
                        }
 
-                       ntstat = messaging_send(smbd_messaging_context(),
+                       ntstat = messaging_send(p->msg_ctx,
                                                session_list[snum].pid,
                                                MSG_SHUTDOWN, &data_blob_null);
 
@@ -1705,9 +1705,8 @@ WERROR _srvsvc_NetShareSetInfo(struct pipes_struct *p,
 
                if ( (ret = smbrun(command, NULL)) == 0 ) {
                        /* Tell everyone we updated smb.conf. */
-                       message_send_all(smbd_messaging_context(),
-                                        MSG_SMB_CONF_UPDATED, NULL, 0,
-                                        NULL);
+                       message_send_all(p->msg_ctx, MSG_SMB_CONF_UPDATED,
+                                        NULL, 0, NULL);
                }
 
                if ( is_disk_op )
@@ -1893,8 +1892,8 @@ WERROR _srvsvc_NetShareAdd(struct pipes_struct *p,
 
        if ( (ret = smbrun(command, NULL)) == 0 ) {
                /* Tell everyone we updated smb.conf. */
-               message_send_all(smbd_messaging_context(),
-                                MSG_SMB_CONF_UPDATED, NULL, 0, NULL);
+               message_send_all(p->msg_ctx, MSG_SMB_CONF_UPDATED, NULL, 0,
+                                NULL);
        }
 
        if ( is_disk_op )
@@ -1997,8 +1996,8 @@ WERROR _srvsvc_NetShareDel(struct pipes_struct *p,
 
        if ( (ret = smbrun(command, NULL)) == 0 ) {
                /* Tell everyone we updated smb.conf. */
-               message_send_all(smbd_messaging_context(),
-                                MSG_SMB_CONF_UPDATED, NULL, 0, NULL);
+               message_send_all(p->msg_ctx, MSG_SMB_CONF_UPDATED, NULL, 0,
+                                NULL);
        }
 
        if ( is_disk_op )

diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c
index 200a02bc215c2f3f0c37419d8c4e2017cae4282d..a90ac69f8447159c67f5c094c08a3993aa4a6761 100644 (file)
--- a/source3/rpc_server/srv_wkssvc_nt.c
+++ b/source3/rpc_server/srv_wkssvc_nt.c
@@ -859,7 +859,7 @@ WERROR _wkssvc_NetrJoinDomain2(struct pipes_struct *p,
        j->in.admin_password    = cleartext_pwd;
        j->in.debug             = true;
        j->in.modify_config     = lp_config_backend_is_registry();
-       j->in.msg_ctx           = smbd_messaging_context();
+       j->in.msg_ctx           = p->msg_ctx;
 
        become_root();
        werr = libnet_Join(p->mem_ctx, j);
@@ -925,7 +925,7 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct pipes_struct *p,
        u->in.admin_password    = cleartext_pwd;
        u->in.debug             = true;
        u->in.modify_config     = lp_config_backend_is_registry();
-       u->in.msg_ctx           = smbd_messaging_context();
+       u->in.msg_ctx           = p->msg_ctx;
 
        become_root();
        werr = libnet_Unjoin(p->mem_ctx, u);