[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  3b9cdab... s3: Fix a winbind segfault in "trusted_domains"
      from  dbbe7c5... Fix bug #7034 - vfs_cap causes signal 11 (SIGSEGV) (cherry picked from commit ca847952054f5bbde1d40ad4260589b6fcc9721d)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test


- Log -----------------------------------------------------------------
commit 3b9cdab89672576ddfe6f7c2be54169fb4dd7634
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Jan 13 12:20:26 2010 +0100

    s3: Fix a winbind segfault in "trusted_domains"
    
    We have to initialize domain->backend by calling "get_cache" before doing a
    query
    
    Thanks to Christian Ambach to find this :-)
    (cherry picked from commit 026b23062eeee23dffeb627800b3cb6f55d89ad6)
    
    Fix bug #7037.

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/winbindd_cache.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 68972dd..81970d4 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2715,15 +2715,16 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain,
 	old_status = domain->online;
 	trusts->count = 0;
 	trusts->array = NULL;
-	if (domain->online) {
-		goto do_query;
-	}
 
 	cache = get_cache(domain);
 	if (!cache || !cache->tdb) {
 		goto do_query;
 	}
 
+	if (domain->online) {
+		goto do_query;
+	}
+
 	retval = wcache_tdc_fetch_list(&dom_list, &num_domains);
 	if (!retval || !num_domains || !dom_list) {
 		TALLOC_FREE(dom_list);


-- 
Samba Shared Repository