From b7d50610ceb88b0441d7bb6d223ec1080a1d8e5e Mon Sep 17 00:00:00 2001 From: jhb Date: Mon, 6 Oct 2014 18:16:45 +0000 Subject: 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 Submitted by: David Shane Holden MFC after: 1 week --- usr.sbin/nscd/query.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.sbin/nscd') 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); -- cgit v1.1