[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  a0254fa... Fix one of the valgrind warnings from bug #6814 - Fixes for problems reported by valgrind
      from  4178dc4... s3: Fix bug 5198 -- parse chfn(1)-change gecos field (cherry picked from commit 2ea2d2a81e0666f478c5daf1469c8447a3096e8e) (cherry picked from commit 52a3ebc3a4ec54a427e54fa331251fd495c3c6aa)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit a0254fa053cbaa8689de4f13893c50014085f7c8
Author: Roel van Meer <rolek at alt001.com>
Date:   Fri Feb 26 15:09:33 2010 -0800

    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.

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/winbindd.c      |    9 +++++++++
 source3/winbindd/winbindd_dual.c |    8 ++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index e98b799..033eea1 100644
--- 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 at 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 b6287dd..ab4807b 100644
--- 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 at 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);


-- 
Samba Shared Repository