From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 13 Jun 2015 17:14:37 +0000 (-0400)
Subject: tmpfiles: only root-owned aquota.* files are special
X-Git-Tag: v221~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1542c01b1dd5e34bfc2355aba603131e458ee0da;p=thirdparty%2Fsystemd.git

tmpfiles: only root-owned aquota.* files are special

Fixes #188.
---

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 027a5c2ca80..42f757c4b70 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;
                                 }