From cfea2063e5e1f5d1415fd520f48730268e68d69e Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 10 Feb 2004 15:27:34 +1100
Subject:  - (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.
---
 openbsd-compat/port-aix.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'openbsd-compat/port-aix.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 @@
-/* $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
-- 
cgit v1.2.3