Attachment 6806 Details for Bug 8406 – proposed patch (as in master)

[patch] proposed patch (as in master)

0001-s3-winbindd-fix-a-return-code-check.patch (text/plain), 1.32 KB, created by Christian Ambach on 2011-08-25 15:56:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Ambach

Created: 2011-08-25 15:56:56 UTC

Size: 1.32 KB

patch

obsolete

>From fac75f04a8577fd0eb5a3fff9914e4abffa91a1e Mon Sep 17 00:00:00 2001
>From: Christian Ambach <ambi@samba.org>
>Date: Wed, 24 Aug 2011 16:21:37 +0200
>Subject: [PATCH] s3:winbindd fix a return code check
>
>talloc_traverse_dict will return with -1 in case of an error and
>might return positive values that indicate the count of found
>entries
>
>Autobuild-User: Christian Ambach <ambi@samba.org>
>Autobuild-Date: Wed Aug 24 18:09:11 CEST 2011 on sn-devel-104
>---
> source3/winbindd/winbindd_group.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/winbindd/winbindd_group.c b/source3/winbindd/winbindd_group.c
>index 1e4ad5f..2f8ba6a 100644
>--- a/source3/winbindd/winbindd_group.c
>+++ b/source3/winbindd/winbindd_group.c
>@@ -115,7 +115,7 @@ NTSTATUS winbindd_print_groupmembers(struct talloc_dict *members,
> 	c.len = 0;
> 
> 	res = talloc_dict_traverse(members, getgr_calc_memberlen, &c);
>-	if (res != 0) {
>+	if (res == -1) {
> 		DEBUG(5, ("talloc_dict_traverse failed\n"));
> 		return NT_STATUS_INTERNAL_ERROR;
> 	}
>@@ -128,7 +128,7 @@ NTSTATUS winbindd_print_groupmembers(struct talloc_dict *members,
> 	}
> 
> 	res = talloc_dict_traverse(members, getgr_unparse_members, &m);
>-	if (res != 0) {
>+	if (res == -1) {
> 		DEBUG(5, ("talloc_dict_traverse failed\n"));
> 		TALLOC_FREE(m.buf);
> 		return NT_STATUS_INTERNAL_ERROR;
>-- 
>1.7.4.4
>

Flags:

vl: review+

Actions: View

Attachments on bug 8406: 6806