s3: Rename server_messaging_context() to global_messaging_context()

This reflects that the messaging context is also used outside of the
server processes.

The command used for the rename:
find . -name '*.[hc]' -print0 | xargs -0 sed -i 's/server_messaging_context/global_messaging_context/'

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/auth/auth_samba4.c b/source3/auth/auth_samba4.c
index 46c8f9ffd623bdc3bb295b8164e7ba1e2bcaab59..a71c75631d745de90ed48f04fb919e81f28443cd 100644 (file)
--- a/source3/auth/auth_samba4.c
+++ b/source3/auth/auth_samba4.c
@@ -59,7 +59,7 @@ static struct server_id *new_server_id_task(TALLOC_CTX *mem_ctx)
                }
        }
 
-       msg_ctx = server_messaging_context();
+       msg_ctx = global_messaging_context();
        if (msg_ctx == NULL) {
                return NULL;
        }

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 5b460e5d66626908cbaee7af5dd8f45933428ad5..685d481c1007f6d4960c2db0d5ae7cf6e4fead1d 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -890,8 +890,8 @@ char* get_string_param( const char* param );
 /* The following definitions come from lib/server_contexts.c  */
 struct tevent_context *global_event_context(void);
 void global_event_context_free(void);
-struct messaging_context *server_messaging_context(void);
-void server_messaging_context_free(void);
+struct messaging_context *global_messaging_context(void);
+void global_messaging_context_free(void);
 
 /* The following definitions come from lib/sessionid_tdb.c  */
 struct sessionid;

diff --git a/source3/lib/cmdline_contexts.c b/source3/lib/cmdline_contexts.c
index 5713f7f7956a4e60e304584d8f0f2f402b8ff02f..2bee7f38059b74ccdde408fc1d4c1cd1d2506905 100644 (file)
--- a/source3/lib/cmdline_contexts.c
+++ b/source3/lib/cmdline_contexts.c
@@ -46,7 +46,7 @@ struct messaging_context *cmdline_messaging_context(const char *config_file)
                exit(1);
        }
 
-       msg_ctx = server_messaging_context();
+       msg_ctx = global_messaging_context();
        if (msg_ctx == NULL) {
                if (geteuid() == 0) {
                        fprintf(stderr,
@@ -66,5 +66,5 @@ struct messaging_context *cmdline_messaging_context(const char *config_file)
 
 void cmdline_messaging_context_free(void)
 {
-       server_messaging_context_free();
+       global_messaging_context_free();
 }

diff --git a/source3/lib/dbwrap/dbwrap_open.c b/source3/lib/dbwrap/dbwrap_open.c
index e144d9881bb22da553c96430cd678dbf7b5af89b..33bf9696998e1aaebc44d938f214a16baeac88da 100644 (file)
--- a/source3/lib/dbwrap/dbwrap_open.c
+++ b/source3/lib/dbwrap/dbwrap_open.c
@@ -146,7 +146,7 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx,
                                errno = EIO;
                                return NULL;
                        }
-                       msg_ctx = server_messaging_context();
+                       msg_ctx = global_messaging_context();
 
                        result = db_open_ctdb(mem_ctx, msg_ctx, base,
                                              hash_size,

diff --git a/source3/lib/server_contexts.c b/source3/lib/server_contexts.c
index 40f1ed046ef6fcd9aaa32e55aec9cec48a2792bb..2d92ad9f69c1327f799e404b8afcced8147ad8a0 100644 (file)
--- a/source3/lib/server_contexts.c
+++ b/source3/lib/server_contexts.c
@@ -46,7 +46,7 @@ void global_event_context_free(void)
 
 static struct messaging_context *server_msg_ctx = NULL;
 
-struct messaging_context *server_messaging_context(void)
+struct messaging_context *global_messaging_context(void)
 {
        if (server_msg_ctx == NULL) {
                /*
@@ -60,7 +60,7 @@ struct messaging_context *server_messaging_context(void)
        return server_msg_ctx;
 }
 
-void server_messaging_context_free(void)
+void global_messaging_context_free(void)
 {
        TALLOC_FREE(server_msg_ctx);
 }

diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
index 90723fb4243f3463a29bb1538fb61caad7f208c8..5596dfbcc45e15d910acd5d7c6f4a5b87d79e094 100644 (file)
--- a/source3/locking/share_mode_lock.c
+++ b/source3/locking/share_mode_lock.c
@@ -86,7 +86,7 @@ static bool locking_init_internal(bool read_only)
                return False;
        }
 
-       lock_db = db_open_watched(NULL, &backend, server_messaging_context());
+       lock_db = db_open_watched(NULL, &backend, global_messaging_context());
        if (lock_db == NULL) {
                DBG_ERR("db_open_watched failed\n");
                TALLOC_FREE(backend);

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 7fdc33c4fa75f58f2621849b2e0506689674abe3..8b23da6b97949806b0991cc1941fbb2ac3858f0d 100644 (file)
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -648,7 +648,7 @@ NTSTATUS pdb_delete_user(TALLOC_CTX *mem_ctx, struct samu *sam_acct)
                 * just return */
                return status;
        }
-       messaging_send_all(server_messaging_context(),
+       messaging_send_all(global_messaging_context(),
                           ID_CACHE_DELETE,
                           msg_data,
                           strlen(msg_data) + 1);

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 9c4c488040f273470ca0e84eadcf4cbb11575dbd..fdd91454acd89e55c742eeffb89fa43ff149917f 100644 (file)
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -1050,7 +1050,7 @@ static uint32_t get_correct_cversion(const struct auth_session_info *session_inf
                                              driver_directory);
        }
 
-       nt_status = create_conn_struct_tos_cwd(server_messaging_context(),
+       nt_status = create_conn_struct_tos_cwd(global_messaging_context(),
                                               printdollar_snum,
                                               working_dir,
                                               session_info,
@@ -1525,7 +1525,7 @@ WERROR move_driver_to_download_area(const struct auth_session_info *session_info
                return WERR_BAD_NET_NAME;
        }
 
-       nt_status = create_conn_struct_tos_cwd(server_messaging_context(),
+       nt_status = create_conn_struct_tos_cwd(global_messaging_context(),
                                               printdollar_snum,
                                               lp_path(frame, printdollar_snum),
                                               session_info,
@@ -2067,7 +2067,7 @@ bool delete_driver_files(const struct auth_session_info *session_info,
                return false;
        }
 
-       nt_status = create_conn_struct_tos_cwd(server_messaging_context(),
+       nt_status = create_conn_struct_tos_cwd(global_messaging_context(),
                                               printdollar_snum,
                                               lp_path(frame, printdollar_snum),
                                               session_info,

diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index ca1eda918790dc22233031def09eb0d3ca6c1fd5..c029f1a11d5cdee99fe28c9acf15b62d40aededf 100644 (file)
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -258,7 +258,7 @@ static bool spoolss_child_init(struct tevent_context *ev_ctx,
 {
        NTSTATUS status;
        struct rpc_srv_callbacks spoolss_cb;
-       struct messaging_context *msg_ctx = server_messaging_context();
+       struct messaging_context *msg_ctx = global_messaging_context();
        bool ok;
 
        status = reinit_after_fork(msg_ctx, ev_ctx, true, "spoolssd-child");

diff --git a/source3/rpc_server/lsasd.c b/source3/rpc_server/lsasd.c
index 9dcf4624aea6c0c682e16af187c611cff3776540..4b9403036de91c3fbce6426e9d0cf54d5fd290a2 100644 (file)
--- a/source3/rpc_server/lsasd.c
+++ b/source3/rpc_server/lsasd.c
@@ -243,7 +243,7 @@ static bool lsasd_child_init(struct tevent_context *ev_ctx,
                             struct pf_worker_data *pf)
 {
        NTSTATUS status;
-       struct messaging_context *msg_ctx = server_messaging_context();
+       struct messaging_context *msg_ctx = global_messaging_context();
        bool ok;
 
        status = reinit_after_fork(msg_ctx, ev_ctx,

diff --git a/source3/rpc_server/mdssd.c b/source3/rpc_server/mdssd.c
index d5c05c7e8e91bef85229d8ea655ed19fbafeb1e4..79f22cae59394959467f0fe4d3e4baf16ad62e1f 100644 (file)
--- a/source3/rpc_server/mdssd.c
+++ b/source3/rpc_server/mdssd.c
@@ -200,7 +200,7 @@ static bool mdssd_child_init(struct tevent_context *ev_ctx,
                             struct pf_worker_data *pf)
 {
        NTSTATUS status;
-       struct messaging_context *msg_ctx = server_messaging_context();
+       struct messaging_context *msg_ctx = global_messaging_context();
        bool ok;
 
        status = reinit_after_fork(msg_ctx, ev_ctx,

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 7138f126be60bc9c2d52a7aeba4d0fb0cc1075f3..ac18a73ef4eaa52ea975db6a43302fc8245f5f4c 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -2345,7 +2345,7 @@ WERROR _srvsvc_NetGetFileSecurity(struct pipes_struct *p,
                goto error_exit;
        }
 
-       nt_status = create_conn_struct_tos_cwd(server_messaging_context(),
+       nt_status = create_conn_struct_tos_cwd(global_messaging_context(),
                                               snum,
                                               lp_path(frame, snum),
                                               p->session_info,
@@ -2478,7 +2478,7 @@ WERROR _srvsvc_NetSetFileSecurity(struct pipes_struct *p,
                goto error_exit;
        }
 
-       nt_status = create_conn_struct_tos_cwd(server_messaging_context(),
+       nt_status = create_conn_struct_tos_cwd(global_messaging_context(),
                                               snum,
                                               lp_path(frame, snum),
                                               p->session_info,

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index ffa7ccb809bf42e92a1d8edddc46e23ddcf03a2e..d3f572e22a1cad00989461b4d04f69ccefd03a15 100644 (file)
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -1210,7 +1210,7 @@ NTSTATUS get_referred_path(TALLOC_CTX *ctx,
                return NT_STATUS_OK;
        }
 
-       status = create_conn_struct_tos_cwd(server_messaging_context(),
+       status = create_conn_struct_tos_cwd(global_messaging_context(),
                                            snum,
                                            lp_path(frame, snum),
                                            NULL,
@@ -1424,7 +1424,7 @@ static bool junction_to_local_path_tos(const struct junction_map *jucn,
        if(snum < 0) {
                return False;
        }
-       status = create_conn_struct_tos_cwd(server_messaging_context(),
+       status = create_conn_struct_tos_cwd(global_messaging_context(),
                                            snum,
                                            lp_path(talloc_tos(), snum),
                                            NULL,
@@ -1594,7 +1594,7 @@ static int count_dfs_links(TALLOC_CTX *ctx, int snum)
         * Fake up a connection struct for the VFS layer.
         */
 
-       status = create_conn_struct_tos_cwd(server_messaging_context(),
+       status = create_conn_struct_tos_cwd(global_messaging_context(),
                                            snum,
                                            connect_path,
                                            NULL,
@@ -1691,7 +1691,7 @@ static int form_junctions(TALLOC_CTX *ctx,
         * Fake up a connection struct for the VFS layer.
         */
 
-       status = create_conn_struct_tos_cwd(server_messaging_context(),
+       status = create_conn_struct_tos_cwd(global_messaging_context(),
                                            snum,
                                            connect_path,
                                            NULL,

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 8cc9cf1f2fc35c121f29adf89a87378cdf11a669..f1148f2af8cf53d2bf6e896d88eb25baca7618bf 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -4614,7 +4614,7 @@ NTSTATUS get_nt_acl_no_snum(TALLOC_CTX *ctx, const char *fname,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = create_conn_struct_tos(server_messaging_context(),
+       status = create_conn_struct_tos(global_messaging_context(),
                                        -1,
                                        "/",
                                        NULL,

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index a9201f8424c15c5bcb4069640b05ce09f05a0dc9..ab7803258c8c8f94f9dde96b95067bebb37bd6ba 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1785,7 +1785,7 @@ extern void build_options(bool screen);
         * Init the messaging context
         * FIXME: This should only call messaging_init()
         */
-       msg_ctx = server_messaging_context();
+       msg_ctx = global_messaging_context();
        if (msg_ctx == NULL) {
                exit(1);
        }

diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c
index 4bf3ea82d4dcac5518df9e98f886418f4c5e3d00..c34c912a433d565c1649ecab77c000320e02bc52 100644 (file)
--- a/source3/smbd/server_exit.c
+++ b/source3/smbd/server_exit.c
@@ -92,7 +92,7 @@ static void exit_server_common(enum server_exit_reason how,
        struct smbXsrv_connection *xconn = NULL;
        struct smbXsrv_connection *xconn_next = NULL;
        struct smbd_server_connection *sconn = NULL;
-       struct messaging_context *msg_ctx = server_messaging_context();
+       struct messaging_context *msg_ctx = global_messaging_context();
 
        if (client != NULL) {
                sconn = client->sconn;
@@ -217,7 +217,7 @@ static void exit_server_common(enum server_exit_reason how,
        netlogon_creds_cli_close_global_db();
        TALLOC_FREE(global_smbXsrv_client);
        smbprofile_dump();
-       server_messaging_context_free();
+       global_messaging_context_free();
        global_event_context_free();
        TALLOC_FREE(smbd_memcache_ctx);
 

diff --git a/source3/smbd/smbXsrv_session.c b/source3/smbd/smbXsrv_session.c
index 19f4bc05600b507f88597b8084c5b4a32f838297..47bf8632a34379860287e4d01736b9ab82b9d6f6 100644 (file)
--- a/source3/smbd/smbXsrv_session.c
+++ b/source3/smbd/smbXsrv_session.c
@@ -89,7 +89,7 @@ NTSTATUS smbXsrv_session_global_init(struct messaging_context *msg_ctx)
                return status;
        }
 
-       db_ctx = db_open_watched(NULL, &backend, server_messaging_context());
+       db_ctx = db_open_watched(NULL, &backend, global_messaging_context());
        if (db_ctx == NULL) {
                TALLOC_FREE(backend);
                return NT_STATUS_NO_MEMORY;

diff --git a/source3/torture/test_dbwrap_ctdb.c b/source3/torture/test_dbwrap_ctdb.c
index 1da5c94a5567dfb8871f800e4576d00244491d80..eddcdf11290581b3474443e2e99115ec5c54cc68 100644 (file)
--- a/source3/torture/test_dbwrap_ctdb.c
+++ b/source3/torture/test_dbwrap_ctdb.c
@@ -34,7 +34,7 @@ bool run_local_dbwrap_ctdb(int dummy)
        uint32_t val;
        struct messaging_context *msg_ctx;
 
-       msg_ctx = server_messaging_context();
+       msg_ctx = global_messaging_context();
 
        db = db_open_ctdb(talloc_tos(), msg_ctx, "torture.tdb",
                          0, TDB_DEFAULT,

diff --git a/source3/torture/test_dbwrap_do_locked.c b/source3/torture/test_dbwrap_do_locked.c
index 9245e5d357d3b02f54ffa9c22f5be960484c1d2a..a5b9d4400cffa743b9b72b69f37bc7abe34cba6c 100644 (file)
--- a/source3/torture/test_dbwrap_do_locked.c
+++ b/source3/torture/test_dbwrap_do_locked.c
@@ -83,9 +83,9 @@ bool run_dbwrap_do_locked1(int dummy)
                fprintf(stderr, "global_event_context() failed\n");
                return false;
        }
-       msg = server_messaging_context();
+       msg = global_messaging_context();
        if (msg == NULL) {
-               fprintf(stderr, "server_messaging_context() failed\n");
+               fprintf(stderr, "global_messaging_context() failed\n");
                return false;
        }
 

diff --git a/source3/torture/test_g_lock.c b/source3/torture/test_g_lock.c
index 29046d67886d1cce4df927d6f4817b8ff639093c..352121e41944ae1f1e1a15e60360ee1a5fc37f8c 100644 (file)
--- a/source3/torture/test_g_lock.c
+++ b/source3/torture/test_g_lock.c
@@ -36,7 +36,7 @@ static bool get_g_lock_ctx(TALLOC_CTX *mem_ctx,
                fprintf(stderr, "tevent_context_init failed\n");
                return false;
        }
-       *msg = server_messaging_context();
+       *msg = global_messaging_context();
        if (*msg == NULL) {
                fprintf(stderr, "messaging_init failed\n");
                TALLOC_FREE(*ev);

diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index e17e6fc5c347191c07fc75cf70d6bd438f7caf6d..0f80d11daae790d812b44af692b524748f409b32 100644 (file)
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -536,7 +536,7 @@ int main(int argc, const char *argv[])
                return 1;
        }
 
-       status = create_conn_struct_tos(server_messaging_context(),
+       status = create_conn_struct_tos(global_messaging_context(),
                                        -1,
                                        getcwd(cwd, sizeof(cwd)),
                                        session_info,

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 4781506c6f23f0aec924cb94b2a9a562d897eca3..641c0ea96ab983c60cd0b7a76c083c972649ec17 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -72,9 +72,9 @@ struct imessaging_context *winbind_imessaging_context(void)
                return msg;
        }
 
-       msg_ctx = server_messaging_context();
+       msg_ctx = global_messaging_context();
        if (msg_ctx == NULL) {
-               smb_panic("server_messaging_context failed\n");
+               smb_panic("global_messaging_context failed\n");
        }
        myself = messaging_server_id(msg_ctx);
 
@@ -1417,9 +1417,9 @@ static void winbindd_register_handlers(struct messaging_context *msg_ctx,
                           MSG_WINBIND_ONLINESTATUS, winbind_msg_onlinestatus);
 
        /* Handle domain online/offline messages for domains */
-       messaging_register(server_messaging_context(), NULL,
+       messaging_register(global_messaging_context(), NULL,
                           MSG_WINBIND_DOMAIN_OFFLINE, winbind_msg_domain_offline);
-       messaging_register(server_messaging_context(), NULL,
+       messaging_register(global_messaging_context(), NULL,
                           MSG_WINBIND_DOMAIN_ONLINE, winbind_msg_domain_online);
 
        messaging_register(msg_ctx, NULL,
@@ -1745,7 +1745,7 @@ int main(int argc, const char **argv)
 
        /* Initialise messaging system */
 
-       if (server_messaging_context() == NULL) {
+       if (global_messaging_context() == NULL) {
                exit(1);
        }
 
@@ -1839,7 +1839,7 @@ int main(int argc, const char **argv)
         * winbindd-specific resources we must free yet. JRA.
         */
 
-       status = reinit_after_fork(server_messaging_context(),
+       status = reinit_after_fork(global_messaging_context(),
                                   global_event_context(),
                                   false, NULL);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1857,9 +1857,9 @@ int main(int argc, const char **argv)
                exit_daemon(nt_errstr(status), map_errno_from_nt_status(status));
        }
 
-       winbindd_register_handlers(server_messaging_context(), !Fork);
+       winbindd_register_handlers(global_messaging_context(), !Fork);
 
-       if (!messaging_parent_dgm_cleanup_init(server_messaging_context())) {
+       if (!messaging_parent_dgm_cleanup_init(global_messaging_context())) {
                exit(1);
        }
 
@@ -1872,7 +1872,7 @@ int main(int argc, const char **argv)
        rpc_samr_init(NULL);
 
        winbindd_init_addrchange(NULL, global_event_context(),
-                                server_messaging_context());
+                                global_messaging_context());
 
        /* setup listen sockets */
 

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 88ef36600d579d390dc2d3d9d59535d14b736514..21cf40bf5cd3979d4df3995b258bb12e63ebe88d 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -225,10 +225,10 @@ static bool fork_child_dc_connect(struct winbindd_domain *domain)
 
        if (domain->dc_probe_pid != (pid_t)0) {
                /* Parent */
-               messaging_register(server_messaging_context(), NULL,
+               messaging_register(global_messaging_context(), NULL,
                                   MSG_WINBIND_TRY_TO_GO_ONLINE,
                                   msg_try_to_go_online);
-               messaging_register(server_messaging_context(), NULL,
+               messaging_register(global_messaging_context(), NULL,
                                   MSG_WINBIND_FAILED_TO_GO_ONLINE,
                                   msg_failed_to_go_online);
                return True;
@@ -249,7 +249,7 @@ static bool fork_child_dc_connect(struct winbindd_domain *domain)
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(1, ("winbindd_reinit_after_fork failed: %s\n",
                          nt_errstr(status)));
-               messaging_send_buf(server_messaging_context(),
+               messaging_send_buf(global_messaging_context(),
                                   pid_to_procid(parent_pid),
                                   MSG_WINBIND_FAILED_TO_GO_ONLINE,
                                   (const uint8_t *)domain->name,
@@ -263,7 +263,7 @@ static bool fork_child_dc_connect(struct winbindd_domain *domain)
        mem_ctx = talloc_init("fork_child_dc_connect");
        if (!mem_ctx) {
                DEBUG(0,("talloc_init failed.\n"));
-               messaging_send_buf(server_messaging_context(),
+               messaging_send_buf(global_messaging_context(),
                                   pid_to_procid(parent_pid),
                                   MSG_WINBIND_FAILED_TO_GO_ONLINE,
                                   (const uint8_t *)domain->name,
@@ -275,7 +275,7 @@ static bool fork_child_dc_connect(struct winbindd_domain *domain)
        TALLOC_FREE(mem_ctx);
        if (!ok || (num_dcs == 0)) {
                /* Still offline ? Can't find DC's. */
-               messaging_send_buf(server_messaging_context(),
+               messaging_send_buf(global_messaging_context(),
                                   pid_to_procid(parent_pid),
                                   MSG_WINBIND_FAILED_TO_GO_ONLINE,
                                   (const uint8_t *)domain->name,
@@ -286,7 +286,7 @@ static bool fork_child_dc_connect(struct winbindd_domain *domain)
        /* We got a DC. Send a message to our parent to get it to
           try and do the same. */
 
-       messaging_send_buf(server_messaging_context(),
+       messaging_send_buf(global_messaging_context(),
                           pid_to_procid(parent_pid),
                           MSG_WINBIND_TRY_TO_GO_ONLINE,
                           (const uint8_t *)domain->name,
@@ -450,7 +450,7 @@ void set_domain_offline(struct winbindd_domain *domain)
 
        /* Send a message to the parent that the domain is offline. */
        if (parent_pid > 1 && !domain->internal) {
-               messaging_send_buf(server_messaging_context(),
+               messaging_send_buf(global_messaging_context(),
                                   pid_to_procid(parent_pid),
                                   MSG_WINBIND_DOMAIN_OFFLINE,
                                   (uint8_t *)domain->name,
@@ -464,7 +464,7 @@ void set_domain_offline(struct winbindd_domain *domain)
                struct winbindd_child *idmap = idmap_child();
 
                if ( idmap->pid != 0 ) {
-                       messaging_send_buf(server_messaging_context(),
+                       messaging_send_buf(global_messaging_context(),
                                           pid_to_procid(idmap->pid), 
                                           MSG_WINBIND_OFFLINE, 
                                           (const uint8_t *)domain->name,
@@ -527,16 +527,16 @@ static void set_domain_online(struct winbindd_domain *domain)
        TALLOC_FREE(domain->check_online_event);
 
        /* Ensure we ignore any pending child messages. */
-       messaging_deregister(server_messaging_context(),
+       messaging_deregister(global_messaging_context(),
                             MSG_WINBIND_TRY_TO_GO_ONLINE, NULL);
-       messaging_deregister(server_messaging_context(),
+       messaging_deregister(global_messaging_context(),
                             MSG_WINBIND_FAILED_TO_GO_ONLINE, NULL);
 
        domain->online = True;
 
        /* Send a message to the parent that the domain is online. */
        if (parent_pid > 1 && !domain->internal) {
-               messaging_send_buf(server_messaging_context(),
+               messaging_send_buf(global_messaging_context(),
                                   pid_to_procid(parent_pid),
                                   MSG_WINBIND_DOMAIN_ONLINE,
                                   (uint8_t *)domain->name,
@@ -550,7 +550,7 @@ static void set_domain_online(struct winbindd_domain *domain)
                struct winbindd_child *idmap = idmap_child();
 
                if ( idmap->pid != 0 ) {
-                       messaging_send_buf(server_messaging_context(),
+                       messaging_send_buf(global_messaging_context(),
                                           pid_to_procid(idmap->pid), 
                                           MSG_WINBIND_ONLINE, 
                                           (const uint8_t *)domain->name,
@@ -1475,7 +1475,7 @@ static bool dcip_check_name(TALLOC_CTX *mem_ctx,
                         "%s$",
                         lp_netbios_name());
 
-               status = nbt_getdc(server_messaging_context(), 10, pss,
+               status = nbt_getdc(global_messaging_context(), 10, pss,
                                   domain->name, &domain->sid,
                                   my_acct_name, ACB_WSTRUST,
                                   nt_version, mem_ctx, &nt_version,
@@ -1849,7 +1849,7 @@ NTSTATUS wb_open_internal_pipe(TALLOC_CTX *mem_ctx,
                                                 session_info,
                                                 NULL,
                                                 NULL,
-                                                server_messaging_context(),
+                                                global_messaging_context(),
                                                 &cli);
        } else {
                status = rpc_pipe_open_internal(mem_ctx,
@@ -1857,7 +1857,7 @@ NTSTATUS wb_open_internal_pipe(TALLOC_CTX *mem_ctx,
                                                session_info,
                                                NULL,
                                                NULL,
-                                               server_messaging_context(),
+                                               global_messaging_context(),
                                                &cli);
        }
        if (!NT_STATUS_IS_OK(status)) {
@@ -3293,7 +3293,7 @@ static NTSTATUS cm_connect_netlogon_transport(struct winbindd_domain *domain,
                                              enum dcerpc_transport_t transport,
                                              struct rpc_pipe_client **cli)
 {
-       struct messaging_context *msg_ctx = server_messaging_context();
+       struct messaging_context *msg_ctx = global_messaging_context();
        struct winbindd_cm_conn *conn;
        NTSTATUS result;
        enum netr_SchannelType sec_chan_type;

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index e641b52fe138f732c2de297f0cbd27352487cfe5..6e3277e5529d14f4a2e6787e8bbef1e144cfb66d 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1271,7 +1271,7 @@ static void machine_password_change_handler(struct tevent_context *ctx,
                                            struct timeval now,
                                            void *private_data)
 {
-       struct messaging_context *msg_ctx = server_messaging_context();
+       struct messaging_context *msg_ctx = global_messaging_context();
        struct winbindd_child *child =
                (struct winbindd_child *)private_data;
        struct rpc_pipe_client *netlogon_pipe = NULL;
@@ -1497,7 +1497,7 @@ NTSTATUS winbindd_reinit_after_fork(const struct winbindd_child *myself,
        NTSTATUS status;
 
        status = reinit_after_fork(
-               server_messaging_context(),
+               global_messaging_context(),
                global_event_context(),
                true, NULL);
        if (!NT_STATUS_IS_OK(status)) {
@@ -1523,24 +1523,24 @@ NTSTATUS winbindd_reinit_after_fork(const struct winbindd_child *myself,
        CatchChild();
 
        /* Don't handle the same messages as our parent. */
-       messaging_deregister(server_messaging_context(),
+       messaging_deregister(global_messaging_context(),
                             MSG_SMB_CONF_UPDATED, NULL);
-       messaging_deregister(server_messaging_context(),
+       messaging_deregister(global_messaging_context(),
                             MSG_SHUTDOWN, NULL);
-       messaging_deregister(server_messaging_context(),
+       messaging_deregister(global_messaging_context(),
                             MSG_WINBIND_OFFLINE, NULL);
-       messaging_deregister(server_messaging_context(),
+       messaging_deregister(global_messaging_context(),
                             MSG_WINBIND_ONLINE, NULL);
-       messaging_deregister(server_messaging_context(),
+       messaging_deregister(global_messaging_context(),
                             MSG_WINBIND_ONLINESTATUS, NULL);
-       messaging_deregister(server_messaging_context(),
+       messaging_deregister(global_messaging_context(),
                             MSG_WINBIND_DUMP_DOMAIN_LIST, NULL);
-       messaging_deregister(server_messaging_context(),
+       messaging_deregister(global_messaging_context(),
                             MSG_DEBUG, NULL);
 
-       messaging_deregister(server_messaging_context(),
+       messaging_deregister(global_messaging_context(),
                             MSG_WINBIND_DOMAIN_OFFLINE, NULL);
-       messaging_deregister(server_messaging_context(),
+       messaging_deregister(global_messaging_context(),
                             MSG_WINBIND_DOMAIN_ONLINE, NULL);
 
        /* We have destroyed all events in the winbindd_event_context
@@ -1718,16 +1718,16 @@ static bool fork_domain_child(struct winbindd_child *child)
        }
 
        /* Handle online/offline messages. */
-       messaging_register(server_messaging_context(), NULL,
+       messaging_register(global_messaging_context(), NULL,
                           MSG_WINBIND_OFFLINE, child_msg_offline);
-       messaging_register(server_messaging_context(), NULL,
+       messaging_register(global_messaging_context(), NULL,
                           MSG_WINBIND_ONLINE, child_msg_online);
-       messaging_register(server_messaging_context(), NULL,
+       messaging_register(global_messaging_context(), NULL,
                           MSG_DEBUG, debug_message);
-       messaging_register(server_messaging_context(), NULL,
+       messaging_register(global_messaging_context(), NULL,
                           MSG_WINBIND_IP_DROPPED,
                           winbind_msg_ip_dropped);
-       messaging_register(server_messaging_context(), NULL,
+       messaging_register(global_messaging_context(), NULL,
                           MSG_WINBIND_DISCONNECT_DC,
                           winbind_msg_disconnect_dc);
 

diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
index 8cb05f06db6c0c3ceaecc8aacf3ebc0697c7c808..e912cba7a41ce84d51f31c121b07681597a711c4 100644 (file)
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -552,7 +552,7 @@ NTSTATUS _wbint_DsGetDcName(struct pipes_struct *p, struct wbint_DsGetDcName *r)
        bool try_dsrgetdcname = false;
 
        if (domain == NULL) {
-               return dsgetdcname(p->mem_ctx, server_messaging_context(),
+               return dsgetdcname(p->mem_ctx, global_messaging_context(),
                                   r->in.domain_name, r->in.domain_guid,
                                   r->in.site_name ? r->in.site_name : "",
                                   r->in.flags,
@@ -746,7 +746,7 @@ again:
 NTSTATUS _wbint_ChangeMachineAccount(struct pipes_struct *p,
                                     struct wbint_ChangeMachineAccount *r)
 {
-       struct messaging_context *msg_ctx = server_messaging_context();
+       struct messaging_context *msg_ctx = global_messaging_context();
        struct winbindd_domain *domain;
        NTSTATUS status;
        struct rpc_pipe_client *netlogon_pipe = NULL;
@@ -1501,7 +1501,7 @@ static WERROR _winbind_LogonControl_CHANGE_PASSWORD(struct pipes_struct *p,
                             struct winbindd_domain *domain,
                             struct winbind_LogonControl *r)
 {
-       struct messaging_context *msg_ctx = server_messaging_context();
+       struct messaging_context *msg_ctx = global_messaging_context();
        NTSTATUS status;
        struct rpc_pipe_client *netlogon_pipe = NULL;
        struct netlogon_creds_cli_context *netlogon_creds_ctx = NULL;