Use --strict-order with dnsmasq

diff --git a/ChangeLog b/ChangeLog
index 35ad44e6dee4ad54fb8e5d907559d64cd44f14e5..438c867bb4ab057402f70f4456fe61e37fc24b60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed May  2 11:50:35 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * qemud/qemud.c: Use --strict-order when running dnsmasq
+
 Mon Apr 30 18:33:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * src/libvirt.c, src/driver.h, src/proxy_internal.c,

diff --git a/qemud/qemud.c b/qemud/qemud.c
index 7d67bde062f25224f1bde1bdae2d6a6ee7f4808e..e2f28180fad56b20f3e98c43a5d45f7b2668c51e 100644 (file)
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -1110,6 +1110,7 @@ qemudBuildDnsmasqArgv(struct qemud_server *server,
     len =
         1 + /* dnsmasq */
         1 + /* --keep-in-foreground */
+        1 + /* --strict-order */
         1 + /* --bind-interfaces */
         2 + /* --pid-file "" */
         2 + /* --conf-file "" */
@@ -1133,6 +1134,11 @@ qemudBuildDnsmasqArgv(struct qemud_server *server,
     APPEND_ARG(*argv, i++, "dnsmasq");
 
     APPEND_ARG(*argv, i++, "--keep-in-foreground");
+    /*
+     * Needed to ensure dnsmasq uses same algorithm for processing
+     * multiple nameserver entries in /etc/resolv.conf as GLibC.
+     */
+    APPEND_ARG(*argv, i++, "--strict-order");
     APPEND_ARG(*argv, i++, "--bind-interfaces");
 
     APPEND_ARG(*argv, i++, "--pid-file");