summaryrefslogtreecommitdiff
path: root/source3/nsswitch
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-24 14:47:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:47 -0500
commitf260b45d646ae69602f63c1f6a002384b4828a1c (patch)
tree29153c9ce8d72fe6c3945abfc096bfa553ab0540 /source3/nsswitch
parent509d90f1cc21ab528433d633b8d074e5e7c30949 (diff)
downloadsamba-f260b45d646ae69602f63c1f6a002384b4828a1c.tar.gz
samba-f260b45d646ae69602f63c1f6a002384b4828a1c.tar.bz2
samba-f260b45d646ae69602f63c1f6a002384b4828a1c.zip
r23117: Factor out local messaging.
This removes message_block / message_unblock. I've talked to Jeremy and Günther, giving them my reasons why I believe they have no effect. Neither could come up with a counter-argument, so they go :-) (This used to be commit a925e0991ffbaea4a533bab3a5d61e5d367d46c8)
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/winbindd_cm.c4
-rw-r--r--source3/nsswitch/winbindd_dual.c10
2 files changed, 0 insertions, 14 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c
index 1e9292b690..ba91239a73 100644
--- a/source3/nsswitch/winbindd_cm.c
+++ b/source3/nsswitch/winbindd_cm.c
@@ -178,13 +178,10 @@ static BOOL fork_child_dc_connect(struct winbindd_domain *domain)
/* Stop zombies */
CatchChild();
- message_block();
-
child_pid = sys_fork();
if (child_pid == -1) {
DEBUG(0, ("fork_child_dc_connect: Could not fork: %s\n", strerror(errno)));
- message_unblock();
return False;
}
@@ -196,7 +193,6 @@ static BOOL fork_child_dc_connect(struct winbindd_domain *domain)
messaging_register(winbind_messaging_context(), NULL,
MSG_WINBIND_FAILED_TO_GO_ONLINE,
msg_failed_to_go_online);
- message_unblock();
return True;
}
diff --git a/source3/nsswitch/winbindd_dual.c b/source3/nsswitch/winbindd_dual.c
index 2e8ad154db..c65499f606 100644
--- a/source3/nsswitch/winbindd_dual.c
+++ b/source3/nsswitch/winbindd_dual.c
@@ -839,15 +839,10 @@ static BOOL fork_domain_child(struct winbindd_child *child)
/* Stop zombies */
CatchChild();
- /* Ensure we don't process messages whilst we're
- changing the disposition for the child. */
- message_block();
-
child->pid = sys_fork();
if (child->pid == -1) {
DEBUG(0, ("Could not fork: %s\n", strerror(errno)));
- message_unblock();
return False;
}
@@ -860,8 +855,6 @@ static BOOL fork_domain_child(struct winbindd_child *child)
child->event.flags = 0;
child->requests = NULL;
add_fd_event(&child->event);
- /* We're ok with online/offline messages now. */
- message_unblock();
return True;
}
@@ -895,9 +888,6 @@ static BOOL fork_domain_child(struct winbindd_child *child)
messaging_deregister(winbind_messaging_context(),
MSG_WINBIND_ONLINESTATUS, NULL);
- /* The child is ok with online/offline messages now. */
- message_unblock();
-
/* Handle online/offline messages. */
messaging_register(winbind_messaging_context(), NULL,
MSG_WINBIND_OFFLINE, child_msg_offline);