From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Thu, 9 Mar 2017 13:01:02 +0000 (+0100)
Subject: MINOR: server: irrelevant error message with 'default-server' config file keyword.
X-Git-Tag: v1.8-dev1~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8065b6d4f21dc14212cd3c413e82be0ef43984fc;p=thirdparty%2Fhaproxy.git

MINOR: server: irrelevant error message with 'default-server' config file keyword.

There is no reason to emit such an error message:
"'default-server' expects <name> and <addr>[:<port>] as arguments."
if less than two arguments are provided on 'default-server' lines.
This is a 'server' specific error message.
---

diff --git a/src/server.c b/src/server.c
index 5589723efb..563d38dbef 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1020,7 +1020,7 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
 		else if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL))
 			err_code |= ERR_ALERT | ERR_FATAL;
 
-		if (!*args[2]) {
+		if (!defsrv && !*args[2]) {
 			Alert("parsing [%s:%d] : '%s' expects <name> and <addr>[:<port>] as arguments.\n",
 			      file, linenum, args[0]);
 			err_code |= ERR_ALERT | ERR_FATAL;