summaryrefslogtreecommitdiff
path: root/src/udev/udev-builtin-uaccess.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-10-14 01:12:22 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-10-23 18:28:38 +0900
commit4b60fe6e83172413ef13a7fc6e20e417f73bc6ff (patch)
tree73d381b3efd5e04bef8ded4b1874aa1057e9bea6 /src/udev/udev-builtin-uaccess.c
parentde675b17c878281f17d6cad761ed58a2ee0225c7 (diff)
downloadsystemd-4b60fe6e83172413ef13a7fc6e20e417f73bc6ff.tar.gz
udev: replace udev_device by sd_device in udev-builtin-uaccess.c
Diffstat (limited to 'src/udev/udev-builtin-uaccess.c')
-rw-r--r--src/udev/udev-builtin-uaccess.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index 695a411a74..6806b9ee09 100644
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -15,11 +15,12 @@
#include "log.h"
#include "udev-builtin.h"
-static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool test) {
+static int builtin_uaccess(struct udev_device *_dev, int argc, char *argv[], bool test) {
int r;
const char *path = NULL, *seat;
bool changed_acl = false;
uid_t uid;
+ sd_device *dev = _dev->device;
umask(0022);
@@ -27,9 +28,11 @@ static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool
if (!logind_running())
return 0;
- path = udev_device_get_devnode(dev);
- seat = udev_device_get_property_value(dev, "ID_SEAT");
- if (!seat)
+ r = sd_device_get_devname(dev, &path);
+ if (r < 0)
+ goto finish;
+
+ if (sd_device_get_property_value(dev, "ID_SEAT", &seat) < 0)
seat = "seat0";
r = sd_seat_get_active(seat, NULL, &uid);