diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-08-21 15:26:45 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-08-21 15:26:45 +0200 |
| commit | ef7051360aefca01d20f700ee74ac1baced59879 (patch) | |
| tree | 7e74c19fc5928d35012d1ff99ddce20406cf92a6 /src/resolve/resolved-dns-zone.c | |
| parent | 6b8b67e7aed7d4f98881f823b89f5f4079e52066 (diff) | |
| parent | 78c6a153c47f8d597c827bdcaf8c4e42ac87f738 (diff) | |
Merge pull request #1002 from poettering/resolved-various
resolved: synthesize more RRs locally and other fixes
Diffstat (limited to 'src/resolve/resolved-dns-zone.c')
| -rw-r--r-- | src/resolve/resolved-dns-zone.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resolve/resolved-dns-zone.c b/src/resolve/resolved-dns-zone.c index 32d771a954..99d96c3f40 100644 --- a/src/resolve/resolved-dns-zone.c +++ b/src/resolve/resolved-dns-zone.c @@ -422,7 +422,7 @@ int dns_zone_lookup(DnsZone *z, DnsQuestion *q, DnsAnswer **ret_answer, DnsAnswe if (k < 0) return k; if (k > 0) { - r = dns_answer_add(answer, j->rr); + r = dns_answer_add(answer, j->rr, 0); if (r < 0) return r; @@ -448,7 +448,7 @@ int dns_zone_lookup(DnsZone *z, DnsQuestion *q, DnsAnswer **ret_answer, DnsAnswe if (j->state != DNS_ZONE_ITEM_PROBING) tentative = false; - r = dns_answer_add(answer, j->rr); + r = dns_answer_add(answer, j->rr, 0); if (r < 0) return r; } @@ -505,7 +505,7 @@ void dns_zone_item_conflict(DnsZoneItem *i) { i->state = DNS_ZONE_ITEM_WITHDRAWN; /* Maybe change the hostname */ - if (dns_name_equal(i->scope->manager->hostname, DNS_RESOURCE_KEY_NAME(i->rr->key)) > 0) + if (manager_is_own_hostname(i->scope->manager, DNS_RESOURCE_KEY_NAME(i->rr->key)) > 0) manager_next_hostname(i->scope->manager); } |