inhibit: allow filtering --list by mode

[elogind.git] / src / login / logind-acl.c

diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index 4bbeb64e8b86276fcf7e1632c389aa28ef975f7e..f7c6f3a4efe17b7dcf1ef07548e275c4bf88cd5b 100644 (file)
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -190,7 +190,7 @@ int devnode_acl_all(struct udev *udev,
 
         assert(udev);
 
-        nodes = set_new(string_hash_func, string_compare_func);
+        nodes = set_new(&string_hash_ops);
         if (!nodes)
                 return -ENOMEM;
 
@@ -277,11 +277,14 @@ int devnode_acl_all(struct udev *udev,
         SET_FOREACH(n, nodes, i) {
                 int k;
 
-                log_debug("Fixing up ACLs at %s for seat %s", n, seat);
+                log_debug("Changing ACLs at %s for seat %s (uid "UID_FMT"→"UID_FMT"%s%s)",
+                          n, seat, old_uid, new_uid,
+                          del ? " del" : "", add ? " add" : "");
+
                 k = devnode_acl(n, flush, del, old_uid, add, new_uid);
                 if (k == -ENOENT)
                         log_debug("Device %s disappeared while setting ACLs", n);
-                else if (k < 0)
+                else if (k < 0 && r == 0)
                         r = k;
         }