tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 17:25:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) Set ai_socktype and ai_protocol in fake-getaddrinfo.c. ok djm@

Browse Source
This commit is contained in:
Darren Tucker 2003-05-14 21:48:51 +10:00
parent be64d43d01
commit abef5628e8
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -83,6 +83,7 @@
--with-pam --with-pam
- (djm) Die screaming if start_pam() is called when UsePAM=no - (djm) Die screaming if start_pam() is called when UsePAM=no
- (djm) Avoid KrbV leak for MIT Kerberos - (djm) Avoid KrbV leak for MIT Kerberos
- (dtucker) Set ai_socktype and ai_protocol in fake-getaddrinfo.c. ok djm@
20030512 20030512
- (djm) Redhat spec: Don't install profile.d scripts when not - (djm) Redhat spec: Don't install profile.d scripts when not
@ -1470,4 +1471,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2698 2003/05/14 09:31:12 djm Exp $ $Id: ChangeLog,v 1.2699 2003/05/14 11:48:51 dtucker Exp $

23
openbsd-compat/fake-getaddrinfo.c
View File

@ -12,7 +12,7 @@
#include "includes.h" #include "includes.h"
#include "ssh.h" #include "ssh.h"
RCSID("$Id: fake-getaddrinfo.c,v 1.5 2003/03/24 02:35:59 djm Exp $"); RCSID("$Id: fake-getaddrinfo.c,v 1.6 2003/05/14 11:48:51 dtucker Exp $");
#ifndef HAVE_GAI_STRERROR #ifndef HAVE_GAI_STRERROR
char *gai_strerror(int ecode) char *gai_strerror(int ecode)
@ -41,7 +41,8 @@ void freeaddrinfo(struct addrinfo *ai)
#endif /* !HAVE_FREEADDRINFO */ #endif /* !HAVE_FREEADDRINFO */
#ifndef HAVE_GETADDRINFO #ifndef HAVE_GETADDRINFO
static struct addrinfo *malloc_ai(int port, u_long addr) static struct addrinfo *malloc_ai(int port, u_long addr,
const struct addrinfo *hints)
{ {
struct addrinfo *ai; struct addrinfo *ai;
@ -59,6 +60,15 @@ static struct addrinfo *malloc_ai(int port, u_long addr)
((struct sockaddr_in *)(ai)->ai_addr)->sin_port = port; ((struct sockaddr_in *)(ai)->ai_addr)->sin_port = port;
((struct sockaddr_in *)(ai)->ai_addr)->sin_addr.s_addr = addr; ((struct sockaddr_in *)(ai)->ai_addr)->sin_addr.s_addr = addr;
/* XXX: the following is not generally correct, but does what we want */
if (hints->ai_socktype)
ai->ai_socktype = hints->ai_socktype;
else
ai->ai_socktype = SOCK_STREAM;
if (hints->ai_protocol)
ai->ai_protocol = hints->ai_protocol;
return(ai); return(ai);
} }
@ -90,21 +100,21 @@ int getaddrinfo(const char *hostname, const char *servname,
addr = htonl(0x00000000); addr = htonl(0x00000000);
if (hostname && inet_aton(hostname, &in) != 0) if (hostname && inet_aton(hostname, &in) != 0)
addr = in.s_addr; addr = in.s_addr;
if (NULL != (*res = malloc_ai(port, addr))) if (NULL != (*res = malloc_ai(port, addr, hints)))
return 0; return 0;
else else
return EAI_MEMORY; return EAI_MEMORY;
} }
if (!hostname) { if (!hostname) {
if (NULL != (*res = malloc_ai(port, htonl(0x7f000001)))) if (NULL != (*res = malloc_ai(port, htonl(0x7f000001), hints)))
return 0; return 0;
else else
return EAI_MEMORY; return EAI_MEMORY;
} }
if (inet_aton(hostname, &in)) { if (inet_aton(hostname, &in)) {
if (NULL != (*res = malloc_ai(port, in.s_addr))) if (NULL != (*res = malloc_ai(port, in.s_addr, hints)))
return 0; return 0;
else else
return EAI_MEMORY; return EAI_MEMORY;
@ -113,7 +123,8 @@ int getaddrinfo(const char *hostname, const char *servname,
hp = gethostbyname(hostname); hp = gethostbyname(hostname);
if (hp && hp->h_name && hp->h_name[0] && hp->h_addr_list[0]) { if (hp && hp->h_name && hp->h_name[0] && hp->h_addr_list[0]) {
for (i = 0; hp->h_addr_list[i]; i++) { for (i = 0; hp->h_addr_list[i]; i++) {
cur = malloc_ai(port, ((struct in_addr *)hp->h_addr_list[i])->s_addr); cur = malloc_ai(port,
((struct in_addr *)hp->h_addr_list[i])->s_addr, hints);
if (cur == NULL) { if (cur == NULL) {
if (*res) if (*res)
freeaddrinfo(*res); freeaddrinfo(*res);