GNU C Library master sources branch, master, updated. glibc-2.14-170-gf3ed226

[drepper at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  f3ed22607e8bf724b697c16876dbb76bb2418db6 (commit)
       via  a60df2c3db52b66fd3190c92ad9bc9b972e0d1fc (commit)
      from  69f630971184cae39d578709089d175c4b743390 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f3ed22607e8bf724b697c16876dbb76bb2418db6

commit f3ed22607e8bf724b697c16876dbb76bb2418db6
Merge: a60df2c 69f6309
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Sun Aug 14 22:21:54 2011 -0400

    Merge branch 'master' of ssh://sourceware.org/git/glibc
    
    Conflicts:
    	ChangeLog

diff --cc ChangeLog
index eaa7b7e,4569518..4092e50
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,23 +1,28 @@@
 +2011-08-14  Ulrich Drepper  <drepper@gmail.com>
 +
 +	* nscd/servicescache.c (cache_addserv): Make sure written is always
 +	initialized.
 +
+ 2011-08-14  Roland McGrath  <roland@hack.frob.com>
+ 
+ 	* string/strncat.c (STRNCAT): Use prototype definition.
+ 
+ 	* locale/Makefile (locale-CPPFLAGS): Renamed CPPFLAGS-locale-programs.
+ 	(locale-CPPFLAGS): New variable; put LOCALEDIR, LOCALE_ALIAS_PATH and
+ 	-Iprograms here.
+ 	(cppflags-iterator.mk sequence): Use locale-programs in place of nonlib.
+ 	(localedef-modules): Add localedef.
+ 	(locale-modules): Add locale.
+ 
+ 	* sysdeps/generic/ldsodefs.h (struct unique_sym): Add a const.
+ 	* elf/rtld.c (dl_main): Invert order of assignment in last change,
+ 	to avoid a warning.
+ 
+ 2011-08-14  David S. Miller  <davem@davemloft.net>
+ 
+ 	* sysdeps/unix/sysv/linux/sparc/bits/resource.h (RLIM_INFINITY,
+ 	RLIM64_INFINITY): Fix 64-bit values for 32-bit sparc.
+ 
  2011-08-13  Ulrich Drepper  <drepper@gmail.com>
  
  	* elf/dl-open.c: Rename show_scope to _dl_schow_scope and export.

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a60df2c3db52b66fd3190c92ad9bc9b972e0d1fc

commit a60df2c3db52b66fd3190c92ad9bc9b972e0d1fc
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Sun Aug 14 22:20:09 2011 -0400

    Add missing initialization in service cache in nscd

diff --git a/ChangeLog b/ChangeLog
index 6d543f6..eaa7b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-14  Ulrich Drepper  <drepper@gmail.com>
+
+	* nscd/servicescache.c (cache_addserv): Make sure written is always
+	initialized.
+
 2011-08-13  Ulrich Drepper  <drepper@gmail.com>
 
 	* elf/dl-open.c: Rename show_scope to _dl_schow_scope and export.
diff --git a/nscd/servicescache.c b/nscd/servicescache.c
index ec5a367..d3d5dce 100644
--- a/nscd/servicescache.c
+++ b/nscd/servicescache.c
@@ -102,7 +102,7 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
 	{
 	  /* We have no data.  This means we send the standard reply for this
 	     case.  */
-	  total = sizeof (notfound);
+	  written = total = sizeof (notfound);
 
 	  if (fd != -1)
 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog            |    5 +++++
 nscd/servicescache.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources