Changeset 7a9d968 for unix.c

Timestamp:

2018-03-10T11:30:39Z (6 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into HEAD

File:

• unix.c (modified) (4 diffs)

unix.c

@@ -147 +147 @@
                 struct passwd *pw = NULL;
                 pw = getpwnam(global.conf->user);
-                if (pw) {
-                        initgroups(global.conf->user, pw->pw_gid);
-                        setgid(pw->pw_gid);
-                        setuid(pw->pw_uid);
-                } else {
-                        log_message(LOGLVL_WARNING, "Failed to look up user %s.", global.conf->user);
+                if (!pw) {
+                        log_message(LOGLVL_ERROR, "Failed to look up user %s.", global.conf->user);
+
+                } else if (initgroups(global.conf->user, pw->pw_gid) != 0) {
+                        log_message(LOGLVL_ERROR, "initgroups: %s.", strerror(errno));
+
+                } else if (setgid(pw->pw_gid) != 0) {
+                        log_message(LOGLVL_ERROR, "setgid(%d): %s.", pw->pw_gid, strerror(errno));
+
+                } else if (setuid(pw->pw_uid) != 0) {
+                        log_message(LOGLVL_ERROR, "setuid(%d): %s.", pw->pw_uid, strerror(errno));
                 }
         }
@@ -281 +286 @@
 static void sighandler_shutdown(int signal)
 {
+        int unused G_GNUC_UNUSED;
         /* Write a single null byte to the pipe, just to send a message to the main loop.
          * This gets handled by bitlbee_shutdown (the b_input_add callback for this pipe) */
-        write(shutdown_pipe.fd[1], "", 1);
+        unused = write(shutdown_pipe.fd[1], "", 1);
 }
 
@@ -292 +298 @@
 {
         GSList *l;
+        int unused G_GNUC_UNUSED;
         const char *message = "ERROR :BitlBee crashed! (SIGSEGV received)\r\n";
         int len = strlen(message);
@@ -298 +305 @@
                 irc_t *irc = l->data;
                 sock_make_blocking(irc->fd);
-                write(irc->fd, message, len);
+                unused = write(irc->fd, message, len);
         }