diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-02-12 10:51:05 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-02-12 11:14:26 +0100 |
| commit | 2835934244e6f3b1d54315d2e1809af4d78ee877 (patch) | |
| tree | 0688a8166dbaa26d9836ec93796380bd19f932d7 /src/systemd/src/basic/fs-util.c | |
| parent | 4c3e69f9e91fdecbbcc657e03bec7d7fc086cd1a (diff) | |
| parent | 1a716a7cd2543164db14bbe088a264ecc120a374 (diff) | |
| download | NetworkManager-2835934244e6f3b1d54315d2e1809af4d78ee877.tar.gz | |
systemd: merge branch 'systemd' into master
Diffstat (limited to 'src/systemd/src/basic/fs-util.c')
| -rw-r--r-- | src/systemd/src/basic/fs-util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/systemd/src/basic/fs-util.c b/src/systemd/src/basic/fs-util.c index d4b720b813..a3306e3dac 100644 --- a/src/systemd/src/basic/fs-util.c +++ b/src/systemd/src/basic/fs-util.c @@ -1,5 +1,3 @@ -/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ - /*** This file is part of systemd. @@ -352,7 +350,8 @@ int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gi if (parents) mkdir_parents(path, 0755); - fd = open(path, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, mode > 0 ? mode : 0644); + fd = open(path, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, + (mode == 0 || mode == MODE_INVALID) ? 0644 : mode); if (fd < 0) return -errno; |