[systemd-commits] 2 commits - src/udev TODO

[Kay Sievers]

 TODO                  |    2 ++
 src/udev/udev-rules.c |    9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit a26336da875a6657d404d1e44b86ae067c34b110
Author: Kay Sievers <kay at vrfy.org>
Date:   Fri May 4 19:06:07 2012 +0200

    update TODO

diff --git a/TODO b/TODO
index 08ba8b2..d39c8fc 100644
--- a/TODO
+++ b/TODO
@@ -22,6 +22,8 @@ Bugfixes:
 * properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point.
 
 Features:
+* improve !/proc/*/loginuid situation: make /proc/*/loginuid less dependent on CONFIG_AUDIT,
+  or use the users cgroup information when /proc/*/loginuid is not available.
 
 * services which create their own subcgroups break cgroup-empty notification (needs to be fixed in the kernel)
 

commit 395ea97815f0ca2352caeccf3027d026dd9e58a7
Author: Kay Sievers <kay at vrfy.org>
Date:   Fri May 4 02:26:08 2012 +0200

    udev: fix the ENV{} blacklist logic

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index a800ccd..e73b156 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1349,11 +1349,12 @@ static int add_rule(struct udev_rules *rules, char *line,
                                 };
                                 unsigned int i;
 
-                                for (i = 0; i < ELEMENTSOF(blacklist); i++)
-                                        if (streq(attr, blacklist[i])) {
-                                                log_error("invalid ENV attribute, '%s' can not be set %s:%u\n", attr, filename, lineno);
+                                for (i = 0; i < ELEMENTSOF(blacklist); i++) {
+                                        if (!streq(attr, blacklist[i]))
                                                 continue;
-                                        }
+                                        log_error("invalid ENV attribute, '%s' can not be set %s:%u\n", attr, filename, lineno);
+                                        goto invalid;
+                                }
                                 if (rule_add_key(&rule_tmp, TK_A_ENV, op, value, attr) != 0)
                                         goto invalid;
                         }