Fix one of the valgrind warnings from bug #6814 - Fixes for problems reported by...

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.

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index e98b7994adb20d493640046cf840b9443eb8540e..033eea18c5fb25f0fed66910f444323334155e42 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1054,6 +1054,15 @@ static void process_loop(void)
                struct timeval now;
                GetTimeOfDay(&now);
 
+                /*
+                * 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>.
+                */
+
+               ev_timeout.tv_sec = 999999;
+               ev_timeout.tv_usec = 0;
+
                event_add_to_select_args(winbind_event_context(), &now,
                                         &r_fds, &w_fds, &ev_timeout, &maxfd);
        }

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index b6287dd3ae8a4ceec7e4862a9a5655f2a4d2f6bf..ab4807bf17260d89d3571d7c028725079b69eb78 100644 (file)
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1406,6 +1406,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);