From 0ded0174f1213c37b7425b59318f106b511df063 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 7 Apr 2010 17:43:37 +0200 Subject: [PATCH] s3: Remove the separate "child" argument from setup_domain_child() --- source/winbindd/winbindd_domain.c | 7 +++---- source/winbindd/winbindd_util.c | 15 +++++---------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/source/winbindd/winbindd_domain.c b/source/winbindd/winbindd_domain.c index 2e8c6175ca..23b2bbdddb 100644 --- a/source/winbindd/winbindd_domain.c +++ b/source/winbindd/winbindd_domain.c @@ -27,13 +27,12 @@ static const struct winbindd_child_dispatch_table domain_dispatch_table[]; -void setup_domain_child(struct winbindd_domain *domain, - struct winbindd_child *child) +void setup_domain_child(struct winbindd_domain *domain) { - setup_child(child, domain_dispatch_table, + setup_child(&domain->child, domain_dispatch_table, "log.wb", domain->name); - child->domain = domain; + domain->child.domain = domain; } static const struct winbindd_child_dispatch_table domain_dispatch_table[] = { diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c index 864f5e6a25..dae1707393 100644 --- a/source/winbindd/winbindd_util.c +++ b/source/winbindd/winbindd_util.c @@ -364,8 +364,7 @@ static void trustdom_recv(void *private_data, bool success) &cache_methods, &sid); if (domain) { - setup_domain_child(domain, - &domain->child); + setup_domain_child(domain); } } p=q; @@ -749,8 +748,7 @@ bool init_domain_list(void) domain = add_trusted_domain("BUILTIN", NULL, &builtin_passdb_methods, &global_sid_Builtin); if (domain) { - setup_domain_child(domain, - &domain->child); + setup_domain_child(domain); } /* Local SAM */ @@ -761,8 +759,7 @@ bool init_domain_list(void) if ( role != ROLE_DOMAIN_MEMBER ) { domain->primary = True; } - setup_domain_child(domain, - &domain->child); + setup_domain_child(domain); } /* Add ourselves as the first entry. */ @@ -779,8 +776,7 @@ bool init_domain_list(void) &cache_methods, &our_sid); if (domain) { domain->primary = True; - setup_domain_child(domain, - &domain->child); + setup_domain_child(domain); /* Even in the parent winbindd we'll need to talk to the DC, so try and see if we can @@ -831,8 +827,7 @@ void check_domain_trusted( const char *name, const DOM_SID *user_sid ) domain->internal = False; domain->online = True; - setup_domain_child(domain, - &domain->child); + setup_domain_child(domain); wcache_tdc_add_domain( domain ); -- 2.34.1