Attachment 616898 Details for Bug 903009

[patch] proposed patch to enable user based exclude statements

systemd-add-user-keep.patch (text/plain), 2.78 KB, created by Thomas Blume on 2014-12-12 12:12:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Blume

Created: 2014-12-12 12:12:13 UTC

Size: 2.78 KB

patch

obsolete

>diff -Naur systemd-210/src/tmpfiles/tmpfiles.c systemd-210.mod/src/tmpfiles/tmpfiles.c
>--- systemd-210/src/tmpfiles/tmpfiles.c	2014-11-19 13:10:24.389312585 +0100
>+++ systemd-210.mod/src/tmpfiles/tmpfiles.c	2014-12-12 11:19:21.785565365 +0100
>@@ -263,6 +263,7 @@
>         struct timespec times[2];
>         bool deleted = false;
>         int r = 0;
>+        Item *found = NULL;
> 
>         while ((dent = readdir(d))) {
>                 struct stat s;
>@@ -306,12 +307,44 @@
>                 }
> 
>                 /* Is there an item configured for this path? */
>-                if (hashmap_get(items, sub_path))
>-                        continue;
>-
>-                if (find_glob(globs, sub_path))
>-                        continue;
>-
>+                found = hashmap_get(items, sub_path);
>+         
>+                if (!found)
>+                        found = find_glob(globs, sub_path);
>+
>+                if (found) {
>+                        /* evaluate username arguments in exclude stadements */
>+                        if (found->type == IGNORE_PATH || found->type == IGNORE_DIRECTORY_PATH) {
>+                                if (!found->argument)
>+                                        continue; 
>+                                else {
>+                                        struct passwd *pw;
>+                                        char *userfound = NULL, *args = strdup(found->argument);
>+                                        bool match = false;
>+                                        int uid = -1;
>+
>+                                        while ((userfound = strsep(&args, ","))) {
>+                                                pw = getpwnam(userfound);
>+
>+                                                if (!pw)
>+                                                        log_error("Unknown user '%s' in exclude statement.", userfound);
>+                                                else {
>+                                                        uid = pw->pw_uid;
>+                                                        if (s.st_uid == uid) { 
>+                                                                match = true;
>+                                                                break;
>+                                                        }
>+                                                }
>+                                        }
>+                                        if (match) {
>+                                                found = NULL;
>+                                                continue;  
>+                                        }
>+                                }
>+                        } else 
>+                                 continue; 
>+                }
>+                        
>                 if (S_ISDIR(s.st_mode)) {
> 
>                         if (mountpoint &&

Actions: View | Diff

Attachments on bug 903009: 616898