Report write error in addmnt even for cached streams.

diff --git a/ChangeLog b/ChangeLog
index bb37b83e45aab6af618a7c007f88f9e6134d5c27..2697af9ed92eff7db9da78da85984c761bf907cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-11  Ulrich Drepper  <drepper@gmail.com>
 
+       [BZ #12625]
+       * misc/mntent_r.c (addmntent): Flush the stream after the output
+
        [BZ #12393]
        * elf/dl-load.c (is_trusted_path): Remove unnecessary test.
        (is_trusted_path_normalize): Skip initial colon.  Append slash

diff --git a/NEWS b/NEWS
index c43a2b2fb65bbeb1d4e4744a90b5bab65936c1b3..9e9d6e870ee14483840d990776744f1b61ea20c8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,8 +12,8 @@ Version 2.14
   386, 11257, 11258, 11487, 11532, 11578, 11653, 11668, 11724, 11945, 11947,
   12158, 12178, 12200, 12346, 12393, 12420, 12445, 12449, 12454, 12460,
   12469, 12489, 12509, 12510, 12518, 12541, 12545, 12551, 12583, 12587,
-  12597, 12611, 12631, 12650, 12653, 12655, 12660, 12681, 12685, 12711,
-  12713, 12714, 12717, 12723, 12734, 12738
+  12597, 12611, 12625, 12631, 12650, 12653, 12655, 12660, 12681, 12685,
+  12711, 12713, 12714, 12717, 12723, 12734, 12738
 
 * The RPC implementation in libc is obsoleted.  Old programs keep working
   but new programs cannot be linked with the routines in libc anymore.

diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 9598528324463a6bebf51df4628845c5fdee9b6f..6959f0e21d53f62cc048f66997ee7c62704fd8da 100644 (file)
--- a/misc/mntent_r.c
+++ b/misc/mntent_r.c
@@ -1,5 +1,5 @@
 /* Utilities for reading/writing fstab, mtab, etc.
-   Copyright (C) 1995-2000, 2001, 2002, 2003, 2006, 2010
+   Copyright (C) 1995-2000, 2001, 2002, 2003, 2006, 2010, 2011
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -263,8 +263,8 @@ __addmntent (FILE *stream, const struct mntent *mnt)
                   mntcopy.mnt_type,
                   mntcopy.mnt_opts,
                   mntcopy.mnt_freq,
-                  mntcopy.mnt_passno)
-         < 0 ? 1 : 0);
+                  mntcopy.mnt_passno) < 0
+         || fflush (stream) != 0);
 }
 weak_alias (__addmntent, addmntent)