X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-uaccess.c;h=ecd320a588b0903fe7ea6899007729907a092cf5;hp=354ee08f28bd262911d321bf25ef756989621a5b;hb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;hpb=79d860fe78ff9e53fe3150fb55a8a8b03c4f6470

diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index 354ee08f2..ecd320a58 100644
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -29,22 +29,17 @@
 #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 */
@@ -68,7 +63,7 @@ static int builtin_uaccess(struct udev_device *dev, int argc, char *argv[], bool
 
         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;
         }
 
@@ -82,7 +77,7 @@ 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;
                 }