Merge pull request #15504 from poettering/cmsg-find-pure

[thirdparty/systemd.git] / src / resolve / resolved-dns-query.c

diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c
index 7a4f97754b1c23a68dd738bc13a7240eb1798715..4a41921cf3f2ad66f60a21926f4d9d1621b68571 100644 (file)
--- a/src/resolve/resolved-dns-query.c
+++ b/src/resolve/resolved-dns-query.c
@@ -387,10 +387,8 @@ DnsQuery *dns_query_free(DnsQuery *q) {
 
         if (q->request_dns_stream) {
                 /* Detach the stream from our query, in case something else keeps a reference to it. */
-                q->request_dns_stream->complete = NULL;
-                q->request_dns_stream->on_packet = NULL;
-                q->request_dns_stream->query = NULL;
-                dns_stream_unref(q->request_dns_stream);
+                (void) set_remove(q->request_dns_stream->queries, q);
+                q->request_dns_stream = dns_stream_unref(q->request_dns_stream);
         }
 
         free(q->request_address_string);
@@ -719,7 +717,7 @@ int dns_query_go(DnsQuery *q) {
 
                 match = dns_scope_good_domain(s, q->ifindex, q->flags, name);
                 if (match < 0) {
-                        log_debug("Couldn't check if '%s' matches agains scope, ignoring.", name);
+                        log_debug("Couldn't check if '%s' matches against scope, ignoring.", name);
                         continue;
                 }