diff options
| author | Damien Miller <djm@mindrot.org> | 2001-11-15 08:40:45 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-11-15 08:40:45 +1100 |
| commit | efdc1f179de4e2bbfa9b37353c42e04b0eb400c6 (patch) | |
| tree | 4c04f0966871100481203345cabd28546327f34c | |
| parent | 353f60874037c5cd5ae8245c348b2665017fd850 (diff) | |
- (djm) Fix IPv4 default in ssh-keyscan. Spotted by Dan Astoorian
<djast@cs.toronto.edu> Fix from markus@
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ssh-keyscan.c | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,7 @@ +20011115 + - (djm) Fix IPv4 default in ssh-keyscan. Spotted by Dan Astoorian + <djast@cs.toronto.edu> Fix from markus@ + 20011113 - (djm) Fix early (and double) free of remote user when using Kerberos. Patch from Simon Wilkinson <simon@sxw.org.uk> @@ -6907,4 +6911,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1663 2001/11/13 13:05:57 djm Exp $ +$Id: ChangeLog,v 1.1664 2001/11/14 21:40:45 djm Exp $ diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 52049139..3fbe88d5 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -36,7 +36,11 @@ RCSID("$OpenBSD: ssh-keyscan.c,v 1.30 2001/10/08 19:05:05 markus Exp $"); /* Flag indicating whether IPv4 or IPv6. This can be set on the command line. Default value is AF_UNSPEC means both IPv4 and IPv6. */ +#ifdef IPV4_DEFAULT +int IPv4or6 = AF_INET; +#else int IPv4or6 = AF_UNSPEC; +#endif int ssh_port = SSH_DEFAULT_PORT; |