diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-07-23 12:34:34 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-07-23 12:34:34 +0200 |
| commit | b96c778a00555962e0f9233032f090d0d267c31a (patch) | |
| tree | 5790d06dc65d19419595b222cc2ada4f99378faa /src/resolve/resolved-dns-rr.c | |
| parent | f4955d321e6c08914cd2e1229df154aae8840d88 (diff) | |
| parent | f5430a3ef308f3a102899fcaf7fbece757082f2a (diff) | |
Merge pull request #669 from poettering/dns-rr-memdup
resolve: unify memdup() code when parsing RRs
Diffstat (limited to 'src/resolve/resolved-dns-rr.c')
| -rw-r--r-- | src/resolve/resolved-dns-rr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c index 9c12205ab8..9efe4b3c08 100644 --- a/src/resolve/resolved-dns-rr.c +++ b/src/resolve/resolved-dns-rr.c @@ -776,7 +776,7 @@ int dns_resource_record_to_string(const DnsResourceRecord *rr, char **ret) { case DNS_TYPE_NSEC3: { _cleanup_free_ char *salt = NULL, *hash = NULL; - if (rr->nsec3.salt_size) { + if (rr->nsec3.salt_size > 0) { salt = hexmem(rr->nsec3.salt, rr->nsec3.salt_size); if (!salt) return -ENOMEM; @@ -795,7 +795,7 @@ int dns_resource_record_to_string(const DnsResourceRecord *rr, char **ret) { rr->nsec3.algorithm, rr->nsec3.flags, rr->nsec3.iterations, - rr->nsec3.salt_size ? salt : "-", + rr->nsec3.salt_size > 0 ? salt : "-", hash, t); if (r < 0) @@ -809,7 +809,7 @@ int dns_resource_record_to_string(const DnsResourceRecord *rr, char **ret) { if (!t) return -ENOMEM; - r = asprintf(&s, "%s \\# %"PRIu8" %s", k, rr->generic.size, t); + r = asprintf(&s, "%s \\# %zu %s", k, rr->generic.size, t); if (r < 0) return -ENOMEM; break; |