chiark / gitweb /
sd-bus: rename default bus address constants, they aren't "paths" but "addresses"
[elogind.git] / src / login / logind-acl.c
index af7c352ce5986bf1029aa56d53d6b5ac37a92fa5..f7c6f3a4efe17b7dcf1ef07548e275c4bf88cd5b 100644 (file)
@@ -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;
 
@@ -284,7 +284,7 @@ int devnode_acl_all(struct udev *udev,
                 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;
         }