diff options
author | Ulrich Drepper <drepper@gmail.com> | 2011-10-06 03:44:19 -0400 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2011-10-06 03:44:19 -0400 |
commit | 32b63198d62a59adcc11bb9b165fd18e756e4e39 (patch) | |
tree | 4461e4605957be1e7b7c3237a292aa420b3905eb | |
parent | 054c0457fd670ab29024e5e8655f507aecd68e18 (diff) | |
download | glibc-32b63198d62a59adcc11bb9b165fd18e756e4e39.tar.gz glibc-32b63198d62a59adcc11bb9b165fd18e756e4e39.tar.xz glibc-32b63198d62a59adcc11bb9b165fd18e756e4e39.zip |
Avoid warning when reload of group entry fails
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | nscd/grpcache.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 710d6db138..6ad0e1aeaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2011-10-06 Ulrich Drepper <drepper@gmail.com> + * nscd/grpcache.c (cache_addgr): Initialize written in all cases. + * nss/nsswitch.c (__nss_lookup_function): Fix order of deleting from tree and freeing node. diff --git a/nscd/grpcache.c b/nscd/grpcache.c index 8a2f80ccdb..e9607c6f11 100644 --- a/nscd/grpcache.c +++ b/nscd/grpcache.c @@ -117,6 +117,8 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req, if (fd != -1) written = TEMP_FAILURE_RETRY (send (fd, ¬found, total, MSG_NOSIGNAL)); + else + written = total; /* If we cannot permanently store the result, so be it. */ if (db->negtimeout == 0) |