#include <dirent.h>
#include <getopt.h>
-#include <systemd/sd-login.h>
+#include "systemd/sd-login.h"
#include "logind-acl.h"
#include "udev.h"
#include "util.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;
- log_set_target(LOG_TARGET_AUTO);
- log_parse_environment();
- log_open();
-
umask(0022);
/* don't muck around with ACLs when the system is not running systemd */
r = devnode_acl(path, true, false, 0, true, uid);
if (r < 0) {
- log_error("Failed to apply ACL on %s: %s", path, strerror(-r));
+ log_error_errno(r, "Failed to apply ACL on %s: %m", path);
goto finish;
}
/* Better be safe than sorry and reset ACL */
k = devnode_acl(path, true, false, 0, false, 0);
if (k < 0) {
- log_error("Failed to apply ACL on %s: %s", path, strerror(-k));
+ log_error_errno(k, "Failed to apply ACL on %s: %m", path);
if (r >= 0)
r = k;
}