From: Willy Tarreau <w@1wt.eu>
Date: Tue, 6 Jul 2021 09:41:10 +0000 (+0200)
Subject: BUG/MINOR: cli: fix server name output in "show fd"
X-Git-Tag: v2.5-dev2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfb34a8f87cacc1ced48f555ab74b6630ce4bb08;p=thirdparty%2Fhaproxy.git

BUG/MINOR: cli: fix server name output in "show fd"

A server name was displayed as <srv>/<proxy> instead of the reverse.
It only confuses diagnostics. This was introduced by commit 7a4a0ac71
("MINOR: cli: add a new "show fd" command") so this fix can be backport
down to 1.8.
---

diff --git a/src/cli.c b/src/cli.c
index bc561cf2c6..b3132191dc 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1280,7 +1280,7 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
 			if (px)
 				chunk_appendf(&trash, " px=%s", px->id);
 			else if (sv)
-				chunk_appendf(&trash, " sv=%s/%s", sv->id, sv->proxy->id);
+				chunk_appendf(&trash, " sv=%s/%s", sv->proxy->id, sv->id);
 			else if (li)
 				chunk_appendf(&trash, " fe=%s", li->bind_conf->frontend->id);