diff options
| author | Roel van Meer <rolek@alt001.com> | 2010-02-26 14:54:22 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2010-03-29 09:40:59 +0200 |
| commit | a83ad62de26c26fb0731f4052bb396bbc4efc606 (patch) | |
| tree | ee5d6408031c958531f0b46cb4a1c1c7802db001 | |
| parent | b32fbc0a23ab636d7bf535b1848a7ea6322bcce9 (diff) | |
| download | samba-a83ad62de26c26fb0731f4052bb396bbc4efc606.tar.gz | |
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.
(cherry picked from commit 78c6291bb310799212f7fc8bf218d4c908e8971e)
| -rw-r--r-- | 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 bccd63ffa46..beeeeb29027 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); |