[libvirt] [PATCH] remove dnsmasq command line parameter "--filterwin2k"
This patch removed the "--filterwin2k" dnsmasq command line parameter which was unnecessary for domain specification, possibly blocked some usage, and was command line clutter. Gene Czarcinski <gene@czarc.net> diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 53eebed..808c843 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -543,7 +543,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, /* need to specify local even if no domain specified */ virCommandAddArgFormat(cmd, "--local=/%s/", network->def->domain ? network->def->domain : ""); - virCommandAddArgList(cmd, "--domain-needed", "--filterwin2k", NULL); + virCommandAddArg(cmd, "--domain-needed"); if (pidfile) virCommandAddArgPair(cmd, "--pid-file", pidfile); diff --git a/tests/networkxml2argvdata/isolated-network.argv b/tests/networkxml2argvdata/isolated-network.argv index 276f42a..048c72b 100644 --- a/tests/networkxml2argvdata/isolated-network.argv +++ b/tests/networkxml2argvdata/isolated-network.argv @@ -1,5 +1,5 @@ @DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --except-interface lo --dhcp-option=3 --no-resolv \ --listen-address 192.168.152.1 \ --dhcp-range 192.168.152.2,192.168.152.254 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-hosts.argv b/tests/networkxml2argvdata/nat-network-dns-hosts.argv index 8040e2a..03a0676 100644 --- a/tests/networkxml2argvdata/nat-network-dns-hosts.argv +++ b/tests/networkxml2argvdata/nat-network-dns-hosts.argv @@ -1,4 +1,4 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ ---local=/example.com/ --domain-needed --filterwin2k \ +--local=/example.com/ --domain-needed \ --conf-file= --except-interface lo --listen-address 192.168.122.1 \ --expand-hosts --addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts\ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv index bb50fd6..a1e4200 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record-minimal.argv @@ -1,7 +1,7 @@ @DNSMASQ@ \ --strict-order \ --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --except-interface lo \ --srv-host=name.tcp.,,,, \ --listen-address 192.168.122.1 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv index 36498f2..8af38c4 100644 --- a/tests/networkxml2argvdata/nat-network-dns-srv-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-srv-record.argv @@ -1,7 +1,7 @@ @DNSMASQ@ \ --strict-order \ --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --except-interface lo \ --srv-host=name.tcp.test-domain-name,.,1024,10,10 \ --listen-address 192.168.122.1 \ diff --git a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv index 2a6c799..404b56a 100644 --- a/tests/networkxml2argvdata/nat-network-dns-txt-record.argv +++ b/tests/networkxml2argvdata/nat-network-dns-txt-record.argv @@ -1,5 +1,5 @@ @DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --except-interface lo '--txt-record=example,example value' \ --listen-address 192.168.122.1 --listen-address 192.168.123.1 \ --listen-address 2001:db8:ac10:fe01::1 \ diff --git a/tests/networkxml2argvdata/nat-network.argv b/tests/networkxml2argvdata/nat-network.argv index 265b931..1dc8f73 100644 --- a/tests/networkxml2argvdata/nat-network.argv +++ b/tests/networkxml2argvdata/nat-network.argv @@ -1,5 +1,5 @@ @DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --except-interface lo --listen-address 192.168.122.1 \ --listen-address 192.168.123.1 --listen-address 2001:db8:ac10:fe01::1 \ --listen-address 2001:db8:ac10:fd01::1 --listen-address 10.24.10.1 \ diff --git a/tests/networkxml2argvdata/netboot-network.argv b/tests/networkxml2argvdata/netboot-network.argv index 4f998d5..5a85ec2 100644 --- a/tests/networkxml2argvdata/netboot-network.argv +++ b/tests/networkxml2argvdata/netboot-network.argv @@ -1,5 +1,5 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ ---local=/example.com/ --domain-needed --filterwin2k --conf-file= \ +--local=/example.com/ --domain-needed --conf-file= \ --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/netboot-proxy-network.argv b/tests/networkxml2argvdata/netboot-proxy-network.argv index 89319ef..36836b0 100644 --- a/tests/networkxml2argvdata/netboot-proxy-network.argv +++ b/tests/networkxml2argvdata/netboot-proxy-network.argv @@ -1,5 +1,5 @@ @DNSMASQ@ --strict-order --bind-interfaces --domain=example.com \ ---local=/example.com/ --domain-needed --filterwin2k --conf-file= \ +--local=/example.com/ --domain-needed --conf-file= \ --except-interface lo --listen-address 192.168.122.1 \ --dhcp-range 192.168.122.2,192.168.122.254 \ --dhcp-leasefile=/var/lib/libvirt/dnsmasq/netboot.leases \ diff --git a/tests/networkxml2argvdata/routed-network.argv b/tests/networkxml2argvdata/routed-network.argv index ac43991..77e802f 100644 --- a/tests/networkxml2argvdata/routed-network.argv +++ b/tests/networkxml2argvdata/routed-network.argv @@ -1,3 +1,3 @@ @DNSMASQ@ --strict-order --bind-interfaces \ ---local=// --domain-needed --filterwin2k --conf-file= \ +--local=// --domain-needed --conf-file= \ --except-interface lo --listen-address 192.168.122.1\
On 09/06/2012 10:08 AM, Gene Czarcinski wrote:
This patch removed the "--filterwin2k" dnsmasq command line parameter which was unnecessary for domain specification, possibly blocked some usage, and was command line clutter.
Gene Czarcinski <gene@czarc.net>
ACK and pushed. 'git am' didn't like the mail (it came through with horrible whitespace corruption), so I had to hand-apply the entire patch (manual tweak of bridge-driver.c, then a sed script to touch up the 9 test files), but I don't mind helping out on a first message while you are still learning git. But expect a request for a repost if this happens on future patches :) -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On 09/06/2012 01:00 PM, Eric Blake wrote:
On 09/06/2012 10:08 AM, Gene Czarcinski wrote:
This patch removed the "--filterwin2k" dnsmasq command line parameter which was unnecessary for domain specification, possibly blocked some usage, and was command line clutter.
Gene Czarcinski <gene@czarc.net>
ACK and pushed. 'git am' didn't like the mail (it came through with horrible whitespace corruption), so I had to hand-apply the entire patch (manual tweak of bridge-driver.c, then a sed script to touch up the 9 test files), but I don't mind helping out on a first message while you are still learning git. But expect a request for a repost if this happens on future patches :)
I expect the the problem must be that I am using thunderbird as my regular email client. Now that I have more info about using "git send-email", maybe next time will be better. I am sorry that this caused you more work. I thought about attaching the patch but the hacker document specifically requested inline and attached patches. Gene Gene
On 09/06/2012 01:54 PM, Gene Czarcinski wrote:
On 09/06/2012 01:00 PM, Eric Blake wrote:
On 09/06/2012 10:08 AM, Gene Czarcinski wrote:
This patch removed the "--filterwin2k" dnsmasq command line parameter which was unnecessary for domain specification, possibly blocked some usage, and was command line clutter.
Gene Czarcinski <gene@czarc.net>
ACK and pushed. 'git am' didn't like the mail (it came through with horrible whitespace corruption), so I had to hand-apply the entire patch (manual tweak of bridge-driver.c, then a sed script to touch up the 9 test files), but I don't mind helping out on a first message while you are still learning git. But expect a request for a repost if this happens on future patches :)
I expect the the problem must be that I am using thunderbird as my regular email client. Now that I have more info about using "git send-email", maybe next time will be better.
Yes, Thunderbird does a very bad job of not mangling patches up. I've tried everything I can find and haven't found anything that makes it better.
I am sorry that this caused you more work. I thought about attaching the patch but the hacker document specifically requested inline and attached patches.
Heh. Yeah, I noticed that when making the small changes to HACKING yesterday. Despite what it says, though, when I find the need to send a patch via Thunderbird for some reason, I go against the recommendations of HACKING and send it as an attached file instead of in the body of the message. That produces an undamaged patch at the other end and, with Thunderbird at least, it's possible to make in "inline" reply to the patch by selecting the entire patch prior to hitting reply - this moves the patch into the body of the message (with quotes).
participants (3)
-
Eric Blake -
Gene Czarcinski -
Laine Stump