tmpfiles: only root-owned aquota.* files are special
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 13 Jun 2015 17:14:37 +0000 (13:14 -0400)
committerLennart Poettering <lennart@poettering.net>
Wed, 17 Jun 2015 13:46:32 +0000 (15:46 +0200)
Fixes #188.

src/tmpfiles/tmpfiles.c

index 027a5c2..42f757c 100644 (file)
@@ -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;
                                 }