diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-01-02 21:34:17 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2016-01-02 22:16:16 +0100 |
commit | f2af5ea3cbf54998ed41d2d21a3448abb92ca7ff (patch) | |
tree | 3cfaddba8d6f03804619fa43e6fee55d3de757b4 | |
parent | a8f158b9296c7bc1d0f627715e626cc50a331efc (diff) |
resolved: only suffix RR key names with a dot if they don't have one yet
-rw-r--r-- | src/resolve/resolved-dns-rr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c index 274e857586..4d47f48e9b 100644 --- a/src/resolve/resolved-dns-rr.c +++ b/src/resolve/resolved-dns-rr.c @@ -308,7 +308,7 @@ const struct hash_ops dns_resource_key_hash_ops = { int dns_resource_key_to_string(const DnsResourceKey *key, char **ret) { char cbuf[strlen("CLASS") + DECIMAL_STR_MAX(uint16_t)], tbuf[strlen("TYPE") + DECIMAL_STR_MAX(uint16_t)]; - const char *c, *t; + const char *c, *t, *n; char *s; /* If we cannot convert the CLASS/TYPE into a known string, @@ -326,7 +326,8 @@ int dns_resource_key_to_string(const DnsResourceKey *key, char **ret) { t = tbuf; } - if (asprintf(&s, "%s. %s %-5s", DNS_RESOURCE_KEY_NAME(key), c, t) < 0) + n = DNS_RESOURCE_KEY_NAME(key); + if (asprintf(&s, "%s%s %s %-5s", n, endswith(n, ".") ? "" : ".", c, t) < 0) return -ENOMEM; *ret = s; |