sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-07 09:49:30 +03:00
Code Activity

winbind: Replace winbind_event_context with server_event_context

Browse Source 
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>
This commit is contained in:
Volker Lendecke
2017-11-17 11:35:19 +01:00
committed by Jeremy Allison
parent d27f38d35b
commit 7e83d14894
14 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source3/winbindd/idmap_ldap.c
View File

@ -455,7 +455,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));

2
source3/winbindd/idmap_rfc2307.c
View File

@ -193,7 +193,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);

58
source3/winbindd/winbindd.c
View File

@ -91,7 +91,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");
}
@ -124,7 +124,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) {
@ -307,14 +307,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,
@ -325,7 +325,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,
@ -336,7 +336,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,
@ -357,7 +357,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;
}
@ -373,7 +373,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,
@ -405,15 +405,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);
@ -442,8 +442,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);
@ -468,8 +468,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);
@ -734,7 +734,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 "
@ -828,7 +828,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) {
@ -869,7 +869,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);
@ -937,7 +937,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);
@ -977,7 +977,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]:"
@ -1239,7 +1239,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;
@ -1256,7 +1256,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) {
@ -1265,7 +1265,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;
@ -1288,7 +1288,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) {
@ -1297,7 +1297,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:
@ -1412,7 +1412,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);
@ -1777,7 +1777,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));
@ -1807,7 +1807,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 */
@ -1828,7 +1828,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;

4
source3/winbindd/winbindd_cm.c
View File

@ -428,7 +428,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,
@ -604,7 +604,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,

14
source3/winbindd/winbindd_cred_cache.c
View File

@ -284,7 +284,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);
@ -383,7 +383,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,
@ -402,7 +402,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,
@ -422,13 +422,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,
@ -545,7 +545,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,
@ -643,7 +643,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,

16
source3/winbindd/winbindd_dual.c
View File

@ -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)));

10
source3/winbindd/winbindd_irpc.c
View File

@ -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);
@ -206,7 +206,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);
@ -266,7 +266,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 */);
@ -306,7 +306,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 */);
@ -324,7 +324,7 @@ static NTSTATUS wb_irpc_SendToSam(struct irpc_message *msg,
DEBUG(5, ("wb_irpc_SendToSam called\n"));
return wb_irpc_forward_rpc_call(msg, msg,
winbind_event_context(),
server_event_context(),
req, NDR_WINBIND_SENDTOSAM,
"winbind_SendToSam",
domain, IRPC_CALL_TIMEOUT);

2
source3/winbindd/winbindd_misc.c
View File

@ -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"));

2
source3/winbindd/winbindd_pam_auth.c
View File

@ -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);

2
source3/winbindd/winbindd_pam_auth_crap.c
View File

@ -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);

2
source3/winbindd/winbindd_pam_chauthtok.c
View File

@ -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);

2
source3/winbindd/winbindd_pam_chng_pswd_auth_crap.c
View File

@ -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);

2
source3/winbindd/winbindd_pam_logoff.c
View File

@ -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);

2
source3/winbindd/winbindd_util.c
View File

@ -321,7 +321,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"));