Merge pull request #4832 from rojkov/mdns

diff --cc man/systemd-resolve.xml
Simple merge

diff --cc src/resolve/resolve-tool.c
Simple merge

diff --cc src/resolve/resolved-dns-stub.c
index 9376b0fe4c5856e382d06343bd54d26341f4f407,932e5b58a23f83c903908cdb34625b622009f550..7d43825960e40a3ac049dbfb0f5ccd0050f4394a
--- 1/src/resolve/resolved-dns-stub.c
--- 2/src/resolve/resolved-dns-stub.c
+++ b/src/resolve/resolved-dns-stub.c
@@@ -70,7 -86,7 +70,7 @@@ static int dns_stub_make_reply_packet
  
                  continue;
          add:
-                 r = dns_packet_append_rr(*p, rr, NULL, NULL);
 -                r = dns_packet_append_rr(p, rr, 0, NULL, NULL);
++                r = dns_packet_append_rr(*p, rr, 0, NULL, NULL);
                  if (r < 0)
                          return r;
  

diff --cc src/resolve/resolved-dns-transaction.c
Simple merge

diff --cc src/resolve/resolved-manager.c
Simple merge

diff --cc src/resolve/resolved-manager.h
Simple merge