diff options
author | Damien Miller <djm@mindrot.org> | 2001-10-10 15:04:41 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-10-10 15:04:41 +1000 |
commit | 7ea6f204b67039e09c79dfb3049a88806e5d1ea3 (patch) | |
tree | d0890c12be3aec70ac5b3f5b4c8ea6dc4cbb520d | |
parent | d3c04b90e478c664635d66fb4e07bb3236c62cc1 (diff) |
- markus@cvs.openbsd.org 2001/10/08 16:15:47
[sshconnect.c]
use correct family for -b option
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshconnect.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -28,6 +28,9 @@ | |||
28 | - markus@cvs.openbsd.org 2001/10/08 11:48:57 | 28 | - markus@cvs.openbsd.org 2001/10/08 11:48:57 |
29 | [channels.c] | 29 | [channels.c] |
30 | better debug | 30 | better debug |
31 | - markus@cvs.openbsd.org 2001/10/08 16:15:47 | ||
32 | [sshconnect.c] | ||
33 | use correct family for -b option | ||
31 | 34 | ||
32 | 20011007 | 35 | 20011007 |
33 | - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys. | 36 | - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys. |
@@ -6673,4 +6676,4 @@ | |||
6673 | - Wrote replacements for strlcpy and mkdtemp | 6676 | - Wrote replacements for strlcpy and mkdtemp |
6674 | - Released 1.0pre1 | 6677 | - Released 1.0pre1 |
6675 | 6678 | ||
6676 | $Id: ChangeLog,v 1.1593 2001/10/10 05:04:20 djm Exp $ | 6679 | $Id: ChangeLog,v 1.1594 2001/10/10 05:04:41 djm Exp $ |
diff --git a/sshconnect.c b/sshconnect.c index 76b1a2703..7c928539e 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.113 2001/10/06 11:18:19 markus Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.114 2001/10/08 16:15:47 markus Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -204,7 +204,7 @@ ssh_create_socket(struct passwd *pw, int privileged, int family) | |||
204 | return sock; | 204 | return sock; |
205 | 205 | ||
206 | memset(&hints, 0, sizeof(hints)); | 206 | memset(&hints, 0, sizeof(hints)); |
207 | hints.ai_family = IPv4or6; | 207 | hints.ai_family = family; |
208 | hints.ai_socktype = SOCK_STREAM; | 208 | hints.ai_socktype = SOCK_STREAM; |
209 | hints.ai_flags = AI_PASSIVE; | 209 | hints.ai_flags = AI_PASSIVE; |
210 | gaierr = getaddrinfo(options.bind_address, "0", &hints, &res); | 210 | gaierr = getaddrinfo(options.bind_address, "0", &hints, &res); |