Changes in unix.c [0483e1e:72d48b6]

File:

• unix.c (modified) (4 diffs)

unix.c

@@ -147 +147 @@
                 struct passwd *pw = NULL;
                 pw = getpwnam(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));
+                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);
                 }
         }
@@ -286 +281 @@
 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) */
-        unused = write(shutdown_pipe.fd[1], "", 1);
+        write(shutdown_pipe.fd[1], "", 1);
 }
 
@@ -298 +292 @@
 {
         GSList *l;
-        int unused G_GNUC_UNUSED;
         const char *message = "ERROR :BitlBee crashed! (SIGSEGV received)\r\n";
         int len = strlen(message);
@@ -305 +298 @@
                 irc_t *irc = l->data;
                 sock_make_blocking(irc->fd);
-                unused = write(irc->fd, message, len);
+                write(irc->fd, message, len);
         }