chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolved: fix deserialization of UTF8 host names
[elogind.git]
/
src
/
resolve
/
resolved-dns-rr.c
diff --git
a/src/resolve/resolved-dns-rr.c
b/src/resolve/resolved-dns-rr.c
index 9ef3135c2302d2cad18b00e57881d5b4b79cc4ea..6cb4ed929e4b7c0049595cded7f3287924ee4f66 100644
(file)
--- a/
src/resolve/resolved-dns-rr.c
+++ b/
src/resolve/resolved-dns-rr.c
@@
-265,6
+265,10
@@
DnsResourceRecord* dns_resource_record_unref(DnsResourceRecord *rr) {
free(rr->mx.exchange);
break;
free(rr->mx.exchange);
break;
+ case DNS_TYPE_SSHFP:
+ free(rr->sshfp.key);
+ break;
+
case DNS_TYPE_LOC:
case DNS_TYPE_A:
case DNS_TYPE_AAAA:
case DNS_TYPE_LOC:
case DNS_TYPE_A:
case DNS_TYPE_AAAA:
@@
-326,7
+330,10
@@
int dns_resource_record_equal(const DnsResourceRecord *a, const DnsResourceRecor
if (r <= 0)
return r;
if (r <= 0)
return r;
- switch (a->key->type) {
+ if (a->unparseable != b->unparseable)
+ return 0;
+
+ switch (a->unparseable ? _DNS_TYPE_INVALID : a->key->type) {
case DNS_TYPE_SRV:
r = dns_name_equal(a->srv.name, b->srv.name);
case DNS_TYPE_SRV:
r = dns_name_equal(a->srv.name, b->srv.name);
@@
-393,6
+400,12
@@
int dns_resource_record_equal(const DnsResourceRecord *a, const DnsResourceRecor
a->loc.longitude == b->loc.longitude &&
a->loc.altitude == b->loc.altitude;
a->loc.longitude == b->loc.longitude &&
a->loc.altitude == b->loc.altitude;
+ case DNS_TYPE_SSHFP:
+ return a->sshfp.algorithm == b->sshfp.algorithm &&
+ a->sshfp.fptype == b->sshfp.fptype &&
+ a->sshfp.key_size == b->sshfp.key_size &&
+ memcmp(a->sshfp.key, b->sshfp.key, a->sshfp.key_size) == 0;
+
default:
return a->generic.size == b->generic.size &&
memcmp(a->generic.data, b->generic.data, a->generic.size) == 0;
default:
return a->generic.size == b->generic.size &&
memcmp(a->generic.data, b->generic.data, a->generic.size) == 0;
@@
-430,7
+443,6
@@
static char* format_location(uint32_t latitude, uint32_t longitude, uint32_t alt
return s;
}
return s;
}
-
int dns_resource_record_to_string(const DnsResourceRecord *rr, char **ret) {
_cleanup_free_ char *k = NULL;
char *s;
int dns_resource_record_to_string(const DnsResourceRecord *rr, char **ret) {
_cleanup_free_ char *k = NULL;
char *s;
@@
-555,6
+567,23
@@
int dns_resource_record_to_string(const DnsResourceRecord *rr, char **ret) {
break;
}
break;
}
+ case DNS_TYPE_SSHFP: {
+ _cleanup_free_ char *x = NULL;
+
+ x = hexmem(rr->sshfp.key, rr->sshfp.key_size);
+ if (!x)
+ return -ENOMEM;
+
+ r = asprintf(&s, "%s %u %u %s",
+ k,
+ rr->sshfp.algorithm,
+ rr->sshfp.fptype,
+ x);
+ if (r < 0)
+ return -ENOMEM;
+ break;
+ }
+
default: {
_cleanup_free_ char *x = NULL;
default: {
_cleanup_free_ char *x = NULL;