Apply Kenneth Parnell's patch for prefer_family, in addition to Steven Schubiger...

diff --git a/src/ChangeLog b/src/ChangeLog
index dbc42bd33b2bbe67ce55d0b46bcab282851b6a98..7c1869b03dab984d5bc48d1a27c2f42872e89c99 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,11 @@
-2008-05-17  Micah Cowan  <micah@cowan.name>
+2008-05-17  Steven Schubiger  <schubiger@gmail.com>
 
        * init.c (defaults): Set the preferred IP family to `none' by
        default.
+
+2008-05-17  Kenny Parnell  <k.parnell@gmail.com>
+       (cmd_spec_prefer_family): Initialize prefer_family to prefer_none.
+
        * main.c (main): Handle Ctrl-D on command-line.
 
 2008-05-15  Steven Schubiger  <schubiger@gmail.com>

diff --git a/src/init.c b/src/init.c
index 533bb683ee13737f0d4f9b3dac821fdec7ed7e13..97976553164c2bb6827c79e430a3ec417f1b1973 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -1156,7 +1156,7 @@ cmd_spec_prefer_family (const char *com, const char *val, void *place_ignored)
     { "IPv6", prefer_ipv6 },
     { "none", prefer_none },
   };
-  int prefer_family = prefer_ipv4;
+  int prefer_family = prefer_none;
   int ok = decode_string (val, choices, countof (choices), &prefer_family);
   if (!ok)
     fprintf (stderr, _("%s: %s: Invalid value %s.\n"), exec_name, com, quote (val));