summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2014-10-17 20:39:39 +0000
committerjhb <jhb@FreeBSD.org>2014-10-17 20:39:39 +0000
commit27259cd4cfa63c01a8a81651ca47809f23ea263a (patch)
tree9fdac77f54e172a4ee3367de070fcd82c2e9f781
parent022370031771e4f4b8e0255ab2ea29ae591b62b0 (diff)
downloadFreeBSD-src-27259cd4cfa63c01a8a81651ca47809f23ea263a.zip
FreeBSD-src-27259cd4cfa63c01a8a81651ca47809f23ea263a.tar.gz
MFS10 273238;
Properly set the timeout in a query_state. The global query_timeout configuration value is an integer count of seconds, it is not a timeval. Using memcpy() to copy a timeval from it put garbage into the tv_usec field. PR: 194025 Approved by: re (gjb)
-rw-r--r--usr.sbin/nscd/query.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/nscd/query.c b/usr.sbin/nscd/query.c
index c233e19..270992e 100644
--- a/usr.sbin/nscd/query.c
+++ b/usr.sbin/nscd/query.c
@@ -1253,8 +1253,8 @@ init_query_state(int sockfd, size_t kevent_watermark, uid_t euid, gid_t egid)
retval->read_func = query_socket_read;
get_time_func(&retval->creation_time);
- memcpy(&retval->timeout, &s_configuration->query_timeout,
- sizeof(struct timeval));
+ retval->timeout.tv_sec = s_configuration->query_timeout;
+ retval->timeout.tv_usec = 0;
TRACE_OUT(init_query_state);
return (retval);
OpenPOWER on IntegriCloud