This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.18-93-g83e43bf
- From: allan at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 9 Sep 2013 10:25:25 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-93-g83e43bf
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 83e43bf0b756065dc640680d90fa6f0b39425182 (commit)
from 0c66b8e985649f89a84b26ba02740b23e1f4e091 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=83e43bf0b756065dc640680d90fa6f0b39425182
commit 83e43bf0b756065dc640680d90fa6f0b39425182
Author: Allan McRae <allan@archlinux.org>
Date: Mon Sep 9 20:23:35 2013 +1000
Fix nesting of ifdefs in netgroupcache.c
Fixes unclosed '{' if HAVE_SENDFILE is defined (BZ #15895).
diff --git a/ChangeLog b/ChangeLog
index 65c9287..306dda7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-09 Allan McRae <allan@archlinux.org>
+
+ [BZ #15895]
+ * nscd/netgroupcache.c: Fix nesting of ifdefs.
+
2013-09-09 Will Newton <will.newton@linaro.org>
* malloc/Makefile: Add tst-realloc to tests.
diff --git a/NEWS b/NEWS
index 9498cd0..5ade03c 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.19
* The following bugs are resolved with this release:
14155, 14699, 15427, 15522, 15531, 15532, 15736, 15749, 15797, 15844,
- 15867, 15886, 15887, 15890, 15897, 15905, 15909, 15921.
+ 15867, 15886, 15887, 15890, 15895, 15897, 15905, 15909, 15921.
* CVE-2013-4237 The readdir_r function could write more than NAME_MAX bytes
to the d_name member of struct dirent, or omit the terminating NUL
diff --git a/nscd/netgroupcache.c b/nscd/netgroupcache.c
index dd06ce4..a607dda 100644
--- a/nscd/netgroupcache.c
+++ b/nscd/netgroupcache.c
@@ -591,10 +591,10 @@ addinnetgrX (struct database_dyn *db, int fd, request_header *req,
# endif
}
else
+#endif
{
-# ifndef __ASSUME_SENDFILE
+#if defined HAVE_SENDFILE && !defined __ASSUME_SENDFILE
use_write:
-# endif
#endif
writeall (fd, &dataset->resp, sizeof (innetgroup_response_header));
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
NEWS | 2 +-
nscd/netgroupcache.c | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources