summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/openbsd-compat.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 56cee8708..6c4cf92c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -104,6 +104,8 @@
104 format is unchanged, otherwise the host name or address is enclosed 104 format is unchanged, otherwise the host name or address is enclosed
105 within square brackets in the same format as sshd's ListenAddress. 105 within square brackets in the same format as sshd's ListenAddress.
106 Tested by many, ok markus@. 106 Tested by many, ok markus@.
107 - (dtucker) [openbsd-compat/openbsd-compat.h] Need to include <sys/socket.h>
108 for struct sockaddr on platforms that use the fake-rfc stuff.
107 109
10820060706 11020060706
109 - (dtucker) [configure.ac] Try AIX blibpath test in different order when 111 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4837,4 +4839,4 @@
4837 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4839 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4838 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4840 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4839 4841
4840$Id: ChangeLog,v 1.4384 2006/07/10 13:04:19 dtucker Exp $ 4842$Id: ChangeLog,v 1.4385 2006/07/10 14:20:51 dtucker Exp $
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 6231e03a2..8b885178c 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
1/* $Id: openbsd-compat.h,v 1.38 2006/07/10 11:33:05 djm Exp $ */ 1/* $Id: openbsd-compat.h,v 1.39 2006/07/10 14:20:52 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved. 4 * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@@ -34,6 +34,8 @@
34#include <sys/types.h> 34#include <sys/types.h>
35#include <pwd.h> 35#include <pwd.h>
36 36
37#include <sys/socket.h>
38
37/* OpenBSD function replacements */ 39/* OpenBSD function replacements */
38#include "base64.h" 40#include "base64.h"
39#include "sigact.h" 41#include "sigact.h"