summaryrefslogtreecommitdiffstats
path: root/src/tmpfiles
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-06-13 19:14:37 +0200
committerLennart Poettering <lennart@poettering.net>2015-06-17 15:46:32 +0200
commit1542c01b1dd5e34bfc2355aba603131e458ee0da (patch)
tree915c88fc7aaf5306b7feba53768562149cbbc973 /src/tmpfiles
parentMerge pull request #253 from dvdhrm/libudev-man (diff)
downloadsystemd-1542c01b1dd5e34bfc2355aba603131e458ee0da.tar.xz
systemd-1542c01b1dd5e34bfc2355aba603131e458ee0da.zip
tmpfiles: only root-owned aquota.* files are special
Fixes #188.
Diffstat (limited to 'src/tmpfiles')
-rw-r--r--src/tmpfiles/tmpfiles.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 027a5c2ca8..42f757c4b7 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -496,9 +496,10 @@ static int dir_cleanup(
}
if (mountpoint && S_ISREG(s.st_mode))
- if ((streq(dent->d_name, ".journal") && s.st_uid == 0) ||
- streq(dent->d_name, "aquota.user") ||
- streq(dent->d_name, "aquota.group")) {
+ if (s.st_uid == 0 && STR_IN_SET(dent->d_name,
+ ".journal",
+ "aquota.user",
+ "aquota.group")) {
log_debug("Skipping \"%s\".", sub_path);
continue;
}