GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-09 08:16:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ban-columns' into 'master'

Browse Source 
occtl: Fix column misalignment in ban command outputs

See merge request openconnect/ocserv!490
This commit is contained in:
Dimitri Papadopoulos Orfanos
2026-01-05 17:42:44 +02:00
parent 1837b5877d e40d735316
commit 0d58edf884
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -1,5 +1,5 @@
* Version 1.4.1 (unreased)
-
* Version 1.4.1 (unreleased)
- occtl: Fix column misalignment in ban command outputs
* Version 1.4.0 (released 2026-01-04)

13
src/occtl/unix.c
View File

@@ -1126,7 +1126,7 @@ static int handle_list_banned_cmd(struct unix_ctx *ctx, const char *arg,
}
if (!header_printed && NO_JSON(params)) {
fprintf(out, "%14s %14s %30s\n", "IP", "score",
fprintf(out, "%15s %10s %30s\n", "IP", "score",
"expires");
header_printed = true;
}
@@ -1142,13 +1142,12 @@ static int handle_list_banned_cmd(struct unix_ctx *ctx, const char *arg,
print_single_value_int(out, params, "Score",
rep->info[i]->score, 0);
} else {
fprintf(out, "%14s %14u %30s (%s)\n", txt_ip,
(unsigned int)rep->info[i]->score,
str_since, tmpbuf);
fprintf(out, "%15s %10u %30s (%s)\n", txt_ip,
rep->info[i]->score, str_since, tmpbuf);
}
} else {
if (!header_printed && NO_JSON(params)) {
fprintf(out, "%14s %14s\n", "IP", "score");
fprintf(out, "%15s %10s\n", "IP", "score");
header_printed = true;
}
print_start_block(out, params);
@@ -1159,8 +1158,8 @@ static int handle_list_banned_cmd(struct unix_ctx *ctx, const char *arg,
print_single_value_int(out, params, "Score",
rep->info[i]->score, 0);
} else {
fprintf(out, "%14s %14u\n", txt_ip,
(unsigned int)rep->info[i]->score);
fprintf(out, "%15s %10u\n", txt_ip,
rep->info[i]->score);
}
}