From: David Sommerseth <davids@redhat.com>
Date: Mon, 9 Jan 2012 17:07:28 +0000 (+0100)
Subject: Fix a couple of issues in openvpn_execve()
X-Git-Tag: v2.3-alpha1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ee5646111625c598efbc82413649b1ab6275877;p=thirdparty%2Fopenvpn.git

Fix a couple of issues in openvpn_execve()

If openvpn_execve() is not able to fork(), it would not make any noise
about it.  So this patch adds a log notification if this happens.

In addition, if openvpn_execve() is called with an empty argv array,
it should exit instantly.  This is not expected to happen at all and
might indicate a much more serious issue (or programming error)
somewhere else in the code.  Thus, abort execution to get these issues
flushed out as quickly as possible.

Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/misc.c b/misc.c
index 9ac28776e..b834a3e4e 100644
--- a/misc.c
+++ b/misc.c
@@ -529,7 +529,7 @@ openvpn_execve (const struct argv *a, const struct env_set *es, const unsigned i
 		  exit (127);
 		}
 	      else if (pid < (pid_t)0) /* fork failed */
-		;
+		msg (M_ERR, "openvpn_execve: unable to fork");
 	      else /* parent side */
 		{
 		  if (waitpid (pid, &ret, 0) != pid)
@@ -556,7 +556,7 @@ openvpn_execve (const struct argv *a, const struct env_set *es, const unsigned i
     }
   else
     {
-      msg (M_WARN, "openvpn_execve: called with empty argv");
+      msg (M_FATAL, "openvpn_execve: called with empty argv");
     }
 
   gc_free (&gc);