mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 14:51:27 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: cli: remove error message with 'set anon on|off'

Browse Source 
Removed the error message in 'set anon on|off', it's more user
friendly: users use 'set anon on' even if the mode is already
activated, and the same for 'set anon off'. That allows users
to write the command line in the anonymized mode they want
without errors.

No backport needed, except if anonymization mechanism is backported.
This commit is contained in:
Erwan Le Goas 2022-09-28 17:04:29 +02:00 committed by Christopher Faulet
parent 2a2e46ff20
commit 3f4ae6194e
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/cli.c
View File

@ -1882,28 +1882,24 @@ static int cli_parse_set_anon(char **args, char *payload, struct appctx *appctx,
long long key;
if (strcmp(args[2], "on") == 0) {
if (appctx->cli_anon_key != 0)
return cli_err(appctx, "Mode already enabled\n");
if (*args[3]) {
key = atoll(args[3]);
if (key < 1 || key > UINT_MAX)
return cli_err(appctx, "Value out of range (1 to 4294967295 expected).\n");
appctx->cli_anon_key = key;
}
else {
if (*args[3]) {
key = atoll(args[3]);
if (key < 1 || key > UINT_MAX)
return cli_err(appctx, "Value out of range (1 to 4294967295 expected).\n");
appctx->cli_anon_key = key;
}
else {
tmp = HA_ATOMIC_LOAD(&global.anon_key);
if (tmp != 0)
appctx->cli_anon_key = tmp;
else
appctx->cli_anon_key = ha_random32();
}
tmp = HA_ATOMIC_LOAD(&global.anon_key);
if (tmp != 0)
appctx->cli_anon_key = tmp;
else
appctx->cli_anon_key = ha_random32();
}
}
else if (strcmp(args[2], "off") == 0) {
if (appctx->cli_anon_key == 0)
return cli_err(appctx, "Mode already disabled\n");
else if (*args[3]) {
if (*args[3]) {
return cli_err(appctx, "Key can't be added while disabling anonymized mode\n");
}
else {