From 0b1d5013acf868d1cfe6a46a0e5ff5cfe36376d8 Mon Sep 17 00:00:00 2001
From: Jean Flach <jean-marcel.flach@icinga.com>
Date: Wed, 25 Apr 2018 14:26:40 +0200
Subject: [PATCH] Revert "fixup set rlimit stack failed condition"

This reverts commit bf959371c4505bfe27b0682611c035d64b90efd3.

fixes #6257
---
 lib/base/application.cpp | 47 ++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index 12b5e62f1..374285404 100644
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -239,34 +239,33 @@ void Application::SetResourceLimits()
 		else
 			rl.rlim_cur = rl.rlim_max;
 
-		if (setrlimit(RLIMIT_STACK, &rl) < 0) {
+		if (setrlimit(RLIMIT_STACK, &rl) < 0)
 			Log(LogWarning, "Application")
 			    << "Failed adjust resource limit for stack size (RLIMIT_STACK) with error \"" << strerror(errno) << "\"";
-			if (set_stack_rlimit) {
-				char **new_argv = static_cast<char **>(malloc(sizeof(char *) * (argc + 2)));
+		else if (set_stack_rlimit) {
+			char **new_argv = static_cast<char **>(malloc(sizeof(char *) * (argc + 2)));
 
-				if (!new_argv) {
-					perror("malloc");
-					Exit(EXIT_FAILURE);
-				}
-
-				new_argv[0] = argv[0];
-				new_argv[1] = strdup("--no-stack-rlimit");
-
-				if (!new_argv[1]) {
-					perror("strdup");
-					exit(1);
-				}
-
-				for (int i = 1; i < argc; i++)
-					new_argv[i + 1] = argv[i];
-
-				new_argv[argc + 1] = nullptr;
-
-				(void) execvp(new_argv[0], new_argv);
-				perror("execvp");
-				_exit(EXIT_FAILURE);
+			if (!new_argv) {
+				perror("malloc");
+				Exit(EXIT_FAILURE);
 			}
+
+			new_argv[0] = argv[0];
+			new_argv[1] = strdup("--no-stack-rlimit");
+
+			if (!new_argv[1]) {
+				perror("strdup");
+				exit(1);
+			}
+
+			for (int i = 1; i < argc; i++)
+				new_argv[i + 1] = argv[i];
+
+			new_argv[argc + 1] = nullptr;
+
+			(void) execvp(new_argv[0], new_argv);
+			perror("execvp");
+			_exit(EXIT_FAILURE);
 		}
 #	else /* RLIMIT_STACK */
 		Log(LogNotice, "Application", "System does not support adjusting the resource limit for stack size (RLIMIT_STACK)");