From 8d896617b46c55116f8c2b52eff554dd4b5122b0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 10 Jun 2022 09:42:24 +0900 Subject: [PATCH 1/2] dns-domain: use dns_name_concat() `dns_name_normalize()` is an alias of `dns_name_concat()`. For consistency with `dns_name_is_valid_ldh()`, let's use `dns_name_concat()`. --- src/shared/dns-domain.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/dns-domain.h b/src/shared/dns-domain.h index e5f3d4d9e7..08cb1cc2aa 100644 --- a/src/shared/dns-domain.h +++ b/src/shared/dns-domain.h @@ -40,8 +40,8 @@ static inline int dns_name_normalize(const char *s, DNSLabelFlags flags, char ** static inline int dns_name_is_valid(const char *s) { int r; - /* dns_name_normalize() verifies as a side effect */ - r = dns_name_normalize(s, 0, NULL); + /* dns_name_concat() verifies as a side effect */ + r = dns_name_concat(s, NULL, 0, NULL); if (r == -EINVAL) return 0; if (r < 0) From 47484dd95538a0f9f43add4f7655dcfa2b5d97d9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 10 Jun 2022 09:49:07 +0900 Subject: [PATCH 2/2] dns-domain: simplify code a bit --- src/shared/dns-domain.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/shared/dns-domain.c b/src/shared/dns-domain.c index 0ae1de1c5b..9acf1cb0d6 100644 --- a/src/shared/dns-domain.c +++ b/src/shared/dns-domain.c @@ -450,12 +450,8 @@ int dns_name_concat(const char *a, const char *b, DNSLabelFlags flags, char **_r return r; } - if (!first) - n++; - else - first = false; - - n += r; + n += r + !first; + first = false; } finish: