#include "sd-login.h"
+#include "device-util.h"
#include "login-util.h"
#include "logind-acl.h"
#include "log.h"
#include "udev-builtin.h"
static int builtin_uaccess(sd_device *dev, int argc, char *argv[], bool test) {
- int r;
const char *path = NULL, *seat;
bool changed_acl = false;
uid_t uid;
+ int r;
umask(0022);
r = sd_device_get_devname(dev, &path);
if (r < 0)
+ log_device_error_errno(dev, r, "Failed to get device name: %m");
goto finish;
if (sd_device_get_property_value(dev, "ID_SEAT", &seat) < 0)
/* No active session on this seat */
r = 0;
else
- log_error_errno(r, "Failed to determine active user on seat %s: %m", seat);
+ log_device_error_errno(dev, r, "Failed to determine active user on seat %s: %m", seat);
goto finish;
}
r = devnode_acl(path, true, false, 0, true, uid);
if (r < 0) {
- log_full_errno(r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, "Failed to apply ACL on %s: %m", path);
+ log_device_full(dev, r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, "Failed to apply ACL: %m");
goto finish;
}
/* Better be safe than sorry and reset ACL */
k = devnode_acl(path, true, false, 0, false, 0);
if (k < 0) {
- log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, k, "Failed to apply ACL on %s: %m", path);
+ log_device_full(dev, errno == ENOENT ? LOG_DEBUG : LOG_ERR, k, "Failed to apply ACL: %m");
if (r >= 0)
r = k;
}