Attachment 5429 Details for Bug 6814 – git-am fix for 3.5.0 final.

[patch] git-am fix for 3.5.0 final.

0001-Fix-one-of-the-valgrind-warnings-from-bug-6814-Fixes.patch (text/plain), 1.19 KB, created by Jeremy Allison on 2010-02-26 16:57:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2010-02-26 16:57:49 UTC

Size: 1.19 KB

patch

obsolete

>From cfc79f222d0fae7f976bb843da3565c58b2c375e Mon Sep 17 00:00:00 2001
>From: Roel van Meer <rolek@alt001.com>
>Date: Fri, 26 Feb 2010 14:54:22 -0800
>Subject: [PATCH] Fix one of the valgrind warnings from bug #6814 - Fixes for problems reported by valgrind
>
>The timeval passed to event_add_to_select_args() must be initialized
>as event_add_to_select_args() uses a timeval_min() on this and next_event.
>---
> source3/winbindd/winbindd_dual.c |    8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
>diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
>index 74b2b99..26f9232 100644
>--- a/source3/winbindd/winbindd_dual.c
>+++ b/source3/winbindd/winbindd_dual.c
>@@ -1463,6 +1463,14 @@ static bool fork_domain_child(struct winbindd_child *child)
> 		FD_SET(state.sock, &r_fds);
> 		maxfd = state.sock;
> 
>+		/*
>+		 * Initialize this high as event_add_to_select_args()
>+ 		 * uses a timeval_min() on this and next_event. Fix
>+ 		 * from Roel van Meer <rolek@alt001.com>.
>+ 		 */
>+		t.tv_sec = 999999;
>+		t.tv_usec = 0;
>+
> 		event_add_to_select_args(winbind_event_context(), &now,
> 					 &r_fds, &w_fds, &t, &maxfd);
> 		tp = get_timed_events_timeout(winbind_event_context(), &t);
>-- 
>1.6.6.2
>

Flags:

vl: review+

Actions: View

Attachments on bug 6814: 4851 | 4852 | 4853 | 4859 | 4861 | 4888 | 4993 | 5424 | 5429 | 5430