summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-04-21 17:04:49 +0200
committerVolker Lendecke <vl@samba.org>2010-04-23 10:35:52 +0200
commitc82fd3ed30ef2c804b6370d9d2ff1e1a6d2797f5 (patch)
tree98590990bc27c3afb5d0c34fec219c50a23cfeaa
parent8f67f873ace91964da066c421986e260aceba75b (diff)
downloadsamba-c82fd3ed30ef2c804b6370d9d2ff1e1a6d2797f5.tar.gz
samba-c82fd3ed30ef2c804b6370d9d2ff1e1a6d2797f5.tar.bz2
samba-c82fd3ed30ef2c804b6370d9d2ff1e1a6d2797f5.zip
s3: Fix a winbind crash when scanning trusts
add_trusted_domain() for a new domain always needs to be followed by a setup_domain_child(). This was not always done, in particular not when walking to the forest root for additional trusts. This is a minimal patch, we need to fix add_trusted_domain().
-rw-r--r--source3/winbindd/winbindd_util.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 84522ea0a7..a13df1f157 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -428,6 +428,9 @@ static void rescan_forest_root_trusts( void )
dom_list[i].dns_name,
&cache_methods,
&dom_list[i].sid );
+ if (d != NULL) {
+ setup_domain_child(d, &d->child);
+ }
}
if (d == NULL) {
@@ -497,6 +500,9 @@ static void rescan_forest_trusts( void )
dom_list[i].dns_name,
&cache_methods,
&dom_list[i].sid );
+ if (d != NULL) {
+ setup_domain_child(d, &d->child);
+ }
}
if (d == NULL) {