chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus-proxyd: ignore errors from sd_bus_creds_get_well_known_names()
[elogind.git]
/
src
/
login
/
logind-acl.c
diff --git
a/src/login/logind-acl.c
b/src/login/logind-acl.c
index dc86f0f1a2c3557394e6f2577ef40857975bf882..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);
assert(udev);
- nodes = set_new(
string_hash_func, string_compare_func
);
+ nodes = set_new(
&string_hash_ops
);
if (!nodes)
return -ENOMEM;
if (!nodes)
return -ENOMEM;
@@
-277,9
+277,14
@@
int devnode_acl_all(struct udev *udev,
SET_FOREACH(n, nodes, i) {
int k;
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);
k = devnode_acl(n, flush, del, old_uid, add, new_uid);
- if (k < 0)
+ if (k == -ENOENT)
+ log_debug("Device %s disappeared while setting ACLs", n);
+ else if (k < 0 && r == 0)
r = k;
}
r = k;
}