Fix nesting of ifdefs in netgroupcache.c

Fixes unclosed '{' if HAVE_SENDFILE is defined (BZ #15895).

diff --git a/ChangeLog b/ChangeLog
index 65c928754fdfaa353509959e7687b34a933cb778..306dda7706820653dcf9d9877e4a6338f7d035c7 100644 (file)
--- 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 9498cd038992cc7da5540986703f1e9b2cf83701..5ade03cbe294eeee4a3dfa90818597ab9a3ecd18 100644 (file)
--- 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 dd06ce4faedf8824b4ee33037545858c4bfb8074..a607dda0a57897338d1b677fd4986276966aa324 100644 (file)
--- 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));
        }