summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2022-01-20 05:24:31 +0900
committerLuca Boccassi <bluca@debian.org>2022-02-15 01:13:47 +0000
commitbfa7063dac7173858ddddda7c49eda95a9dd89bf (patch)
tree1f3534ff234ad0d8894fdfe66f0cf3b516442835
parentaf8d87d6bc8506629f1e73599ccdc4b8f8eaa6c8 (diff)
downloadsystemd-bfa7063dac7173858ddddda7c49eda95a9dd89bf.tar.gz
resolve: fix assertion triggered when r == 0
Fixes #22178. (cherry picked from commit 98b1eb711cfc70776fefd3d4ec437a6a4f9aeff2) (cherry picked from commit 740dd39e070b3b827cbac37df2a40d61bd9cdb89)
-rw-r--r--src/resolve/resolved-etc-hosts.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/resolve/resolved-etc-hosts.c b/src/resolve/resolved-etc-hosts.c
index 9af3a27bb1..a8da6c3d88 100644
--- a/src/resolve/resolved-etc-hosts.c
+++ b/src/resolve/resolved-etc-hosts.c
@@ -109,7 +109,10 @@ static int parse_line(EtcHosts *hosts, unsigned nr, const char *line) {
r = dns_name_is_valid_ldh(name);
if (r <= 0) {
- log_warning_errno(r, "/etc/hosts:%u: hostname \"%s\" is not valid, ignoring.", nr, name);
+ if (r < 0)
+ log_warning_errno(r, "/etc/hosts:%u: Failed to check the validity of hostname \"%s\", ignoring: %m", nr, name);
+ else
+ log_warning("/etc/hosts:%u: hostname \"%s\" is not valid, ignoring.", nr, name);
continue;
}