[Merge] ~mirespace/ubuntu/+source/dnsmasq:dnsmasq-focal-1995260-NODATA into ubuntu/+source/dnsmasq:ubuntu/focal-devel

Wed Nov 16 09:14:15 UTC 2022

You have been requested to review the proposed merge of ~mirespace/ubuntu/+source/dnsmasq:dnsmasq-focal-1995260-NODATA into ubuntu/+source/dnsmasq:ubuntu/focal-devel.

For more details, see:
https://code.launchpad.net/~mirespace/ubuntu/+source/dnsmasq/+git/dnsmasq/+merge/433106

Hi team,

Cherry-picked existing commit fix from upstream https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=162e5e0062ce923c494cc64282f293f0ed64fc10:

  * src/cache.c: Apply 162e5e0062ce923c494cc64282f293f0ed64fc10 from
    upstream GIT to fix bug in DNS non-terminal code, added in 2.80,
    which could sometimes cause a NODATA rather than an NXDOMAIN
    reply (LP: #1995260).

Please, tag & sponsor.

PPA: ppa:mirespace/sru-dnsmasq-focal-1995260-nodata  
     https://launchpad.net/~mirespace/+archive/ubuntu/sru-dnsmasq-focal-1995260-nodata

The package is native, so I applied the commit directly. 
The package has not DEP8 tests.

Lintian throws an error (E: dnsmasq source: malformed-debian-changelog-version 2.80-1.1ubuntu1.6 (for native)), but I followed the used one "series" for the version.

I filed the SRU template in the bug (but not tagged sru-needed yet, until this MP is approved) . Steps to test:

[ Test Plan ]

In a focal VM, before disabling systemd-resolved (https://askubuntu.com/questions/907246/how-to-disable-systemd-resolved-in-ubuntu), install dnsmasq (apt install dnsmasq-base) if it wasn't installed yet.

#0 Enabling and checking name resolution through dnsmasq

# sudo lsof -i -P -n | grep LISTEN
sshd 221 root 3u IPv4 120681 0t0 TCP *:22 (LISTEN)
sshd 221 root 4u IPv6 120692 0t0 TCP *:22 (LISTEN)

# dnsmasq --server 8.8.8.8
# sudo lsof -i -P -n | grep LISTEN
sshd 221 root 3u IPv4 120681 0t0 TCP *:22 (LISTEN)
sshd 221 root 4u IPv6 120692 0t0 TCP *:22 (LISTEN)
dnsmasq 1485 nobody 5u IPv4 183531 0t0 TCP *:53 (LISTEN)
dnsmasq 1485 nobody 7u IPv6 183533 0t0 TCP *:53 (LISTEN)

# ping www.google.com
PING [www.google.com](http://www.google.com/) (142.250.200.68) 56(84) bytes of data.
64 bytes from [mad07s24-in-f4.1e100.net](http://mad07s24-in-f4.1e100.net/) (142.250.200.68): icmp_seq=1 ttl=114 time=16.5 ms
64 bytes from [mad07s24-in-f4.1e100.net](http://mad07s24-in-f4.1e100.net/) (142.250.200.68): icmp_seq=2 ttl=114 time=19.4 ms
^C
--- [www.google.com](http://www.google.com/) ping statistics ---
2 packets transmitted, 2 received, 0% packet loss, time 1002ms
rtt min/avg/max/mdev = 16.468/17.927/19.387/1.459 ms

#1 Bad case

# for i in srv txt aaaa a aaaa a txt srv; do host -t $i test.foo. 127.0.0.1 | tail -n 1; done
Host test.foo. not found: 3(NXDOMAIN)
Host test.foo. not found: 3(NXDOMAIN)
Host test.foo. not found: 3(NXDOMAIN)
test.foo has no A record
Host test.foo. not found: 3(NXDOMAIN)
test.foo has no A record
test.foo has no TXT record
test.foo has no SRV record

#2 Good case (After Installing the new package  and kill previous dnsmasq process)

# for i in srv txt aaaa a aaaa a txt srv; do host -t $i test.foo. 127.0.0.1 | tail -n 1; done
test.foo has no SRV record
test.foo has no TXT record
Host test.foo. not found: 3(NXDOMAIN)
test.foo has no A record
Host test.foo. not found: 3(NXDOMAIN)
test.foo has no A record
test.foo has no TXT record
test.foo has no SRV record
root at F-dnsmasq:~# ps -ef | grep dnsmasq
nobody 1485 1 0 11:33 ? 00:00:00 dnsmasq --server 8.8.8.8
root 1863 390 0 11:44 pts/1 00:00:00 grep --color=auto dnsmasq
# pkill dnsmasq
# dnsmasq --server 8.8.8.8
# for i in srv txt aaaa a aaaa a txt srv; do host -t $i test.foo. 127.0.0.1 | tail -n 1; done
Host test.foo. not found: 3(NXDOMAIN)
Host test.foo. not found: 3(NXDOMAIN)
Host test.foo. not found: 3(NXDOMAIN)
Host test.foo. not found: 3(NXDOMAIN)
Host test.foo. not found: 3(NXDOMAIN)
Host test.foo. not found: 3(NXDOMAIN)
Host test.foo. not found: 3(NXDOMAIN)
Host test.foo. not found: 3(NXDOMAIN)

Thanks in advance for your time reviewing this!

-- 
Your team Ubuntu Server Developers is requested to review the proposed merge of ~mirespace/ubuntu/+source/dnsmasq:dnsmasq-focal-1995260-NODATA into ubuntu/+source/dnsmasq:ubuntu/focal-devel.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1013 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20221116/5fa2f739/attachment-0001.diff>