From: Willy Tarreau <w@1wt.eu>
Date: Wed, 24 Sep 2014 10:59:25 +0000 (+0200)
Subject: BUG/MEDIUM: remove debugging code from systemd-wrapper
X-Git-Tag: v1.6-dev1~306
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a55bbc64d8272e4066a67b6d190ffebaff2b300a;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: remove debugging code from systemd-wrapper

Kristoffer Grönlund reported that after my recent update to the
systemd-wrapper, I accidentely left the debugging code which
consists in disabling the fork :-(

The fix needs to be backported to 1.5 as well since I pushed it
there as well.
---

diff --git a/src/haproxy-systemd-wrapper.c b/src/haproxy-systemd-wrapper.c
index 446f28f0bb..8602881e75 100644
--- a/src/haproxy-systemd-wrapper.c
+++ b/src/haproxy-systemd-wrapper.c
@@ -70,8 +70,7 @@ static void spawn_haproxy(char **pid_strv, int nb_pid)
 	main_argc = wrapper_argc - 1;
 	main_argv = wrapper_argv + 1;
 
-	//pid = fork();
-	pid=0;
+	pid = fork();
 	if (!pid) {
 		/* 3 for "haproxy -Ds -sf" */
 		char **argv = calloc(4 + main_argc + nb_pid + 1, sizeof(char *));