From: Willy Tarreau <w@1wt.eu>
Date: Thu, 2 Jul 2020 13:38:35 +0000 (+0200)
Subject: BUILD: haproxy: fix build error when RLIMIT_AS is not set
X-Git-Tag: v2.1.8~48
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=dd3e88362fcafa8b24a0ef269b21b5fecd82171f;p=haproxy-2.1.git

BUILD: haproxy: fix build error when RLIMIT_AS is not set

As reported in issue #724, openbsd fails to build in haproxy.c
due to a faulty comma in the middle of a warning message. This code
is only compiled when RLIMIT_AS is not defined, which seems to be
rare these days.

This may be backported to older versions as the problem was likely
introduced when strict limits were added.

(cherry picked from commit ab8b6a45be2f76efb28f7f0ad18b69549c77b4d6)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 42f898f..83131eb 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3125,7 +3125,7 @@ int main(int argc, char **argv)
 					exit(1);
 			}
 			else
-				ha_warning("[%s.main()] Cannot fix MEM limit to %d megs.",
+				ha_warning("[%s.main()] Cannot fix MEM limit to %d megs."
 					   "This will fail in >= v2.3\n",
 					   argv[0], global.rlimit_memmax);
 		}