summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2018-02-26 13:48:24 +0100
committerAndreas Schneider <asn@cryptomilk.org>2018-03-01 09:53:46 +0100
commit33f5f5c4610f1a249c2dc88848e4262e2f343c94 (patch)
tree6384cb349f1169eb0888f376efcbd0bf1bb509e4 /source3
parent09677053f7f0e3a6c007a59b9ac08fc159f79c9d (diff)
downloadsamba-33f5f5c4610f1a249c2dc88848e4262e2f343c94.tar.gz
winbind: Remove the "winbindd_children" global
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13309 Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/winbindd/winbindd.h2
-rw-r--r--source3/winbindd/winbindd_dual.c8
-rw-r--r--source3/winbindd/winbindd_ndr.c2
3 files changed, 0 insertions, 12 deletions
diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h
index 081722f6a90..6aa57f2e704 100644
--- a/source3/winbindd/winbindd.h
+++ b/source3/winbindd/winbindd.h
@@ -115,8 +115,6 @@ struct winbindd_child_dispatch_table {
};
struct winbindd_child {
- struct winbindd_child *next, *prev;
-
pid_t pid;
struct winbindd_domain *domain;
char *logfilename;
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 2b02fdfd7fe..30d3604bc94 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -46,8 +46,6 @@
extern bool override_logfile;
-static struct winbindd_child *winbindd_children = NULL;
-
static void forall_domain_children(bool (*fn)(struct winbindd_child *c,
void *private_data),
void *private_data)
@@ -363,7 +361,6 @@ static void wb_child_request_cleanup(struct tevent_req *req,
*/
close(state->child->sock);
state->child->sock = -1;
- DLIST_REMOVE(winbindd_children, state->child);
}
static struct winbindd_child *choose_domain_child(struct winbindd_domain *domain)
@@ -800,9 +797,6 @@ void winbind_child_died(pid_t pid)
return;
}
- /* This will be re-added in fork_domain_child() */
-
- DLIST_REMOVE(winbindd_children, state.child);
state.child->pid = 0;
if (state.child->sock != -1) {
@@ -1636,8 +1630,6 @@ static bool fork_domain_child(struct winbindd_child *child)
return false;
}
- child->next = child->prev = NULL;
- DLIST_ADD(winbindd_children, child);
child->sock = fdpair[1];
return True;
}
diff --git a/source3/winbindd/winbindd_ndr.c b/source3/winbindd/winbindd_ndr.c
index 383de4e8116..74a03d0bc33 100644
--- a/source3/winbindd/winbindd_ndr.c
+++ b/source3/winbindd/winbindd_ndr.c
@@ -36,8 +36,6 @@ void ndr_print_winbindd_child(struct ndr_print *ndr,
{
ndr_print_struct(ndr, name, "winbindd_child");
ndr->depth++;
- ndr_print_ptr(ndr, "next", r->next);
- ndr_print_ptr(ndr, "prev", r->prev);
ndr_print_uint32(ndr, "pid", (uint32_t)r->pid);
#if 0
ndr_print_winbindd_domain(ndr, "domain", r->domain);