Date: Mon, 29 Sep 2014 23:40:52 -0400 From: David Shane Holden <dpejesh@yahoo.com> To: freebsd-current@freebsd.org Subject: [PATCH] nscd Message-ID: <m0d8o4$qa3$1@ger.gmane.org>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------010309000609020107080506
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
So, I've noticed nscd hasn't worked right for awhile now. Since I
upgraded to 10.0 it never seemed to cache properly but I never bothered
to really dig into it until recently and here's what I've found. In my
environment I have nsswitch set to use caching and LDAP as such:
group: files cache ldap
passwd: files cache ldap
The LDAP part works fine, but caching didn't on 10.0 for some reason.
On my 9.2 machines it works as expected though. What I've found is in
usr.sbin/nscd/query.c
struct query_state *
init_query_state(int sockfd, size_t kevent_watermark, uid_t euid, gid_t
egid)
{
...
memcpy(&retval->timeout, &s_configuration->query_timeout,
sizeof(struct timeval));
...
}
s_configuration->query_timeout is an 'int' which is being memcpy'd into
a 'struct timeval' causing it to grab other parts of the s_configuration
struct along with the query_timeout value and polluting retval->timeout.
In this case it appears to be grabbing s_configuration->threads_num and
shoving that into timeout.tv_sec along with the query_timeout. This ends
up confusing nscd later on (instead of being 8 it ends up being set to
34359738376) and breaks it's ability to cache. I've attached a patch to
set the retval->timeout properly and gets nscd working again. I'm
guessing gcc was handling this differently from clang which is why it
wasn't a problem before 10.0.
--------------010309000609020107080506
Content-Type: text/x-patch;
name="nscd.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="nscd.patch"
diff --git a/usr.sbin/nscd/query.c b/usr.sbin/nscd/query.c
index c233e19..abd8fab 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_usec = 0;
+ retval->timeout.tv_sec = s_configuration->query_timeout;
TRACE_OUT(init_query_state);
return (retval);
--------------010309000609020107080506--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?m0d8o4$qa3$1>