summaryrefslogtreecommitdiff
path: root/src/udev/udev-builtin-uaccess.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-10-23 18:26:06 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-10-23 18:29:25 +0900
commitd354690e7d0429338cdd1c2cfe1fdd08fc53da9e (patch)
treed973cacc0865e3ddcb222692459bc8d887ebfa09 /src/udev/udev-builtin-uaccess.c
parent45a73f4be32481eacdb652c0869d69025fab354c (diff)
downloadsystemd-d354690e7d0429338cdd1c2cfe1fdd08fc53da9e.tar.gz
udev-builtin: propagate negative errno
Diffstat (limited to 'src/udev/udev-builtin-uaccess.c')
-rw-r--r--src/udev/udev-builtin-uaccess.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index 7be17f32c7..72f40dc4d6 100644
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -35,12 +35,13 @@ static int builtin_uaccess(sd_device *dev, int argc, char *argv[], bool test) {
seat = "seat0";
r = sd_seat_get_active(seat, NULL, &uid);
- if (IN_SET(r, -ENXIO, -ENODATA)) {
- /* No active session on this seat */
- r = 0;
- goto finish;
- } else if (r < 0) {
- log_error("Failed to determine active user on seat %s.", seat);
+ if (r < 0) {
+ if (IN_SET(r, -ENXIO, -ENODATA))
+ /* No active session on this seat */
+ r = 0;
+ else
+ log_error_errno(r, "Failed to determine active user on seat %s: %m", seat);
+
goto finish;
}
@@ -66,7 +67,7 @@ finish:
}
}
- return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+ return r;
}
const struct udev_builtin udev_builtin_uaccess = {