diff options
| author | Allan McRae <allan@archlinux.org> | 2013-09-09 20:23:35 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-09-09 20:25:01 +1000 |
| commit | 83e43bf0b756065dc640680d90fa6f0b39425182 (patch) | |
| tree | 670383f9ea3199990352522f30144ed9da82cb9d | |
| parent | 0c66b8e985649f89a84b26ba02740b23e1f4e091 (diff) | |
| download | glibc-83e43bf0b756065dc640680d90fa6f0b39425182.tar.gz glibc-83e43bf0b756065dc640680d90fa6f0b39425182.tar.xz glibc-83e43bf0b756065dc640680d90fa6f0b39425182.zip | |
Fix nesting of ifdefs in netgroupcache.c
Fixes unclosed '{' if HAVE_SENDFILE is defined (BZ #15895).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | nscd/netgroupcache.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 65c928754f..306dda7706 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 9498cd0389..5ade03cbe2 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 dd06ce4fae..a607dda0a5 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)); } |