chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide: sort includes in *.h
[elogind.git]
/
src
/
login
/
logind-acl.c
diff --git
a/src/login/logind-acl.c
b/src/login/logind-acl.c
index 09a6f6d90b9e4dc49edcb35160026cafda0f3d33..d0dd569a03cf96490a8639f968b983d2cb923f65 100644
(file)
--- a/
src/login/logind-acl.c
+++ b/
src/login/logind-acl.c
@@
-19,17
+19,20
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <assert.h>
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
-#include <sys/acl.h>
-#include <acl/libacl.h>
-#include "util.h"
#include "acl-util.h"
#include "acl-util.h"
-#include "set.h"
+#include "alloc-util.h"
+#include "dirent-util.h"
+#include "escape.h"
+#include "fd-util.h"
+#include "formats-util.h"
#include "logind-acl.h"
#include "logind-acl.h"
+#include "set.h"
+#include "string-util.h"
#include "udev-util.h"
#include "udev-util.h"
+#include "util.h"
static int flush_acl(acl_t acl) {
acl_entry_t i;
static int flush_acl(acl_t acl) {
acl_entry_t i;
@@
-190,7
+193,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;
@@
-210,6
+213,10
@@
int devnode_acl_all(struct udev *udev,
if (r < 0)
return r;
if (r < 0)
return r;
+ r = udev_enumerate_add_match_is_initialized(e);
+ if (r < 0)
+ return r;
+
r = udev_enumerate_scan_devices(e);
if (r < 0)
return r;
r = udev_enumerate_scan_devices(e);
if (r < 0)
return r;
@@
-223,9
+230,6
@@
int devnode_acl_all(struct udev *udev,
if (!d)
return -ENOMEM;
if (!d)
return -ENOMEM;
- if (!udev_device_get_is_initialized(d))
- continue;
-
sn = udev_device_get_property_value(d, "ID_SEAT");
if (isempty(sn))
sn = "seat0";
sn = udev_device_get_property_value(d, "ID_SEAT");
if (isempty(sn))
sn = "seat0";
@@
-255,8
+259,7
@@
int devnode_acl_all(struct udev *udev,
FOREACH_DIRENT(dent, dir, return -errno) {
_cleanup_free_ char *unescaped_devname = NULL;
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);
return -ENOMEM;
n = strappend("/dev/", unescaped_devname);
@@
-276,9
+279,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;
}