summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorYoshinobu Inoue <shin@FreeBSD.org>2000-02-19 16:50:55 +0000
committerYoshinobu Inoue <shin@FreeBSD.org>2000-02-19 16:50:55 +0000
commit5b8db68630dbc4c95094b4df63f7fab1531ec499 (patch)
tree7a56a9eacaad60c8906734857df3cb8935a7b322 /security
parentCorrect WWW (diff)
Use 'IPv4or6' instead of AF_UNSPEC for 1st getaddrinfo() ai_family.
Without this fix, still query to AAAA recored happens even if -4 options is specified. Reviewed by: green
Notes
Notes: svn path=/head/; revision=26011
Diffstat (limited to 'security')
-rw-r--r--security/openssh/files/patch-ak15
1 files changed, 12 insertions, 3 deletions
diff --git a/security/openssh/files/patch-ak b/security/openssh/files/patch-ak
index f76d52056c2e..079515e6e7e7 100644
--- a/security/openssh/files/patch-ak
+++ b/security/openssh/files/patch-ak
@@ -1,6 +1,6 @@
---- /usr/ports/distfiles/OpenSSH-1.2/src/usr.bin/ssh/ssh.c Tue Nov 23 18:57:50 1999
-+++ ./ssh.c Tue Nov 23 19:28:33 1999
-@@ -123,6 +123,9 @@
+--- ssh.c.orig Sat Feb 19 02:39:02 2000
++++ ssh.c Sat Feb 19 23:47:33 2000
+@@ -131,6 +131,9 @@
log("Using rsh. WARNING: Connection will not be encrypted.");
/* Build argument list for rsh. */
i = 0;
@@ -10,3 +10,12 @@
args[i++] = _PATH_RSH;
/* host may have to come after user on some systems */
args[i++] = host;
+@@ -490,7 +493,7 @@
+ int errgai;
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+- hints.ai_flags = AI_CANONNAME;
++ hints.ai_flags = IPv4or6;
+ hints.ai_socktype = SOCK_STREAM;
+ errgai = getaddrinfo(host, NULL, &hints, &ai);
+ if (errgai == 0) {