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

This commit is contained in:
Micah Cowan 2008-05-17 13:23:47 -07:00
parent ecdfa5b1bc
commit 7c46e0f2c1
2 changed files with 6 additions and 2 deletions

View File

@ -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>

View File

@ -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));