summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-04-07 17:50:19 +0200
committerVolker Lendecke <vl@samba.org>2010-04-08 15:12:42 +0200
commit3d5732fc1392740c5147c39116e5853452d0dc54 (patch)
tree20624b911eb17954b4ee2b4fb4af96c00f3f251a /source3
parent16deed7199b837f2d8982045edbdae4e3af13afa (diff)
downloadsamba-3d5732fc1392740c5147c39116e5853452d0dc54.tar.gz
samba-3d5732fc1392740c5147c39116e5853452d0dc54.tar.bz2
samba-3d5732fc1392740c5147c39116e5853452d0dc54.zip
s3: Remove the separate "child" argument from setup_domain_child()
Diffstat (limited to 'source3')
-rw-r--r--source3/winbindd/winbindd_domain.c5
-rw-r--r--source3/winbindd/winbindd_proto.h3
-rw-r--r--source3/winbindd/winbindd_util.c15
3 files changed, 8 insertions, 15 deletions
diff --git a/source3/winbindd/winbindd_domain.c b/source3/winbindd/winbindd_domain.c
index 2cb6e31a9e..4689b5f5db 100644
--- 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 255e79e1d0..d481380bb5 100644
--- 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 3e03f4091c..84522ea0a7 100644
--- 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 );