1 files changed, 7 insertions, 3 deletions
diff --git a/env.c b/env.c
index 0c174009..19593d72 100644
--- a/env.c
+++ b/env.c
@@ -41,9 +41,13 @@ void envquery(int argc, char **argv)
 {
     struct passwd by_name, by_uid, *pwp;
 
-    (user = getenv("FETCHMAILUSER"))
-	|| (user = getenv("LOGNAME"))
-	|| (user = getenv("USER"));
+    if (!(user = getenv("FETCHMAILUSER")))
+    {
+	if (!(user = getenv("LOGNAME")))
+	{
+	    user = getenv("USER");
+	}
+    }
 
     if (!(pwp = getpwuid(getuid())))
     {