diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-12-08 19:36:46 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-12-20 20:00:09 +0100 |
| commit | 9ffcff0e0a3ede3f4c227327cb1a96a436386f4f (patch) | |
| tree | a49f048dd1cd8ef4d7a93b184943aae154755be1 | |
| parent | 08cea7dfc0aee044c35f234579a9f4fa8edcace5 (diff) | |
| download | systemd-9ffcff0e0a3ede3f4c227327cb1a96a436386f4f.tar.gz | |
tree-wide: always invoke setmntent() with "re" mode
Let's make sure O_CLOEXEC is set for the file descriptor.
| -rw-r--r-- | src/cryptsetup/cryptsetup.c | 2 | ||||
| -rw-r--r-- | src/remount-fs/remount-fs.c | 2 | ||||
| -rw-r--r-- | src/shared/fstab-util.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index c7fec609df..b3abbb8b2f 100644 --- 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 c3bdcaf1da..0cb9bd9261 100644 --- 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 f0bfb30bb5..87b520b540 100644 --- 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; |