[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  039297d s3:winbindd - fix bad bugfix for bug #10280 - winbind panic if AD server is down.
      from  34e7133 s3/s4: smbd, rpc, ldap, cldap, kdc services.

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


- Log -----------------------------------------------------------------
commit 039297dad9724cf5924d83a43cd8b4661cdf8a8b
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jul 1 20:27:11 2014 -0700

    s3:winbindd - fix bad bugfix for bug #10280 - winbind panic if AD server is down.
    
    Previous bug fix reversed the sense of the test for out of memory.
    
    https://bugzilla.samba.org/show_bug.cgi?id=10280
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-0-test): Mon Jul  7 12:37:48 CEST 2014 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 860526b..050ec6c 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2121,14 +2121,14 @@ static NTSTATUS rids_to_names(struct winbindd_domain *domain,
 			have_mapped = have_unmapped = false;
 
 			*names = talloc_array(mem_ctx, char *, num_rids);
-			if (*names != NULL) {
+			if (*names == NULL) {
 				result = NT_STATUS_NO_MEMORY;
 				goto error;
 			}
 
 			*types = talloc_array(mem_ctx, enum lsa_SidType,
 					      num_rids);
-			if (*types != NULL) {
+			if (*types == NULL) {
 				result = NT_STATUS_NO_MEMORY;
 				goto error;
 			}


-- 
Samba Shared Repository