From 9d01f99f52447923c923535b29af5e747c583570 Mon Sep 17 00:00:00 2001 From: jhb Date: Fri, 17 Oct 2014 20:39:39 +0000 Subject: [PATCH] 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) git-svn-id: svn://svn.freebsd.org/base/releng/10.1@273240 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.sbin/nscd/query.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/nscd/query.c b/usr.sbin/nscd/query.c index c233e195d..270992ebd 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); -- 2.42.0