Fix nesting of ifdefs in netgroupcache.c

Fixes unclosed '{' if HAVE_SENDFILE is defined (BZ #15895).
This commit is contained in:
Allan McRae 2013-09-09 20:23:35 +10:00
parent 0c66b8e985
commit 83e43bf0b7
3 changed files with 8 additions and 3 deletions

View File

@ -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.

2
NEWS
View File

@ -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

View File

@ -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));
}