From 8aca7b676628196897a89711f16cddd588801450 Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Fri, 8 Jan 2016 12:09:13 -0700
Subject: [PATCH] Minor fix to new code that tries to catch suexec errors.

---
 www/defs.php3.in | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/www/defs.php3.in b/www/defs.php3.in
index 6a40e4ca9..825fa62c0 100644
--- a/www/defs.php3.in
+++ b/www/defs.php3.in
@@ -1,6 +1,6 @@
 <?php
 #
-# Copyright (c) 2000-2015 University of Utah and the Flux Group.
+# Copyright (c) 2000-2016 University of Utah and the Flux Group.
 # 
 # {{{EMULAB-LICENSE
 # 
@@ -474,11 +474,10 @@ function SUEXEC($uid, $gid, $cmdandargs, $action) {
     # suexec.c puts its error message between 100 and 125. Convert that
     # to an internal error and generate an error that says something useful.
     #
-    if ($suexec_retval >= 100 && $suexec_retval <= 125) {
-        if (!count($suexec_output_array)) {
-            $suexec_output_array[0] =
-                "Internal suexec error $suexec_retval. See the suexec log";
-        }
+    if ($suexec_retval >= 100 && $suexec_retval <= 125 &&
+        !count($suexec_output_array)) {
+        $suexec_output_array[0] =
+            "Internal suexec error $suexec_retval. See the suexec log";
         $suexec_retval = -1;
     }
 
-- 
GitLab