summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-22 13:05:48 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-22 13:05:48 +1000
commit537d716831e65176b7ec1ac52b7ea370d1e9e7c0 (patch)
tree1da6f445c2bd028693db7ce52143b268b76a4880
parent8ceeb269937e6956d6b97948d9d8f717d17d3eaf (diff)
- (dtucker) [openbsd-compat/port-aix.c] Use correct include for xmalloc.h,
add canohost.h to stop warning. Based on patch from openssh-unix-dev at thewrittenword.com
-rw-r--r--ChangeLog5
-rw-r--r--openbsd-compat/port-aix.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 29951f6d..fb121b12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
- (dtucker) [uidswap.c] Don't test restoration of uid on Cygwin since the
OS does not support permanently dropping privileges. Patch from
vinschen at redhat.com.
+ - (dtucker) [openbsd-compat/port-aix.c] Use correct include for xmalloc.h,
+ add canohost.h to stop warning. Based on patch from openssh-unix-dev at
+ thewrittenword.com
20030919
- (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
@@ -1151,4 +1154,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.2994.2.21 2003/09/22 02:55:20 dtucker Exp $
+$Id: ChangeLog,v 1.2994.2.22 2003/09/22 03:05:48 dtucker Exp $
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c
index 7a981634..9fbcce93 100644
--- a/openbsd-compat/port-aix.c
+++ b/openbsd-compat/port-aix.c
@@ -27,11 +27,12 @@
#include "ssh.h"
#include "log.h"
#include "servconf.h"
+#include "canohost.h"
+#include "xmalloc.h"
#ifdef _AIX
#include <uinfo.h>
-#include <../xmalloc.h>
#include "port-aix.h"
extern ServerOptions options;