X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fuaccess.c;h=435471e91a7fde6c053c7615494ca21d5b0422a1;hb=74b91131ed09850ed487a2f7849147ff6f80194d;hp=e55ab51f344e63d120a7d86b80242f393f9538de;hpb=5eda94dda25bccda928c4b33c790dbe748573a22;p=elogind.git

diff --git a/src/uaccess.c b/src/uaccess.c
index e55ab51f3..435471e91 100644
--- a/src/uaccess.c
+++ b/src/uaccess.c
@@ -28,26 +28,28 @@
 
 int main(int argc, char *argv[]) {
         int r;
-        const char *path, *seat;
+        const char *path = NULL, *seat;
         char *p, *active_uid = NULL;
         unsigned long ul;
+        bool changed_acl = false;
 
         log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
         log_open();
 
-        if (argc != 2) {
-                log_error("This program expects two argument.");
+        if (argc < 2 || argc > 3) {
+                log_error("This program expects one or two arguments.");
                 r = -EINVAL;
                 goto finish;
         }
 
         path = argv[1];
-        seat = argv[2];
+        seat = argc < 3 || isempty(argv[2]) ? "seat0" : argv[2];
 
-        p = strappend("/run/systemd/seat/", seat);
+        p = strappend("/run/systemd/seats/", seat);
         if (!p) {
                 log_error("Out of memory.");
+                r = -ENOMEM;
                 goto finish;
         }
 
@@ -66,21 +68,37 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        r = safe_atolu(active_uid, &ul);
-        if (r < 0) {
-                log_error("Failed to parse active UID value %s: %s", active_uid, strerror(-r));
-                goto finish;
-        }
+        if (active_uid) {
+                r = safe_atolu(active_uid, &ul);
+                if (r < 0) {
+                        log_error("Failed to parse active UID value %s: %s", active_uid, strerror(-r));
+                        goto finish;
+                }
 
-        r = devnode_acl(path, true, false, 0, true, (uid_t) ul);
-        if (r < 0) {
-                log_error("Failed to apply ACL on %s: %s", path, strerror(-r));
-                goto finish;
+                r = devnode_acl(path, true, false, 0, true, (uid_t) ul);
+                if (r < 0) {
+                        log_error("Failed to apply ACL on %s: %s", path, strerror(-r));
+                        goto finish;
+                }
+
+                changed_acl = true;
         }
 
         r = 0;
 
 finish:
+        if (path && !changed_acl) {
+                int k;
+                /* Better be safe that 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));
+                        if (r >= 0)
+                                r = k;
+                }
+        }
+
         free(active_uid);
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;