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

diff --git a/source3/winbindd/winbindd_domain.c b/source3/winbindd/winbindd_domain.c
index 2cb6e31a9ef7238e28dec2a42f93a3dfc07b7cc5..4689b5f5dbe18983eb62dbe89fcb4d8675c9c90f 100644 (file)
--- a/source3/winbindd/winbindd_domain.c
+++ b/source3/winbindd/winbindd_domain.c
@@ -79,9 +79,8 @@ 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(domain, child, domain_dispatch_table,
+       setup_child(domain, &domain->child, domain_dispatch_table,
                    "log.wb", domain->name);
 }

diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 255e79e1d0e51e8c46951c902ec26196a16599ab..d481380bb50e4ef23852fb6b687cfc22b0651606 100644 (file)
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -253,8 +253,7 @@ NTSTATUS winbindd_update_creds_by_name(struct winbindd_domain *domain,
 
 /* The following definitions come from winbindd/winbindd_domain.c  */
 
-void setup_domain_child(struct winbindd_domain *domain,
-                       struct winbindd_child *child);
+void setup_domain_child(struct winbindd_domain *domain);
 
 /* The following definitions come from winbindd/winbindd_dual.c  */
 

diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 3e03f4091c5aae1405a2284be76965a7ded94ce0..84522ea0a7e31570f7d9afa641f4036cce487759 100644 (file)
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -352,8 +352,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;
@@ -609,8 +608,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 */
@@ -621,8 +619,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. */
@@ -639,8 +636,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
@@ -691,8 +687,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 );