From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Fri, 14 Apr 2017 13:19:56 +0000 (+0200)
Subject: BUG/MINOR: server: Fix a wrong error message during 'usesrc' keyword parsing.
X-Git-Tag: v1.8-dev2~76
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d083ed796af135be942594182f4fc83459ee43a;p=thirdparty%2Fhaproxy.git

BUG/MINOR: server: Fix a wrong error message during 'usesrc' keyword parsing.

'usesrc' setting is not permitted on 'server' lines if not provided after
'source' setting. This is now also the case on 'default-server' lines.
Without this patch parse_server() parser displayed that 'usersrc' is
an unknown keyword.

Should have come with dba9707 commit.
---

diff --git a/src/server.c b/src/server.c
index b5d889005e..40a8d7f2b9 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2207,7 +2207,7 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
 				}
 				cur_arg += 2;
 			}
-			else if (!defsrv && !strcmp(args[cur_arg], "usesrc")) {  /* address to use outside: needs "source" first */
+			else if (!strcmp(args[cur_arg], "usesrc")) {  /* address to use outside: needs "source" first */
 				Alert("parsing [%s:%d] : '%s' only allowed after a '%s' statement.\n",
 				      file, linenum, "usesrc", "source");
 				err_code |= ERR_ALERT | ERR_FATAL;