summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-05-11 20:22:06 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-05-13 10:12:26 +1000
commitcdf07042728efc2d2bfeb56d1a8cdecc516a2411 (patch)
tree29be52f2a46dec903f8b78757833bd03dc129fce /source3/winbindd
parent4ef847a3b7031147711751f96e002f120bb05f04 (diff)
downloadsamba-cdf07042728efc2d2bfeb56d1a8cdecc516a2411.tar.gz
samba-cdf07042728efc2d2bfeb56d1a8cdecc516a2411.tar.bz2
samba-cdf07042728efc2d2bfeb56d1a8cdecc516a2411.zip
s3:winbindd Rename 'children' to 'winbindd_children' and make static
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/winbindd_dual.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index c622b3ccc2..2ae32e793c 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -422,13 +422,13 @@ void setup_child(struct winbindd_domain *domain, struct winbindd_child *child,
SMB_ASSERT(child->rpccli != NULL);
}
-struct winbindd_child *children = NULL;
+static struct winbindd_child *winbindd_children = NULL;
void winbind_child_died(pid_t pid)
{
struct winbindd_child *child;
- for (child = children; child != NULL; child = child->next) {
+ for (child = winbindd_children; child != NULL; child = child->next) {
if (child->pid == pid) {
break;
}
@@ -441,7 +441,7 @@ void winbind_child_died(pid_t pid)
/* This will be re-added in fork_domain_child() */
- DLIST_REMOVE(children, child);
+ DLIST_REMOVE(winbindd_children, child);
close(child->sock);
child->sock = -1;
@@ -476,7 +476,7 @@ void winbind_msg_debug(struct messaging_context *msg_ctx,
debug_message(msg_ctx, private_data, MSG_DEBUG, server_id, data);
- for (child = children; child != NULL; child = child->next) {
+ for (child = winbindd_children; child != NULL; child = child->next) {
DEBUG(10,("winbind_msg_debug: sending message to pid %u.\n",
(unsigned int)child->pid));
@@ -521,7 +521,7 @@ void winbind_msg_offline(struct messaging_context *msg_ctx,
set_domain_offline(domain);
}
- for (child = children; child != NULL; child = child->next) {
+ for (child = winbindd_children; child != NULL; child = child->next) {
/* Don't send message to internal children. We've already
done so above. */
if (!child->domain || winbindd_internal_child(child)) {
@@ -596,7 +596,7 @@ void winbind_msg_online(struct messaging_context *msg_ctx,
}
}
- for (child = children; child != NULL; child = child->next) {
+ for (child = winbindd_children; child != NULL; child = child->next) {
/* Don't send message to internal childs. */
if (!child->domain || winbindd_internal_child(child)) {
continue;
@@ -694,7 +694,7 @@ void winbind_msg_dump_event_list(struct messaging_context *msg_ctx,
dump_event_list(winbind_event_context());
- for (child = children; child != NULL; child = child->next) {
+ for (child = winbindd_children; child != NULL; child = child->next) {
DEBUG(10,("winbind_msg_dump_event_list: sending message to pid %u\n",
(unsigned int)child->pid));
@@ -1164,7 +1164,7 @@ bool winbindd_reinit_after_fork(const char *logfilename)
ccache_remove_all_after_fork();
/* Destroy all possible events in child list. */
- for (cl = children; cl != NULL; cl = cl->next) {
+ for (cl = winbindd_children; cl != NULL; cl = cl->next) {
TALLOC_FREE(cl->lockout_policy_event);
TALLOC_FREE(cl->machine_password_change_event);
@@ -1243,7 +1243,7 @@ static bool fork_domain_child(struct winbindd_child *child)
/* Parent */
close(fdpair[0]);
child->next = child->prev = NULL;
- DLIST_ADD(children, child);
+ DLIST_ADD(winbindd_children, child);
child->sock = fdpair[1];
return True;
}