diff options
| author | Jeremy Allison <jra@samba.org> | 2010-12-22 14:52:50 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-12-23 01:08:11 +0100 |
| commit | 30d29e64cb5e0f1360ff47dd6d074d25fa86e5fd (patch) | |
| tree | 3c3d56a56b041ea869c4e750b59641e9f3495059 /source3/winbindd | |
| parent | 03b8b8e19952c40eb3eb22e16e7fbae4073b7b4b (diff) | |
| download | samba-30d29e64cb5e0f1360ff47dd6d074d25fa86e5fd.tar.gz samba-30d29e64cb5e0f1360ff47dd6d074d25fa86e5fd.tar.bz2 samba-30d29e64cb5e0f1360ff47dd6d074d25fa86e5fd.zip | |
All calls to event_add_to_select_args() call GetTimeOfDay() and
pass this in as the &now parameter. Push this call inside of
event_add_to_select_args() to the correct point so it doesn't
get called unless needed.
Jeremy.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Dec 23 01:08:11 CET 2010 on sn-devel-104
Diffstat (limited to 'source3/winbindd')
| -rw-r--r-- | source3/winbindd/winbindd_dual.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c index 0d28d9cdd8..344b7e4bd1 100644 --- a/source3/winbindd/winbindd_dual.c +++ b/source3/winbindd/winbindd_dual.c @@ -1384,7 +1384,6 @@ static bool fork_domain_child(struct winbindd_child *child) int maxfd; struct timeval t; struct timeval *tp; - struct timeval now; TALLOC_CTX *frame = talloc_stackframe(); struct iovec iov[2]; int iov_count; @@ -1395,8 +1394,6 @@ static bool fork_domain_child(struct winbindd_child *child) continue; } - GetTimeOfDay(&now); - if (child->domain && child->domain->startup && (time_mono(NULL) > child->domain->startup_time + 30)) { /* No longer in "startup" mode. */ @@ -1418,7 +1415,7 @@ static bool fork_domain_child(struct winbindd_child *child) t.tv_sec = 999999; t.tv_usec = 0; - event_add_to_select_args(winbind_event_context(), &now, + event_add_to_select_args(winbind_event_context(), &r_fds, &w_fds, &t, &maxfd); tp = get_timed_events_timeout(winbind_event_context(), &t); if (tp) { |