From 7c657925000286725b0cb080c8b920383e493d0e Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Fri, 7 Nov 2008 04:11:03 +0000
Subject: [PATCH] remove more redundant code from r17200

svn:r17203
---
 src/common/compat.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c
index 54c4ff0430..ecbae6ab0b 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1016,7 +1016,7 @@ log_credential_status(void)
   return 0;
 }
 
-/** Call setuid and setgid to run as <b>user</b> and only switch to their
+/** Call setuid and setgid to run as <b>user</b> and switch to their
  * primary group.  Return 0 on success.  On failure, log and return -1.
  */
 int
@@ -1030,11 +1030,9 @@ switch_id(const char *user)
   tor_assert(user);
 
   /* Log the initial credential state */
-  if (user) {
-    if (log_credential_status()) {
-      return -1;
-    }
-  }
+  if (log_credential_status())
+    return -1;
+
   log_fn(CREDENTIAL_LOG_LEVEL, LD_GENERAL, "Changing user and groups");
 
   /* Get old UID/GID to check if we changed correctly */
@@ -1042,15 +1040,9 @@ switch_id(const char *user)
   old_gid = getgid();
 
   /* Lookup the user and group information, if we have a problem, bail out. */
-  if (user) {
-    pw = getpwnam(user);
-    if (pw == NULL) {
-      log_warn(LD_CONFIG, "Error setting configured user: %s not found", user);
-      return -1;
-    }
-  } else {
-    /* We have no user supplied and so we'll bail out. */
-    log_warn(LD_CONFIG, "Error setting configured user: No user supplied.");
+  pw = getpwnam(user);
+  if (pw == NULL) {
+    log_warn(LD_CONFIG, "Error setting configured user: %s not found", user);
     return -1;
   }
 
@@ -1121,10 +1113,8 @@ switch_id(const char *user)
 #endif
 
   /* Check what really happened */
-  if (user) {
-    if (log_credential_status()) {
-      return -1;
-    }
+  if (log_credential_status()) {
+    return -1;
   }
 
   return 0;