2 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 7e8392a43..1f11e32bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
  - (dtucker) [configure.ac defines.h] Only define SHUT_RD (and friends) and
    O_NONBLOCK if they're really needed.  Fixes build errors on HP-UX, old
    Linuxes and probably more.
+ - (dtucker) [configure.ac] OpenBSD needs <sys/types.h> before <sys/socket.h>
+   for SHUT_RD.
 
 20060711
  - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
@@ -4851,4 +4853,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4389 2006/07/12 09:01:29 dtucker Exp $
+$Id: ChangeLog,v 1.4390 2006/07/12 09:02:56 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 19446b3bd..3373dadc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.346 2006/07/12 04:14:31 dtucker Exp $
+# $Id: configure.ac,v 1.347 2006/07/12 09:02:57 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.346 $)
+AC_REVISION($Revision: 1.347 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -1285,7 +1285,11 @@ AC_CHECK_DECL(tcsendbreak,
 
 AC_CHECK_DECLS(h_errno, , ,[#include <netdb.h>])
 
-AC_CHECK_DECLS(SHUT_RD, , ,[#include <sys/socket.h>])
+AC_CHECK_DECLS(SHUT_RD, , ,
+        [
+#include <sys/types.h>
+#include <sys/socket.h>
+        ])
 
 AC_CHECK_DECLS(O_NONBLOCK, , ,
         [