mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-01 01:36:11 +08:00
- (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.
This commit is contained in:
parent
0d86829fca
commit
cfea2063e5
@ -10,6 +10,9 @@
|
||||
- (dtucker) [auth-pam.c auth-pam.h session.c] Bug #14: Use do_pwchange to
|
||||
change expired PAM passwords for SSHv1 connections without privsep.
|
||||
pam_chauthtok is still used when privsep is disabled. ok djm@
|
||||
- (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.
|
||||
|
||||
20040207
|
||||
- (dtucker) OpenBSD CVS Sync
|
||||
@ -1833,4 +1836,4 @@
|
||||
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
|
||||
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
|
||||
|
||||
$Id: ChangeLog,v 1.3221 2004/02/10 02:23:28 dtucker Exp $
|
||||
$Id: ChangeLog,v 1.3222 2004/02/10 04:27:34 dtucker Exp $
|
||||
|
@ -24,6 +24,7 @@
|
||||
*
|
||||
*/
|
||||
#include "includes.h"
|
||||
#include "auth.h"
|
||||
#include "ssh.h"
|
||||
#include "log.h"
|
||||
#include "servconf.h"
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $Id: port-aix.h,v 1.18 2004/02/10 01:50:20 dtucker Exp $ */
|
||||
/* $Id: port-aix.h,v 1.19 2004/02/10 04:27:35 dtucker Exp $ */
|
||||
|
||||
/*
|
||||
*
|
||||
@ -36,9 +36,6 @@
|
||||
# include <usersec.h>
|
||||
#endif
|
||||
|
||||
/* For Authctxt */
|
||||
#include "auth.h"
|
||||
|
||||
/* Some versions define r_type in the above headers, which causes a conflict */
|
||||
#ifdef r_type
|
||||
# undef r_type
|
||||
@ -66,7 +63,6 @@ void aix_usrinfo(struct passwd *);
|
||||
|
||||
#ifdef WITH_AIXAUTHENTICATE
|
||||
# define CUSTOM_SYS_AUTH_PASSWD 1
|
||||
int sys_auth_passwd(Authctxt *, const char *);
|
||||
# define CUSTOM_FAILED_LOGIN 1
|
||||
void record_failed_login(const char *, const char *);
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user