X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-acl.c;h=466225d69c7e84ee2a10300cabaef99f2b04dffe;hb=25387573767909c96090ad22cccafc72c16542d7;hp=af7c352ce5986bf1029aa56d53d6b5ac37a92fa5;hpb=6b9732b2bf0499c5e4ea8a9d4f6051d98033f680;p=elogind.git
diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index af7c352ce..466225d69 100644
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -19,13 +19,11 @@
along with systemd; If not, see .
***/
-#include
#include
#include
-#include
-#include
#include "util.h"
+#include "formats-util.h"
#include "acl-util.h"
#include "set.h"
#include "logind-acl.h"
@@ -190,7 +188,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;
@@ -256,8 +254,7 @@ int devnode_acl_all(struct udev *udev,
FOREACH_DIRENT(dent, dir, return -errno) {
_cleanup_free_ char *unescaped_devname = NULL;
- unescaped_devname = cunescape(dent->d_name);
- if (!unescaped_devname)
+ if (cunescape(dent->d_name, UNESCAPE_RELAX, &unescaped_devname) < 0)
return -ENOMEM;
n = strappend("/dev/", unescaped_devname);
@@ -284,7 +281,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;
}