summaryrefslogtreecommitdiff
path: root/src/timesync
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-03-22 13:03:41 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-03-23 10:26:38 +0100
commit37c1d5e97dbc869edd8fc178427714e2d9428d2b (patch)
tree8aa80dc807df5b4452fc25094fcf5ac7a8b6e0bc /src/timesync
parentd50b5839b0d6f1e66860a6d8e125fd3fe96b76c8 (diff)
downloadsystemd-37c1d5e97dbc869edd8fc178427714e2d9428d2b.tar.gz
tree-wide: warn when a directory path already exists but has bad mode/owner/type
When we are attempting to create directory somewhere in the bowels of /var/lib and get an error that it already exists, it can be quite hard to diagnose what is wrong (especially for a user who is not aware that the directory must have the specified owner, and permissions not looser than what was requested). Let's print a warning in most cases. A warning is appropriate, because such state is usually a sign of borked installation and needs to be resolved by the adminstrator. $ build/test-fs-util Path "/tmp/test-readlink_and_make_absolute" already exists and is not a directory, refusing. (or) Directory "/tmp/test-readlink_and_make_absolute" already exists, but has mode 0775 that is too permissive (0755 was requested), refusing. (or) Directory "/tmp/test-readlink_and_make_absolute" already exists, but is owned by 1001:1000 (1000:1000 was requested), refusing. Assertion 'mkdir_safe(tempdir, 0755, getuid(), getgid(), MKDIR_WARN_MODE) >= 0' failed at ../src/test/test-fs-util.c:320, function test_readlink_and_make_absolute(). Aborting. No functional change except for the new log lines.
Diffstat (limited to 'src/timesync')
-rw-r--r--src/timesync/timesyncd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 9ab0912463..7ec23904db 100644
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -71,7 +71,8 @@ static int load_clock_timestamp(uid_t uid, gid_t gid) {
}
} else {
- r = mkdir_safe_label("/var/lib/systemd/timesync", 0755, uid, gid, MKDIR_FOLLOW_SYMLINK);
+ r = mkdir_safe_label("/var/lib/systemd/timesync", 0755, uid, gid,
+ MKDIR_FOLLOW_SYMLINK | MKDIR_WARN_MODE);
if (r < 0)
return log_error_errno(r, "Failed to create state directory: %m");