tree-wide: always invoke setmntent() with "re" mode

Let's make sure O_CLOEXEC is set for the file descriptor.

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index c7fec609dfde4ebb1b30e6a663213f7fb0b4d3bf..b3abbb8b2f1b51c47de603edf2273d1aa87abf38 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -310,7 +310,7 @@ static char *disk_mount_point(const char *label) {
         if (asprintf(&device, "/dev/mapper/%s", label) < 0)
                 return NULL;
 
-        f = setmntent("/etc/fstab", "r");
+        f = setmntent("/etc/fstab", "re");
         if (!f)
                 return NULL;
 

diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index c3bdcaf1da0eaabefed173b500a1963821ff9996..0cb9bd9261cf4df03d38b662cc1df102afdbd477 100644 (file)
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        f = setmntent("/etc/fstab", "r");
+        f = setmntent("/etc/fstab", "re");
         if (!f) {
                 if (errno == ENOENT) {
                         r = 0;

diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index f0bfb30bb5d840bb400c992f3b55f457df82f4ab..87b520b5409e8768767a999fcaa4ae382d245650 100644 (file)
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -38,7 +38,7 @@ bool fstab_is_mount_point(const char *mount) {
         _cleanup_endmntent_ FILE *f = NULL;
         struct mntent *m;
 
-        f = setmntent("/etc/fstab", "r");
+        f = setmntent("/etc/fstab", "re");
         if (!f)
                 return false;