diff options
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/fake-rfc2553.c | 6 | ||||
-rw-r--r-- | openbsd-compat/fake-rfc2553.h | 4 | ||||
-rw-r--r-- | openbsd-compat/inet_ntoa.c | 1 | ||||
-rw-r--r-- | openbsd-compat/port-aix.c | 3 | ||||
-rw-r--r-- | openbsd-compat/port-aix.h | 6 |
5 files changed, 12 insertions, 8 deletions
diff --git a/openbsd-compat/fake-rfc2553.c b/openbsd-compat/fake-rfc2553.c index f44924836..b0cc69bd7 100644 --- a/openbsd-compat/fake-rfc2553.c +++ b/openbsd-compat/fake-rfc2553.c | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | 39 | ||
40 | RCSID("$Id: fake-rfc2553.c,v 1.4 2003/06/13 22:43:23 djm Exp $"); | 40 | RCSID("$Id: fake-rfc2553.c,v 1.4.2.1 2003/09/22 02:09:18 dtucker Exp $"); |
41 | 41 | ||
42 | #ifndef HAVE_GETNAMEINFO | 42 | #ifndef HAVE_GETNAMEINFO |
43 | int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, | 43 | int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, |
@@ -77,7 +77,11 @@ int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, | |||
77 | #endif /* !HAVE_GETNAMEINFO */ | 77 | #endif /* !HAVE_GETNAMEINFO */ |
78 | 78 | ||
79 | #ifndef HAVE_GAI_STRERROR | 79 | #ifndef HAVE_GAI_STRERROR |
80 | #ifdef HAVE_CONST_GAI_STRERROR_PROTO | ||
81 | const char * | ||
82 | #else | ||
80 | char * | 83 | char * |
84 | #endif | ||
81 | gai_strerror(int err) | 85 | gai_strerror(int err) |
82 | { | 86 | { |
83 | switch (err) { | 87 | switch (err) { |
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h index b70b928f8..2d5439296 100644 --- a/openbsd-compat/fake-rfc2553.h +++ b/openbsd-compat/fake-rfc2553.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fake-rfc2553.h,v 1.6 2003/08/29 16:59:52 mouring Exp $ */ | 1 | /* $Id: fake-rfc2553.h,v 1.6.2.1 2003/09/22 02:09:18 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (C) 2000-2003 Damien Miller. All rights reserved. | 4 | * Copyright (C) 2000-2003 Damien Miller. All rights reserved. |
@@ -137,7 +137,7 @@ int getaddrinfo(const char *, const char *, | |||
137 | const struct addrinfo *, struct addrinfo **); | 137 | const struct addrinfo *, struct addrinfo **); |
138 | #endif /* !HAVE_GETADDRINFO */ | 138 | #endif /* !HAVE_GETADDRINFO */ |
139 | 139 | ||
140 | #ifndef HAVE_GAI_STRERROR | 140 | #if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO) |
141 | char *gai_strerror(int); | 141 | char *gai_strerror(int); |
142 | #endif /* !HAVE_GAI_STRERROR */ | 142 | #endif /* !HAVE_GAI_STRERROR */ |
143 | 143 | ||
diff --git a/openbsd-compat/inet_ntoa.c b/openbsd-compat/inet_ntoa.c index e0384491d..f9fdc9ee5 100644 --- a/openbsd-compat/inet_ntoa.c +++ b/openbsd-compat/inet_ntoa.c | |||
@@ -43,7 +43,6 @@ static char rcsid[] = "$OpenBSD: inet_ntoa.c,v 1.4 2003/06/02 20:18:35 millert E | |||
43 | #include <netinet/in.h> | 43 | #include <netinet/in.h> |
44 | #include <arpa/inet.h> | 44 | #include <arpa/inet.h> |
45 | #include <stdio.h> | 45 | #include <stdio.h> |
46 | #include "inet_ntoa.h" | ||
47 | 46 | ||
48 | char *inet_ntoa(struct in_addr in) | 47 | char *inet_ntoa(struct in_addr in) |
49 | { | 48 | { |
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index 7a981634b..9fbcce936 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c | |||
@@ -27,11 +27,12 @@ | |||
27 | #include "ssh.h" | 27 | #include "ssh.h" |
28 | #include "log.h" | 28 | #include "log.h" |
29 | #include "servconf.h" | 29 | #include "servconf.h" |
30 | #include "canohost.h" | ||
31 | #include "xmalloc.h" | ||
30 | 32 | ||
31 | #ifdef _AIX | 33 | #ifdef _AIX |
32 | 34 | ||
33 | #include <uinfo.h> | 35 | #include <uinfo.h> |
34 | #include <../xmalloc.h> | ||
35 | #include "port-aix.h" | 36 | #include "port-aix.h" |
36 | 37 | ||
37 | extern ServerOptions options; | 38 | extern ServerOptions options; |
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 09e7f9e97..94c8c5119 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: port-aix.h,v 1.14 2003/08/29 16:59:52 mouring Exp $ */ | 1 | /* $Id: port-aix.h,v 1.14.2.1 2003/09/19 10:46:22 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * | 4 | * |
@@ -30,10 +30,10 @@ | |||
30 | #ifdef WITH_AIXAUTHENTICATE | 30 | #ifdef WITH_AIXAUTHENTICATE |
31 | # include <login.h> | 31 | # include <login.h> |
32 | # include <userpw.h> | 32 | # include <userpw.h> |
33 | # include <usersec.h> | 33 | # if defined(HAVE_SYS_AUDIT_H) && defined(AIX_LOGINFAILED_4ARG) |
34 | # ifdef HAVE_SYS_AUDIT_H | ||
35 | # include <sys/audit.h> | 34 | # include <sys/audit.h> |
36 | # endif | 35 | # endif |
36 | # include <usersec.h> | ||
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | /* Some versions define r_type in the above headers, which causes a conflict */ | 39 | /* Some versions define r_type in the above headers, which causes a conflict */ |