MINOR: global: don't prevent nbproc from being redefined
Having nbproc preinitialized to zero is really annoying as it prevents
some checks from being correctly performed. Also the check to prevent
nbproc from being redefined is totally useless, so let's preset it to
1 and remove the test.
diff --git a/src/cfgparse.c b/src/cfgparse.c
index d3b6300..ec1912b 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -784,11 +784,6 @@
}
/* end of user/group name handling*/
else if (!strcmp(args[0], "nbproc")) {
- if (global.nbproc != 0) {
- Alert("parsing [%s:%d] : '%s' already specified. Continuing.\n", file, linenum, args[0]);
- err_code |= ERR_ALERT;
- goto out;
- }
if (*(args[1]) == 0) {
Alert("parsing [%s:%d] : '%s' expects an integer argument.\n", file, linenum, args[0]);
err_code |= ERR_ALERT | ERR_FATAL;
diff --git a/src/haproxy.c b/src/haproxy.c
index 97a4039..c4122e2 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -112,6 +112,7 @@
/* global options */
struct global global = {
+ .nbproc = 1,
.req_count = 0,
.logsrvs = LIST_HEAD_INIT(global.logsrvs),
#ifdef DEFAULT_MAXZLIBMEM