diff options
| author | Tom Gundersen <teg@jklm.no> | 2016-01-20 11:30:20 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2016-01-20 11:30:20 +0100 |
| commit | f7e29f72bf5a440737bdf8a1fc81053b5f44cb64 (patch) | |
| tree | 333c2532daa887e206aec8947c9927be0900c75e /src/resolve/resolved-dns-scope.c | |
| parent | d619a0c4a5bf4f9d5796bcac77160a14e4e24cb6 (diff) | |
| parent | c69fa7e3c44240bedc0ee1bd89fecf954783ac85 (diff) | |
Merge pull request #2372 from poettering/dnssec17
resolved bus API improvements
Diffstat (limited to 'src/resolve/resolved-dns-scope.c')
| -rw-r--r-- | src/resolve/resolved-dns-scope.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index dd3609bd12..8a52d66fad 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -67,11 +67,9 @@ int dns_scope_new(Manager *m, DnsScope **ret, Link *l, DnsProtocol protocol, int * changes. */ if (l) - s->dnssec_mode = l->dnssec_mode; - if (s->dnssec_mode == _DNSSEC_MODE_INVALID) - s->dnssec_mode = m->dnssec_mode; - if (s->dnssec_mode == _DNSSEC_MODE_INVALID) - s->dnssec_mode = DNSSEC_NO; + s->dnssec_mode = link_get_dnssec_mode(l); + else + s->dnssec_mode = manager_get_dnssec_mode(m); } LIST_PREPEND(scopes, m->dns_scopes, s); |