BUG/MINOR: cli: Ensure all command outputs end with a LF
Since 200b0fac ("MEDIUM: Add support for updating TLS ticket keys via
socket"), 4147b2ef ("MEDIUM: ssl: basic OCSP stapling support."),
4df59e9 ("MINOR: cli: add socket commands and config to prepend
informational messages with severity") and 654694e1 ("MEDIUM: stats/cli:
add support for "set table key" to enter values"), commands
'set ssl tls-key', 'set ssl ocsp-response', 'set severity-output' and
'set table' do not always send an extra LF at the end of their outputs.
This is required as mentioned in doc/management.txt:
"Since multiple commands may be issued at once, haproxy uses the empty
line as a delimiter to mark an end of output for each command"
Signed-off-by: Aurélien Nephtali <aurelien.nephtali@corp.ovh.com>
diff --git a/src/cli.c b/src/cli.c
index 84b6229..7bffbdd 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1145,7 +1145,7 @@
return 0;
appctx->ctx.cli.severity = LOG_ERR;
- appctx->ctx.cli.msg = "one of 'none', 'number', 'string' is a required argument";
+ appctx->ctx.cli.msg = "one of 'none', 'number', 'string' is a required argument\n";
appctx->st0 = CLI_ST_PRINT;
return 1;
}
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index daf4282..5acf38f 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -8554,7 +8554,7 @@
}
ssl_sock_update_tlskey_ref(ref, &trash);
appctx->ctx.cli.severity = LOG_INFO;
- appctx->ctx.cli.msg = "TLS ticket key updated!";
+ appctx->ctx.cli.msg = "TLS ticket key updated!\n";
appctx->st0 = CLI_ST_PRINT;
return 1;
@@ -8591,7 +8591,7 @@
return 1;
}
appctx->ctx.cli.severity = LOG_INFO;
- appctx->ctx.cli.msg = "OCSP Response updated!";
+ appctx->ctx.cli.msg = "OCSP Response updated!\n";
appctx->st0 = CLI_ST_PRINT;
return 1;
#else
diff --git a/src/stick_table.c b/src/stick_table.c
index fe26e31..73c70d3 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -3334,7 +3334,7 @@
{
if (appctx->ctx.table.action != STK_CLI_ACT_SHOW && appctx->ctx.table.action != STK_CLI_ACT_CLR) {
appctx->ctx.cli.severity = LOG_ERR;
- appctx->ctx.cli.msg = "content-based lookup is only supported with the \"show\" and \"clear\" actions";
+ appctx->ctx.cli.msg = "content-based lookup is only supported with the \"show\" and \"clear\" actions\n";
appctx->st0 = CLI_ST_PRINT;
return 1;
}