X-Git-Url: https://ruderich.org/simon/gitweb/?p=wall-notify%2Fwall-notify.git;a=blobdiff_plain;f=src%2Fwall-notify.c;h=bbc783b5e884514ca1f793da674ba22d71bc5415;hp=40cdfe587870bc46f6ae5cbfc6b8c0308a74d70e;hb=0177f8bdc6769e800ee986dec1b069be893f19e6;hpb=1eb18876bb0eb8f55567dd8a92ab10091d045df7

diff --git a/src/wall-notify.c b/src/wall-notify.c
index 40cdfe5..bbc783b 100644
--- a/src/wall-notify.c
+++ b/src/wall-notify.c
@@ -203,6 +203,44 @@ static int wait_for_write(int fd, int timeout) {
     return 1;
 }
 
+#ifdef USE_UTMPX
+static void drop_privileges(void) {
+    uid_t uid, ruid, euid, suid;
+    gid_t gid, rgid, egid, sgid;
+
+    uid = getuid();
+    gid = getgid();
+
+    /* Drop all privileges. */
+    if (setresuid(uid, uid, uid) != 0) {
+        perror("setresuid");
+        exit(EXIT_FAILURE);
+    }
+    if (setresgid(gid, gid, gid) != 0) {
+        perror("setresgid");
+        exit(EXIT_FAILURE);
+    }
+
+    /* Verify all privileges were dropped. */
+    if (getresuid(&ruid, &euid, &suid) != 0) {
+        perror("getresuid");
+        exit(EXIT_FAILURE);
+    }
+    if (getresgid(&rgid, &egid, &sgid) != 0) {
+        perror("getresgid");
+        exit(EXIT_FAILURE);
+    }
+    if (uid == ruid && uid == euid && uid == suid
+            && gid == rgid && gid == egid && gid == sgid) {
+        /* Everything fine. */
+        return;
+    }
+
+    fprintf(stderr, "failed to drop privileges, aborting\n");
+    exit(EXIT_FAILURE);
+}
+#endif
+
 static void pass_buffer_to_program(const char *buffer, size_t length, char **argv) {
     int fds[2];
     FILE *fh;
@@ -229,6 +267,10 @@ static void pass_buffer_to_program(const char *buffer, size_t length, char **arg
     } else if (pid == 0) {
         /* child */
 
+#ifdef USE_UTMPX
+        drop_privileges();
+#endif
+
         close(fds[1]); /* write side */
 
         /* Pass read side as stdin to the program. */
@@ -317,23 +359,57 @@ static void *x11_event_loop_thread(void *unused) {
 #endif
 
 static void usage(const char *argv0) {
-    fprintf(stderr, "usage: %s <cmd args..>\n", argv0);
+    fprintf(stderr, "usage: %s [-X] <cmd args..>\n", argv0);
+    fprintf(stderr, "Pass wall messages to <cmd args..>.\n");
+    fprintf(stderr, "\n");
+    fprintf(stderr, "-X quit when the current X session terminates\n");
+#ifdef DONT_USE_X11
+    fprintf(stderr, "\n");
+    fprintf(stderr, "compiled without X11 support, -X disabled\n");
+#endif
     exit(EXIT_FAILURE);
 }
 
 
 int main(int argc, char **argv) {
+    int option, enable_x11;
     int ptm, pts;
     char *name;
-    const char *argv0;
 
-    argv0 = argv[0];
-    /* Don't pass our argv[0] to the notification program. */
-    argv++;
+    /* Don't display error messages for unknown options. */
+    opterr = 0;
+
+    enable_x11 = 0;
+
+    /*
+     * Glibc violates POSIX by default and skips over non-option arguments and
+     * parses later arguments which look like options as well. But we want to
+     * pass everything except the options unmodified to execvp(). Prefixing
+     * the optstring with "+" fixes this behaver. This is not POSIX
+     * compatible, but the option should be ignored on other systems.
+     */
+    while ((option = getopt(argc, argv, "+Xh")) != -1) {
+        switch (option) {
+            case 'X':
+                enable_x11 = 1;
+                break;
+            case 'h':
+                usage(argv[0]);
+                break;
+            default:
+                fprintf(stderr, "%s: unknown option '%s'!\n\n",
+                                argv[0], argv[optind - 1]);
+                usage(argv[0]);
+                break;
+        }
+    }
 
-    if (argc < 2) {
-        usage(argv0);
+    /* No arguments remaining, abort. */
+    if (!argv[optind]) {
+        usage(argv[0]);
     }
+    /* Arguments for notification program. */
+    argv += optind;
 
     ptm = open_tty();
     if (ptm < 0) {
@@ -358,18 +434,21 @@ int main(int argc, char **argv) {
         exit(EXIT_FAILURE);
     }
 
-#ifndef DONT_USE_X11
     /* Start a thread which connects to X11. This way we die if the user logs
      * out of its X11 session. */
-    {
+    if (enable_x11) {
+#ifdef DONT_USE_X11
+        fprintf(stderr, "%s: option -X is disabled!\n\n", argv0);
+        usage(argv0);
+#else
         pthread_t tid;
 
         if (pthread_create(&tid, NULL, x11_event_loop_thread, NULL) != 0) {
             perror("pthread_create");
             exit(EXIT_FAILURE);
         }
-    }
 #endif
+    }
 
     /* Cleanup on signals. Necessary before login(). */
     setup_signals();