The branch, v3-5-test has been updated
via a356b04... s3: Fix a winbind crash when scanning trusts
from 3e6f961... Fix bug #7384 - dptr_Close has a bitmap leak.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit a356b04933e65aed9a6c38611bcbfce3b297d092
Author: Volker Lendecke <[email protected]>
Date: Wed Apr 21 17:04:49 2010 +0200
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().
Fix bug #7389 (Fix a winbind crash when scanning trusted domains).
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd_util.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 1760382..15a3575 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -422,6 +422,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) {
@@ -491,6 +494,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) {
--
Samba Shared Repository
