diff options
| author | Volker Lendecke <vl@samba.org> | 2010-04-21 17:04:49 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-05-17 09:50:15 +0200 |
| commit | 8e9e6ed2b2ea06106b99541b404d046a22fa75ee (patch) | |
| tree | 23259572a27986c01e12dbbea083483a629e75bb | |
| parent | f3868dea15cf8c28ac24b774ff07dbe19f326145 (diff) | |
| download | samba-8e9e6ed2b2ea06106b99541b404d046a22fa75ee.tar.gz | |
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).
(cherry picked from commit a356b04933e65aed9a6c38611bcbfce3b297d092)
| -rw-r--r-- | source3/winbindd/winbindd_util.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index 17603820d4f..15a357519a2 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) { |