shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-18 06:03:42 +03:00
Code

resolvectl: remove duplicate ':' from output

Browse Source 
The second argument to dump_list() actually ends up in a TABLE_FIELD
cell now, where we implicitly append a ":". Hence drop it from the
strings.

Follow-up for: 37a50123fac050c7ccde4afcf3f37ee77aad012c

(cherry picked from commit ef503f1cec53f654780591adee6e3e223b575f56)
(cherry picked from commit c01cdcfb8a38e8e0eadf6feab71fe6547b1acc1d)
This commit is contained in:
Lennart Poettering 2023-01-05 17:34:18 +01:00 committed by Luca Boccassi
parent 51d6ffb854
commit 2ac8824885
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/resolve/resolvectl.c
View File

@ -1923,15 +1923,15 @@ static int status_global(sd_bus *bus, StatusMode mode, bool *empty_line) {
return table_log_add_error(r); return table_log_add_error(r);
} }
r = dump_list(table, "DNS Servers:", global_info.dns_ex ?: global_info.dns); r = dump_list(table, "DNS Servers", global_info.dns_ex ?: global_info.dns);
if (r < 0) if (r < 0)
return r; return r;
r = dump_list(table, "Fallback DNS Servers:", global_info.fallback_dns_ex ?: global_info.fallback_dns); r = dump_list(table, "Fallback DNS Servers", global_info.fallback_dns_ex ?: global_info.fallback_dns);
if (r < 0) if (r < 0)
return r; return r;
r = dump_list(table, "DNS Domain:", global_info.domains); r = dump_list(table, "DNS Domain", global_info.domains);
if (r < 0) if (r < 0)
return r; return r;