diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2005-02-15 21:45:57 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2005-02-15 21:45:57 +1100 |
| commit | 691d5235ca9485877e8345269b1be4b2cf1be322 (patch) | |
| tree | 7adbbdbb837a6d3d4953a6ea339ad9d9e6d289ce /openbsd-compat/port-aix.h | |
| parent | f04c3616756831fe987fe3e474c8c234c298e4cb (diff) | |
| download | openssh-git-691d5235ca9485877e8345269b1be4b2cf1be322.tar.gz | |
- (dtucker) [README.platform auth.c configure.ac loginrec.c
openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Bug #835: enable IPv6
on AIX where possible (see README.platform for details) and work around
a misfeature of AIX's getnameinfo. ok djm@
Diffstat (limited to 'openbsd-compat/port-aix.h')
| -rw-r--r-- | openbsd-compat/port-aix.h | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 75113900..cc7c43cd 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h @@ -1,4 +1,4 @@ -/* $Id: port-aix.h,v 1.22 2005/02/02 06:10:11 dtucker Exp $ */ +/* $Id: port-aix.h,v 1.23 2005/02/15 10:45:58 dtucker Exp $ */ /* * @@ -27,6 +27,10 @@ #ifdef _AIX +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif + #ifdef WITH_AIXAUTHENTICATE # include <login.h> # include <userpw.h> @@ -36,6 +40,8 @@ # include <usersec.h> #endif +#include "buffer.h" + /* Some versions define r_type in the above headers, which causes a conflict */ #ifdef r_type # undef r_type @@ -64,13 +70,23 @@ void aix_usrinfo(struct passwd *); #ifdef WITH_AIXAUTHENTICATE # define CUSTOM_SYS_AUTH_PASSWD 1 # define CUSTOM_SYS_AUTH_ALLOWED_USER 1 -int sys_auth_allowed_user(struct passwd *); +int sys_auth_allowed_user(struct passwd *, Buffer *); # define CUSTOM_SYS_AUTH_RECORD_LOGIN 1 -int sys_auth_record_login(const char *, const char *, const char *); +int sys_auth_record_login(const char *, const char *, const char *, Buffer *); # define CUSTOM_FAILED_LOGIN 1 #endif void aix_setauthdb(const char *); void aix_restoreauthdb(void); void aix_remove_embedded_newlines(char *); + +#if defined(AIX_GETNAMEINFO_HACK) && !defined(BROKEN_GETADDRINFO) +# ifdef getnameinfo +# undef getnameinfo +# endif +int sshaix_getnameinfo(const struct sockaddr *, size_t, char *, size_t, + char *, size_t, int); +# define getnameinfo(a,b,c,d,e,f,g) (sshaix_getnameinfo(a,b,c,d,e,f,g)) +#endif + #endif /* _AIX */ |