svn commit: r273240 - releng/10.1/usr.sbin/nscd

[John Baldwin]

Author: jhb
Date: Fri Oct 17 20:39:39 2014
New Revision: 273240
URL: https://svnweb.freebsd.org/changeset/base/273240

Log:
  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)

Modified:
  releng/10.1/usr.sbin/nscd/query.c
Directory Properties:
  releng/10.1/   (props changed)

Modified: releng/10.1/usr.sbin/nscd/query.c
==============================================================================
--- releng/10.1/usr.sbin/nscd/query.c	Fri Oct 17 20:03:01 2014	(r273239)
+++ releng/10.1/usr.sbin/nscd/query.c	Fri Oct 17 20:39:39 2014	(r273240)
@@ -1253,8 +1253,8 @@ init_query_state(int sockfd, size_t keve
 	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);