X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-acl.c;h=941fd724a56e8a43c799884d4f9d2e65fa0c6613;hb=7b061de2d0601a33f7246c4b909f30ddc44d7ab6;hp=4bbeb64e8b86276fcf7e1632c389aa28ef975f7e;hpb=8016b904849a2d2bd8b0171ed8493db5524b5ff7;p=elogind.git
diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index 4bbeb64e8..941fd724a 100644
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -19,11 +19,8 @@
along with systemd; If not, see .
***/
-#include
#include
#include
-#include
-#include
#include "util.h"
#include "acl-util.h"
@@ -190,7 +187,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 +274,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;
}