This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch, master, updated. glibc-2.14-58-g2c0e54f


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  2c0e54ff32dedae504a34d1f551b4a1f69c3130a (commit)
       via  cf3b23ffcd95841f1d36a3c808c415b41d70b3a9 (commit)
      from  751626f948f28d39713e0690fd9aa751a74eaab0 (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=2c0e54ff32dedae504a34d1f551b4a1f69c3130a

commit 2c0e54ff32dedae504a34d1f551b4a1f69c3130a
Merge: cf3b23f 751626f
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Wed Jun 29 23:36:11 2011 -0400

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

diff --cc ChangeLog
index 16187bb,2060482..48c7586
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,15 @@@
 +2011-06-29  Ulrich Drepper  <drepper@gmail.com>
 +
 +	* nscd/grpcache.c (cache_addgr): Don't write notfound reply if we
 +	are re-adding the entry.
 +	* nscd/servicescache.c (cache_addserv): Likewise.
 +
+ 2011-06-30  Aurelien Jarno  <aurelien@aurel32.net>
+ 
+ 	* sysdeps/generic/dl-irel.h: fix protection against multiple
+ 	inclusions.
+ 	* sysdeps/generic/dl-irel.h (elf_ifunc_invoke): New.
+ 
  2011-06-28  Ulrich Drepper  <drepper@gmail.com>
  
  	[BZ #12935]

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

commit cf3b23ffcd95841f1d36a3c808c415b41d70b3a9
Author: Ulrich Drepper <drepper@gmail.com>
Date:   Wed Jun 29 23:33:38 2011 -0400

    Avoid write to invalid file descriptor in nscd
    
    When readding entries to the group and services cache and the lookup
    is unsuccesful, we tried to write the notfound record.  Just don't
    do it in this case.

diff --git a/ChangeLog b/ChangeLog
index b4d30ca..16187bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-29  Ulrich Drepper  <drepper@gmail.com>
+
+	* nscd/grpcache.c (cache_addgr): Don't write notfound reply if we
+	are re-adding the entry.
+	* nscd/servicescache.c (cache_addserv): Likewise.
+
 2011-06-28  Ulrich Drepper  <drepper@gmail.com>
 
 	[BZ #12935]
diff --git a/nscd/grpcache.c b/nscd/grpcache.c
index fa21929..0e7f81f 100644
--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
@@ -114,8 +114,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
 	     case.  */
 	  total = sizeof (notfound);
 
-	  written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
-					      MSG_NOSIGNAL));
+	  if (fd != -1)
+	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+						MSG_NOSIGNAL));
 
 	  dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len,
 				   1);
diff --git a/nscd/servicescache.c b/nscd/servicescache.c
index 2dd1cc5..b0a2977 100644
--- a/nscd/servicescache.c
+++ b/nscd/servicescache.c
@@ -104,8 +104,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
 	     case.  */
 	  total = sizeof (notfound);
 
-	  written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
-					      MSG_NOSIGNAL));
+	  if (fd != -1)
+	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+						MSG_NOSIGNAL));
 
 	  dataset = mempool_alloc (db, sizeof (struct dataset) + req->key_len,
 				   1);

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

Summary of changes:
 ChangeLog            |    6 ++++++
 nscd/grpcache.c      |    5 +++--
 nscd/servicescache.c |    5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]