From: Ulrich Drepper Date: Thu, 6 Oct 2011 07:44:19 +0000 (-0400) Subject: Avoid warning when reload of group entry fails X-Git-Tag: glibc-2.15~271 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32b63198d62a59adcc11bb9b165fd18e756e4e39;p=platform%2Fupstream%2Fglibc.git Avoid warning when reload of group entry fails --- diff --git a/ChangeLog b/ChangeLog index 710d6db..6ad0e1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2011-10-06 Ulrich Drepper + * 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 8a2f80c..e9607c6 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)