From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 19 Mar 2021 07:53:26 +0000 (+0100)
Subject: CLEANUP: tcp-rules: Fix a typo in error messages about expect-netscaler-cip
X-Git-Tag: v2.4-dev13~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a561ffb978937e6fd2c7092978681b8e88bdff04;p=thirdparty%2Fhaproxy.git

CLEANUP: tcp-rules: Fix a typo in error messages about expect-netscaler-cip

It was misspelled (expect-netscaler-ip instead of expect-netscaler-cip). 2
commits are concerned :

 * db67b0ed7 MINOR: tcp-rules: suggest approaching action names on mismatch
 * 72d012fbd CLEANUP: tcp-rules: add missing actions in the tcp-request error message

The first one will not be backported, but the second one was backported as
far as 1.8. Thus this one may also be backported, but only the 2nd part
about the list of accepted keywords.
---

diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index 21a7c0fd86..761fb715b9 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -955,7 +955,7 @@ static int tcp_parse_request_rule(char **args, int arg, int section_type,
 			if (kw->parse((const char **)args, &arg, curpx, rule, err) == ACT_RET_PRS_ERR)
 				return -1;
 		} else {
-			const char *extra[] = { "accept", "reject", "capture", "track-sc", "expect-proxy", "expect-netscaler-ip", NULL };
+			const char *extra[] = { "accept", "reject", "capture", "track-sc", "expect-proxy", "expect-netscaler-cip", NULL };
 			const char *best = NULL;
 
 
@@ -973,7 +973,7 @@ static int tcp_parse_request_rule(char **args, int arg, int section_type,
 			}
 
 			memprintf(err,
-			          "'%s %s' expects 'accept', 'reject', 'capture', 'expect-proxy', 'expect-netscaler-ip', 'track-sc0' ... 'track-sc%d', %s "
+			          "'%s %s' expects 'accept', 'reject', 'capture', 'expect-proxy', 'expect-netscaler-cip', 'track-sc0' ... 'track-sc%d', %s "
 			          "in %s '%s' (got '%s').%s%s%s\n",
 			          args[0], args[1], MAX_SESS_STKCTR-1,
 			          trash.area, proxy_type_str(curpx),