diff options
author | jhb <jhb@FreeBSD.org> | 2014-10-17 19:55:12 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2014-10-17 19:55:12 +0000 |
commit | 8376a78d70972a1c14ddab3be67dd39cf3ee4b84 (patch) | |
tree | e5601f30f3457f1c2164df37f0d14dc31d6d50ec | |
parent | c8f54eb474699081e69355db7298671e111321cc (diff) | |
download | FreeBSD-src-8376a78d70972a1c14ddab3be67dd39cf3ee4b84.zip FreeBSD-src-8376a78d70972a1c14ddab3be67dd39cf3ee4b84.tar.gz |
MFC 272668:
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
-rw-r--r-- | usr.sbin/nscd/query.c | 4 |
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); |