s3: Remove the separate "child" argument from setup_domain_child()

diff --git a/source/winbindd/winbindd_domain.c b/source/winbindd/winbindd_domain.c
index 2e8c6175ca09087f13e9d40089bc12df02976ec7..23b2bbdddb7e8eecf1dd1ae36f5787b18f7c079a 100644 (file)
--- 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 864f5e6a2591d19b07f1f0ca11660d05d1475916..dae1707393517384b486bdcd178663d727670be2 100644 (file)
--- 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 );