diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-02-10 15:27:34 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-02-10 15:27:34 +1100 |
commit | cfea2063e5e1f5d1415fd520f48730268e68d69e (patch) | |
tree | 2fb5446c3119d7414fe0eb9ff8fdbe2da39ba19b | |
parent | 0d86829fca3eaa01392a34547935f73463422c4e (diff) |
- (dtucker) [openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Move
include from port-aix.h to port-aix.c and remove unnecessary function
definition. Fixes build errors on AIX.
#include'ing auth.h in port-aix.h causes conflicting definitions of Authctxt
in sshconnect2.c. Sigh.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | openbsd-compat/port-aix.c | 1 | ||||
-rw-r--r-- | openbsd-compat/port-aix.h | 6 |
3 files changed, 6 insertions, 6 deletions
@@ -10,6 +10,9 @@ | |||
10 | - (dtucker) [auth-pam.c auth-pam.h session.c] Bug #14: Use do_pwchange to | 10 | - (dtucker) [auth-pam.c auth-pam.h session.c] Bug #14: Use do_pwchange to |
11 | change expired PAM passwords for SSHv1 connections without privsep. | 11 | change expired PAM passwords for SSHv1 connections without privsep. |
12 | pam_chauthtok is still used when privsep is disabled. ok djm@ | 12 | pam_chauthtok is still used when privsep is disabled. ok djm@ |
13 | - (dtucker) [openbsd-compat/port-aix.c openbsd-compat/port-aix.h] Move | ||
14 | include from port-aix.h to port-aix.c and remove unnecessary function | ||
15 | definition. Fixes build errors on AIX. | ||
13 | 16 | ||
14 | 20040207 | 17 | 20040207 |
15 | - (dtucker) OpenBSD CVS Sync | 18 | - (dtucker) OpenBSD CVS Sync |
@@ -1833,4 +1836,4 @@ | |||
1833 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1836 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1834 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1837 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1835 | 1838 | ||
1836 | $Id: ChangeLog,v 1.3221 2004/02/10 02:23:28 dtucker Exp $ | 1839 | $Id: ChangeLog,v 1.3222 2004/02/10 04:27:34 dtucker Exp $ |
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index a5511bbef..2895f0d44 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c | |||
@@ -24,6 +24,7 @@ | |||
24 | * | 24 | * |
25 | */ | 25 | */ |
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | #include "auth.h" | ||
27 | #include "ssh.h" | 28 | #include "ssh.h" |
28 | #include "log.h" | 29 | #include "log.h" |
29 | #include "servconf.h" | 30 | #include "servconf.h" |
diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index ef03661ed..3118af9a9 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: port-aix.h,v 1.18 2004/02/10 01:50:20 dtucker Exp $ */ | 1 | /* $Id: port-aix.h,v 1.19 2004/02/10 04:27:35 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * | 4 | * |
@@ -36,9 +36,6 @@ | |||
36 | # include <usersec.h> | 36 | # include <usersec.h> |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | /* For Authctxt */ | ||
40 | #include "auth.h" | ||
41 | |||
42 | /* 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 */ |
43 | #ifdef r_type | 40 | #ifdef r_type |
44 | # undef r_type | 41 | # undef r_type |
@@ -66,7 +63,6 @@ void aix_usrinfo(struct passwd *); | |||
66 | 63 | ||
67 | #ifdef WITH_AIXAUTHENTICATE | 64 | #ifdef WITH_AIXAUTHENTICATE |
68 | # define CUSTOM_SYS_AUTH_PASSWD 1 | 65 | # define CUSTOM_SYS_AUTH_PASSWD 1 |
69 | int sys_auth_passwd(Authctxt *, const char *); | ||
70 | # define CUSTOM_FAILED_LOGIN 1 | 66 | # define CUSTOM_FAILED_LOGIN 1 |
71 | void record_failed_login(const char *, const char *); | 67 | void record_failed_login(const char *, const char *); |
72 | #endif | 68 | #endif |