From 7ea6f204b67039e09c79dfb3049a88806e5d1ea3 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 10 Oct 2001 15:04:41 +1000 Subject: [PATCH] - markus@cvs.openbsd.org 2001/10/08 16:15:47 [sshconnect.c] use correct family for -b option --- ChangeLog | 5 ++++- sshconnect.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bcfc4a8ea..e208f8801 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,9 @@ - markus@cvs.openbsd.org 2001/10/08 11:48:57 [channels.c] better debug + - markus@cvs.openbsd.org 2001/10/08 16:15:47 + [sshconnect.c] + use correct family for -b option 20011007 - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys. @@ -6673,4 +6676,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1593 2001/10/10 05:04:20 djm Exp $ +$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 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.113 2001/10/06 11:18:19 markus Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.114 2001/10/08 16:15:47 markus Exp $"); #include @@ -204,7 +204,7 @@ ssh_create_socket(struct passwd *pw, int privileged, int family) return sock; memset(&hints, 0, sizeof(hints)); - hints.ai_family = IPv4or6; + hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE; gaierr = getaddrinfo(options.bind_address, "0", &hints, &res);