Attachment 10065 Details for Bug 10280 – git-am fix for master, 4.1.next and 4.0.next.

[patch] git-am fix for master, 4.1.next and 4.0.next.

0001-s3-winbindd-fix-bad-bugfix-for-bug-10280-winbind-pan.patch (text/plain), 1.17 KB, created by Jeremy Allison on 2014-07-02 03:35:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2014-07-02 03:35:35 UTC

Size: 1.17 KB

patch

obsolete

>From defe4425c89eb4fccc4f6657bd8847e5dff659c3 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Tue, 1 Jul 2014 20:27:11 -0700
>Subject: [PATCH] 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@samba.org>
>---
> source3/winbindd/winbindd_cache.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
>index 51f3e04..dfad8f5 100644
>--- a/source3/winbindd/winbindd_cache.c
>+++ b/source3/winbindd/winbindd_cache.c
>@@ -2129,14 +2129,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;
> 			}
>-- 
>1.9.1
>

Flags:

ambi: review+
jra: review? (metze)
obnox: review+

Actions: View

Attachments on bug 10280: 9441 | 9447 | 9553 | 10065