winbind: Replace winbind_event_context with server_event_context

There's no point in having two global event contexts

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13150

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 7e83d1489406cd53d72097e40bf02295c88ea61e)

diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index 0520f213ef6d0c9fefc3e3260c29b8cbd4efb7cb..7fa43653c562f46e5d0c346c99cc146c6cce9a2e 100644 (file)
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -471,7 +471,7 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom)
 
        /* get_credentials deals with setting up creds */
 
-       ret = smbldap_init(ctx, winbind_event_context(), ctx->url,
+       ret = smbldap_init(ctx, server_event_context(), ctx->url,
                           false, NULL, NULL, &ctx->smbldap_state);
        if (!NT_STATUS_IS_OK(ret)) {
                DEBUG(1, ("ERROR: smbldap_init (%s) failed!\n", ctx->url));

diff --git a/source3/winbindd/idmap_rfc2307.c b/source3/winbindd/idmap_rfc2307.c
index 0e0311abd81bf5b7620f4c30b6464d870077f385..cfe774bf786070216a4ab4433f5d401fccc8fc7c 100644 (file)
--- a/source3/winbindd/idmap_rfc2307.c
+++ b/source3/winbindd/idmap_rfc2307.c
@@ -194,7 +194,7 @@ static NTSTATUS idmap_rfc2307_init_ldap(struct idmap_rfc2307_context *ctx,
        }
 
        /* assume anonymous if we don't have a specified user */
-       ret = smbldap_init(mem_ctx, winbind_event_context(), url,
+       ret = smbldap_init(mem_ctx, server_event_context(), url,
                           (user_dn == NULL), user_dn, secret,
                           &ctx->smbldap_state);
        SAFE_FREE(secret);

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 2cd200142673f9c15f4f15952fb48180d1c21520..a34c41421f69bdcd52a746fd9e04e4e00ad6e1ee 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -90,7 +90,7 @@ struct messaging_context *winbind_messaging_context(void)
         * Note we MUST use the NULL context here, not the autofree context,
         * to avoid side effects in forked children exiting.
         */
-       msg = messaging_init(NULL, winbind_event_context());
+       msg = messaging_init(NULL, server_event_context());
        if (msg == NULL) {
                smb_panic("Could not init winbindd's messaging context.\n");
        }
@@ -123,7 +123,7 @@ struct imessaging_context *winbind_imessaging_context(void)
         * Note we MUST use the NULL context here, not the autofree context,
         * to avoid side effects in forked children exiting.
         */
-       msg = imessaging_init(NULL, lp_ctx, myself, winbind_event_context());
+       msg = imessaging_init(NULL, lp_ctx, myself, server_event_context());
        talloc_unlink(NULL, lp_ctx);
 
        if (msg == NULL) {
@@ -306,14 +306,14 @@ bool winbindd_setup_sig_term_handler(bool parent)
        struct tevent_signal *se;
        bool *is_parent;
 
-       is_parent = talloc(winbind_event_context(), bool);
+       is_parent = talloc(server_event_context(), bool);
        if (!is_parent) {
                return false;
        }
 
        *is_parent = parent;
 
-       se = tevent_add_signal(winbind_event_context(),
+       se = tevent_add_signal(server_event_context(),
                               is_parent,
                               SIGTERM, 0,
                               winbindd_sig_term_handler,
@@ -324,7 +324,7 @@ bool winbindd_setup_sig_term_handler(bool parent)
                return false;
        }
 
-       se = tevent_add_signal(winbind_event_context(),
+       se = tevent_add_signal(server_event_context(),
                               is_parent,
                               SIGINT, 0,
                               winbindd_sig_term_handler,
@@ -335,7 +335,7 @@ bool winbindd_setup_sig_term_handler(bool parent)
                return false;
        }
 
-       se = tevent_add_signal(winbind_event_context(),
+       se = tevent_add_signal(server_event_context(),
                               is_parent,
                               SIGQUIT, 0,
                               winbindd_sig_term_handler,
@@ -356,7 +356,7 @@ bool winbindd_setup_stdin_handler(bool parent, bool foreground)
        if (foreground) {
                struct stat st;
 
-               is_parent = talloc(winbind_event_context(), bool);
+               is_parent = talloc(server_event_context(), bool);
                if (!is_parent) {
                        return false;
                }
@@ -372,7 +372,7 @@ bool winbindd_setup_stdin_handler(bool parent, bool foreground)
                        return false;
                }
                if (S_ISFIFO(st.st_mode) || S_ISSOCK(st.st_mode)) {
-                       tevent_add_fd(winbind_event_context(),
+                       tevent_add_fd(server_event_context(),
                                        is_parent,
                                        0,
                                        TEVENT_FD_READ,
@@ -404,15 +404,15 @@ bool winbindd_setup_sig_hup_handler(const char *lfile)
        char *file = NULL;
 
        if (lfile) {
-               file = talloc_strdup(winbind_event_context(),
+               file = talloc_strdup(server_event_context(),
                                     lfile);
                if (!file) {
                        return false;
                }
        }
 
-       se = tevent_add_signal(winbind_event_context(),
-                              winbind_event_context(),
+       se = tevent_add_signal(server_event_context(),
+                              server_event_context(),
                               SIGHUP, 0,
                               winbindd_sig_hup_handler,
                               file);
@@ -441,8 +441,8 @@ static bool winbindd_setup_sig_chld_handler(void)
 {
        struct tevent_signal *se;
 
-       se = tevent_add_signal(winbind_event_context(),
-                              winbind_event_context(),
+       se = tevent_add_signal(server_event_context(),
+                              server_event_context(),
                               SIGCHLD, 0,
                               winbindd_sig_chld_handler,
                               NULL);
@@ -467,8 +467,8 @@ static bool winbindd_setup_sig_usr2_handler(void)
 {
        struct tevent_signal *se;
 
-       se = tevent_add_signal(winbind_event_context(),
-                              winbind_event_context(),
+       se = tevent_add_signal(server_event_context(),
+                              server_event_context(),
                               SIGUSR2, 0,
                               winbindd_sig_usr2_handler,
                               NULL);
@@ -733,7 +733,7 @@ static void process_request(struct winbindd_cli_state *state)
                DEBUG(10, ("process_request: Handling async request %d:%s\n",
                           (int)state->pid, state->cmd_name));
 
-               req = atable->send_req(state->mem_ctx, winbind_event_context(),
+               req = atable->send_req(state->mem_ctx, server_event_context(),
                                       state, state->request);
                if (req == NULL) {
                        DEBUG(0, ("process_request: atable->send failed for "
@@ -827,7 +827,7 @@ static void request_finished(struct winbindd_cli_state *state)
 
        TALLOC_FREE(state->request);
 
-       req = wb_resp_write_send(state, winbind_event_context(),
+       req = wb_resp_write_send(state, server_event_context(),
                                 state->out_queue, state->sock,
                                 state->response);
        if (req == NULL) {
@@ -868,7 +868,7 @@ static void winbind_client_response_written(struct tevent_req *req)
        state->cmd_name = "no request";
        state->recv_fn = NULL;
 
-       req = wb_req_read_send(state, winbind_event_context(), state->sock,
+       req = wb_req_read_send(state, server_event_context(), state->sock,
                               WINBINDD_MAX_EXTRA_DATA);
        if (req == NULL) {
                remove_client(state);
@@ -936,7 +936,7 @@ static void new_connection(int listen_sock, bool privileged)
 
        state->privileged = privileged;
 
-       req = wb_req_read_send(state, winbind_event_context(), state->sock,
+       req = wb_req_read_send(state, server_event_context(), state->sock,
                               WINBINDD_MAX_EXTRA_DATA);
        if (req == NULL) {
                TALLOC_FREE(state);
@@ -976,7 +976,7 @@ static void winbind_client_request_read(struct tevent_req *req)
                return;
        }
 
-       req = wait_for_read_send(state, winbind_event_context(), state->sock,
+       req = wait_for_read_send(state, server_event_context(), state->sock,
                                 true);
        if (req == NULL) {
                DEBUG(0, ("winbind_client_request_read[%d:%s]:"
@@ -1237,7 +1237,7 @@ static bool winbindd_setup_listeners(void)
        int rc;
        char *socket_path;
 
-       pub_state = talloc(winbind_event_context(),
+       pub_state = talloc(server_event_context(),
                           struct winbindd_listen_state);
        if (!pub_state) {
                goto failed;
@@ -1254,7 +1254,7 @@ static bool winbindd_setup_listeners(void)
                goto failed;
        }
 
-       fde = tevent_add_fd(winbind_event_context(), pub_state, pub_state->fd,
+       fde = tevent_add_fd(server_event_context(), pub_state, pub_state->fd,
                            TEVENT_FD_READ, winbindd_listen_fde_handler,
                            pub_state);
        if (fde == NULL) {
@@ -1263,7 +1263,7 @@ static bool winbindd_setup_listeners(void)
        }
        tevent_fd_set_auto_close(fde);
 
-       priv_state = talloc(winbind_event_context(),
+       priv_state = talloc(server_event_context(),
                            struct winbindd_listen_state);
        if (!priv_state) {
                goto failed;
@@ -1286,7 +1286,7 @@ static bool winbindd_setup_listeners(void)
                goto failed;
        }
 
-       fde = tevent_add_fd(winbind_event_context(), priv_state,
+       fde = tevent_add_fd(server_event_context(), priv_state,
                            priv_state->fd, TEVENT_FD_READ,
                            winbindd_listen_fde_handler, priv_state);
        if (fde == NULL) {
@@ -1295,7 +1295,7 @@ static bool winbindd_setup_listeners(void)
        }
        tevent_fd_set_auto_close(fde);
 
-       winbindd_scrub_clients_handler(winbind_event_context(), NULL,
+       winbindd_scrub_clients_handler(server_event_context(), NULL,
                                       timeval_current(), NULL);
        return true;
 failed:
@@ -1410,7 +1410,7 @@ static void winbindd_register_handlers(struct messaging_context *msg_ctx,
        smb_nscd_flush_group_cache();
 
        if (lp_allow_trusted_domains()) {
-               if (tevent_add_timer(winbind_event_context(), NULL, timeval_zero(),
+               if (tevent_add_timer(server_event_context(), NULL, timeval_zero(),
                              rescan_trusted_domains, NULL) == NULL) {
                        DEBUG(0, ("Could not trigger rescan_trusted_domains()\n"));
                        exit(1);
@@ -1775,7 +1775,7 @@ int main(int argc, const char **argv)
         */
 
        status = reinit_after_fork(winbind_messaging_context(),
-                                  winbind_event_context(),
+                                  server_event_context(),
                                   false, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                exit_daemon("Winbindd reinit_after_fork() failed", map_errno_from_nt_status(status));
@@ -1805,7 +1805,7 @@ int main(int argc, const char **argv)
        rpc_lsarpc_init(NULL);
        rpc_samr_init(NULL);
 
-       winbindd_init_addrchange(NULL, winbind_event_context(),
+       winbindd_init_addrchange(NULL, server_event_context(),
                                 winbind_messaging_context());
 
        /* setup listen sockets */
@@ -1826,7 +1826,7 @@ int main(int argc, const char **argv)
        while (1) {
                frame = talloc_stackframe();
 
-               if (tevent_loop_once(winbind_event_context()) == -1) {
+               if (tevent_loop_once(server_event_context()) == -1) {
                        DEBUG(1, ("tevent_loop_once() failed: %s\n",
                                  strerror(errno)));
                        return 1;

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 2cf89edad86008a8e204bca82d1fd850f8ec9de3..b507f1ad25bba533655c8df4686d3c5668a561ce 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -427,7 +427,7 @@ void set_domain_offline(struct winbindd_domain *domain)
 
        calc_new_online_timeout_check(domain);
 
-       domain->check_online_event = tevent_add_timer(winbind_event_context(),
+       domain->check_online_event = tevent_add_timer(server_event_context(),
                                                NULL,
                                                timeval_current_ofs(domain->check_online_timeout,0),
                                                check_domain_online_handler,
@@ -603,7 +603,7 @@ void set_domain_online_request(struct winbindd_domain *domain)
 
        TALLOC_FREE(domain->check_online_event);
 
-       domain->check_online_event = tevent_add_timer(winbind_event_context(),
+       domain->check_online_event = tevent_add_timer(server_event_context(),
                                                     NULL,
                                                     tev,
                                                     check_domain_online_handler,

diff --git a/source3/winbindd/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c
index 20b4d55fb80f7a9aab26a05d2b66861bb156d7ac..7cd7a4c9f234c0d0e7a16a24d7d16c85c0a6a382 100644 (file)
--- a/source3/winbindd/winbindd_cred_cache.c
+++ b/source3/winbindd/winbindd_cred_cache.c
@@ -285,7 +285,7 @@ done:
        if (entry->refresh_time == 0) {
                entry->refresh_time = new_start;
        }
-       entry->event = tevent_add_timer(winbind_event_context(), entry,
+       entry->event = tevent_add_timer(server_event_context(), entry,
                                       timeval_set(new_start, 0),
                                       krb5_ticket_refresh_handler,
                                       entry);
@@ -385,7 +385,7 @@ static void krb5_ticket_gain_handler(struct tevent_context *event_ctx,
        if (entry->refresh_time == 0) {
                entry->refresh_time = t.tv_sec;
        }
-       entry->event = tevent_add_timer(winbind_event_context(),
+       entry->event = tevent_add_timer(server_event_context(),
                                       entry,
                                       t,
                                       krb5_ticket_refresh_handler,
@@ -404,7 +404,7 @@ static void add_krb5_ticket_gain_handler_event(struct WINBINDD_CCACHE_ENTRY *ent
                                     struct timeval t)
 {
        entry->refresh_time = 0;
-       entry->event = tevent_add_timer(winbind_event_context(),
+       entry->event = tevent_add_timer(server_event_context(),
                                       entry,
                                       t,
                                       krb5_ticket_gain_handler,
@@ -424,13 +424,13 @@ void ccache_regain_all_now(void)
                 * the event has the krb5_ticket_gain_handler
                 */
                if (cur->refresh_time == 0) {
-                       new_event = tevent_add_timer(winbind_event_context(),
+                       new_event = tevent_add_timer(server_event_context(),
                                                    cur,
                                                    t,
                                                    krb5_ticket_gain_handler,
                                                    cur);
                } else {
-                       new_event = tevent_add_timer(winbind_event_context(),
+                       new_event = tevent_add_timer(server_event_context(),
                                                    cur,
                                                    t,
                                                    krb5_ticket_refresh_handler,
@@ -547,7 +547,7 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
                                if (!entry->refresh_time) {
                                        entry->refresh_time = t.tv_sec;
                                }
-                               entry->event = tevent_add_timer(winbind_event_context(),
+                               entry->event = tevent_add_timer(server_event_context(),
                                                               entry,
                                                               t,
                                                               krb5_ticket_refresh_handler,
@@ -645,7 +645,7 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
                if (entry->refresh_time == 0) {
                        entry->refresh_time = t.tv_sec;
                }
-               entry->event = tevent_add_timer(winbind_event_context(),
+               entry->event = tevent_add_timer(server_event_context(),
                                               entry,
                                               t,
                                               krb5_ticket_refresh_handler,

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 8636ccd7e0a06dbe536c227e69caeed7b8fc0cbb..0b98a8368e494efae7c3a2466d03c9772801cace 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -175,7 +175,7 @@ static void wb_child_request_trigger(struct tevent_req *req,
                return;
        }
 
-       subreq = wb_simple_trans_send(state, winbind_event_context(), NULL,
+       subreq = wb_simple_trans_send(state, server_event_context(), NULL,
                                      state->child->sock, state->request);
        if (tevent_req_nomem(subreq, req)) {
                return;
@@ -968,7 +968,7 @@ static void account_lockout_policy_handler(struct tevent_context *ctx,
                         nt_errstr(result)));
        }
 
-       child->lockout_policy_event = tevent_add_timer(winbind_event_context(), NULL,
+       child->lockout_policy_event = tevent_add_timer(server_event_context(), NULL,
                                                      timeval_current_ofs(3600, 0),
                                                      account_lockout_policy_handler,
                                                      child);
@@ -1130,7 +1130,7 @@ static void machine_password_change_handler(struct tevent_context *ctx,
        }
 
 done:
-       child->machine_password_change_event = tevent_add_timer(winbind_event_context(), NULL,
+       child->machine_password_change_event = tevent_add_timer(server_event_context(), NULL,
                                                              next_change,
                                                              machine_password_change_handler,
                                                              child);
@@ -1251,7 +1251,7 @@ NTSTATUS winbindd_reinit_after_fork(const struct winbindd_child *myself,
 
        status = reinit_after_fork(
                winbind_messaging_context(),
-               winbind_event_context(),
+               server_event_context(),
                true, NULL);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("reinit_after_fork() failed\n"));
@@ -1556,7 +1556,7 @@ static bool fork_domain_child(struct winbindd_child *child)
                }
 
                child->lockout_policy_event = tevent_add_timer(
-                       winbind_event_context(), NULL, timeval_zero(),
+                       server_event_context(), NULL, timeval_zero(),
                        account_lockout_policy_handler,
                        child);
        }
@@ -1570,13 +1570,13 @@ static bool fork_domain_child(struct winbindd_child *child)
                if (calculate_next_machine_pwd_change(child->domain->name,
                                                       &next_change)) {
                        child->machine_password_change_event = tevent_add_timer(
-                               winbind_event_context(), NULL, next_change,
+                               server_event_context(), NULL, next_change,
                                machine_password_change_handler,
                                child);
                }
        }
 
-       fde = tevent_add_fd(winbind_event_context(), NULL, state.cli.sock,
+       fde = tevent_add_fd(server_event_context(), NULL, state.cli.sock,
                            TEVENT_FD_READ, child_handler, &state);
        if (fde == NULL) {
                DEBUG(1, ("tevent_add_fd failed\n"));
@@ -1588,7 +1588,7 @@ static bool fork_domain_child(struct winbindd_child *child)
                int ret;
                TALLOC_CTX *frame = talloc_stackframe();
 
-               ret = tevent_loop_once(winbind_event_context());
+               ret = tevent_loop_once(server_event_context());
                if (ret != 0) {
                        DEBUG(1, ("tevent_loop_once failed: %s\n",
                                  strerror(errno)));

diff --git a/source3/winbindd/winbindd_irpc.c b/source3/winbindd/winbindd_irpc.c
index 9a9f75373f1dc91de57e1fb8249094f1fb4d67ec..d6c3661c3c0cd8c6c0ca861fb366c5fd6c087781 100644 (file)
--- a/source3/winbindd/winbindd_irpc.c
+++ b/source3/winbindd/winbindd_irpc.c
@@ -123,7 +123,7 @@ static NTSTATUS wb_irpc_DsrUpdateReadOnlyServerDnsRecords(struct irpc_message *m
        DEBUG(5, ("wb_irpc_DsrUpdateReadOnlyServerDnsRecords called\n"));
 
        return wb_irpc_forward_rpc_call(msg, msg,
-                                       winbind_event_context(),
+                                       server_event_context(),
                                        req, NDR_WINBIND_DSRUPDATEREADONLYSERVERDNSRECORDS,
                                        "winbind_DsrUpdateReadOnlyServerDnsRecords",
                                        domain, IRPC_CALL_TIMEOUT);
@@ -147,7 +147,7 @@ static NTSTATUS wb_irpc_SamLogon(struct irpc_message *msg,
        DEBUG(5, ("wb_irpc_SamLogon called\n"));
 
        return wb_irpc_forward_rpc_call(msg, msg,
-                                       winbind_event_context(),
+                                       server_event_context(),
                                        req, NDR_WINBIND_SAMLOGON,
                                        "winbind_SamLogon",
                                        domain, IRPC_CALL_TIMEOUT);
@@ -207,7 +207,7 @@ static NTSTATUS wb_irpc_LogonControl(struct irpc_message *msg,
 
        TALLOC_FREE(frame);
        return wb_irpc_forward_rpc_call(msg, msg,
-                                       winbind_event_context(),
+                                       server_event_context(),
                                        req, NDR_WINBIND_LOGONCONTROL,
                                        "winbind_LogonControl",
                                        domain, 45 /* timeout */);
@@ -247,7 +247,7 @@ static NTSTATUS wb_irpc_GetForestTrustInformation(struct irpc_message *msg,
        DEBUG(5, ("wb_irpc_GetForestTrustInformation called\n"));
 
        return wb_irpc_forward_rpc_call(msg, msg,
-                                       winbind_event_context(),
+                                       server_event_context(),
                                        req, NDR_WINBIND_GETFORESTTRUSTINFORMATION,
                                        "winbind_GetForestTrustInformation",
                                        domain, 45 /* timeout */);

diff --git a/source3/winbindd/winbindd_misc.c b/source3/winbindd/winbindd_misc.c
index 12c5faa6b487fd8e55626955b3d4389731665bf6..fb558df561f52084569582c7a478240a2c0c8606 100644 (file)
--- a/source3/winbindd/winbindd_misc.c
+++ b/source3/winbindd/winbindd_misc.c
@@ -277,7 +277,7 @@ void winbindd_domain_info(struct winbindd_cli_state *cli)
         * Send a ping down. This implicitly initializes the domain.
         */
 
-       req = wb_domain_request_send(state, winbind_event_context(),
+       req = wb_domain_request_send(state, server_event_context(),
                                     domain, &state->ping_request);
        if (req == NULL) {
                DEBUG(3, ("wb_domain_request_send failed\n"));

diff --git a/source3/winbindd/winbindd_pam_auth.c b/source3/winbindd/winbindd_pam_auth.c
index 4f963a32818f4af7b675b932cca8519ac80bfa9e..7ff448889755f34f00aef7f87df015216cb8b000 100644 (file)
--- a/source3/winbindd/winbindd_pam_auth.c
+++ b/source3/winbindd/winbindd_pam_auth.c
@@ -81,7 +81,7 @@ struct tevent_req *winbindd_pam_auth_send(TALLOC_CTX *mem_ctx,
                return tevent_req_post(req, ev);
        }
 
-       subreq = wb_domain_request_send(state, winbind_event_context(), domain,
+       subreq = wb_domain_request_send(state, server_event_context(), domain,
                                        request);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);

diff --git a/source3/winbindd/winbindd_pam_auth_crap.c b/source3/winbindd/winbindd_pam_auth_crap.c
index e6a47c867857b739477dbce5a2237f7bdaf2724f..cfeafbcfda873acba38610507ae2e1c7e34385d0 100644 (file)
--- a/source3/winbindd/winbindd_pam_auth_crap.c
+++ b/source3/winbindd/winbindd_pam_auth_crap.c
@@ -93,7 +93,7 @@ struct tevent_req *winbindd_pam_auth_crap_send(
                fstrcpy(request->data.auth_crap.workstation, lp_netbios_name());
        }
 
-       subreq = wb_domain_request_send(state, winbind_event_context(), domain,
+       subreq = wb_domain_request_send(state, server_event_context(), domain,
                                        request);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);

diff --git a/source3/winbindd/winbindd_pam_chauthtok.c b/source3/winbindd/winbindd_pam_chauthtok.c
index 8ffbc29b973e49ea0edda6825c281031c414dba2..0d749fbcecd578ecca9803b99b0d9953cb2e662d 100644 (file)
--- a/source3/winbindd/winbindd_pam_chauthtok.c
+++ b/source3/winbindd/winbindd_pam_chauthtok.c
@@ -79,7 +79,7 @@ struct tevent_req *winbindd_pam_chauthtok_send(
                return tevent_req_post(req, ev);
        }
 
-       subreq = wb_domain_request_send(state, winbind_event_context(),
+       subreq = wb_domain_request_send(state, server_event_context(),
                                        contact_domain, request);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);

diff --git a/source3/winbindd/winbindd_pam_chng_pswd_auth_crap.c b/source3/winbindd/winbindd_pam_chng_pswd_auth_crap.c
index 9133a91fa5032096e926b92894c2e760a3bdaa03..e9ee0ab63ce5344a542d3faf3778907fd2c117d9 100644 (file)
--- a/source3/winbindd/winbindd_pam_chng_pswd_auth_crap.c
+++ b/source3/winbindd/winbindd_pam_chng_pswd_auth_crap.c
@@ -73,7 +73,7 @@ struct tevent_req *winbindd_pam_chng_pswd_auth_crap_send(
                return tevent_req_post(req, ev);
        }
 
-       subreq = wb_domain_request_send(state, winbind_event_context(),
+       subreq = wb_domain_request_send(state, server_event_context(),
                                        domain, request);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);

diff --git a/source3/winbindd/winbindd_pam_logoff.c b/source3/winbindd/winbindd_pam_logoff.c
index b3c60adf8574efa95361cd6a7ed20738a0ed57c3..b5b7840f99c5fca6005315085eb3a373780f070a 100644 (file)
--- a/source3/winbindd/winbindd_pam_logoff.c
+++ b/source3/winbindd/winbindd_pam_logoff.c
@@ -94,7 +94,7 @@ struct tevent_req *winbindd_pam_logoff_send(TALLOC_CTX *mem_ctx,
                break;
        }
 
-       subreq = wb_domain_request_send(state, winbind_event_context(), domain,
+       subreq = wb_domain_request_send(state, server_event_context(), domain,
                                        request);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 8a97e80cae94f902c51803c3d3f306dea73df452..8e04ac664b517e73d7908b1f0a7e9017f646db69 100644 (file)
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -323,7 +323,7 @@ static void add_trusted_domains( struct winbindd_domain *domain )
        state->request.length = sizeof(state->request);
        state->request.cmd = WINBINDD_LIST_TRUSTDOM;
 
-       req = wb_domain_request_send(state, winbind_event_context(),
+       req = wb_domain_request_send(state, server_event_context(),
                                     domain, &state->request);
        if (req == NULL) {
                DEBUG(1, ("wb_domain_request_send failed\n"));