[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Thu Apr 8 07:13:09 MDT 2010
The branch, master has been updated
via 3d5732f... s3: Remove the separate "child" argument from setup_domain_child()
from 16deed7... s4-smbtorture: add PrinterInfo level 2 / winreg consistency test.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3d5732fc1392740c5147c39116e5853452d0dc54
Author: Volker Lendecke <vl at samba.org>
Date: Wed Apr 7 17:50:19 2010 +0200
s3: Remove the separate "child" argument from setup_domain_child()
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd_domain.c | 5 ++---
source3/winbindd/winbindd_proto.h | 3 +--
source3/winbindd/winbindd_util.c | 15 +++++----------
3 files changed, 8 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_domain.c b/source3/winbindd/winbindd_domain.c
index 2cb6e31..4689b5f 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 255e79e..d481380 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 3e03f40..84522ea 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 );
--
Samba Shared Repository
More information about the samba-cvs
mailing list