From 607aede26c4193bf1bc5063698ea9a36cbd990e3 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Fri, 1 Sep 2006 15:48:19 +1000
Subject: [PATCH]  - (djm) [includes.h monitor.c openbsd-compat/bindresvport.c]
    [openbsd-compat/rresvport.c] Some more headers: netinet/in.h   
 sys/socket.h and unistd.h in various places

---
 ChangeLog                     | 7 +++++--
 includes.h                    | 2 ++
 monitor.c                     | 1 +
 openbsd-compat/bindresvport.c | 4 +++-
 openbsd-compat/rresvport.c    | 5 +++++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ebf308975..c00df6884 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,12 +8,15 @@
    [md5crypt.c monitor.c monitor_wrap.c readconf.c rsa.c]
    [scard-opensc.c scard.c session.c ssh-add.c ssh-agent.c ssh-dss.c]
    [ssh-keygen.c ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c]
-   [sshconnect1.c sshconnect2.c sshd.c rc4.diff]
+   [sshconnect1.c sshconnect2.c sshd.c]
    [openbsd-compat/bsd-cray.c openbsd-compat/port-aix.c]
    [openbsd-compat/port-linux.c openbsd-compat/port-solaris.c]
    [openbsd-compat/port-uw.c]
    Lots of headers for SCO OSR6, mainly adding stdarg.h for log.h;
    compile problems reported by rac AT tenzing.org
+ - (djm) [includes.h monitor.c openbsd-compat/bindresvport.c]
+   [openbsd-compat/rresvport.c] Some more headers: netinet/in.h 
+   sys/socket.h and unistd.h in various places
 
 20060831
  - (djm) [CREDITS LICENCE Makefile.in auth.c configure.ac includes.h ]
@@ -5365,4 +5368,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.4521 2006/09/01 05:38:36 djm Exp $
+$Id: ChangeLog,v 1.4522 2006/09/01 05:48:19 djm Exp $
diff --git a/includes.h b/includes.h
index 03665a3d3..2101f13c9 100644
--- a/includes.h
+++ b/includes.h
@@ -21,6 +21,7 @@
 #define _GNU_SOURCE /* activate extra prototypes for glibc */
 
 #include <sys/types.h>
+#include <sys/socket.h> /* For CMSG_* */
 
 #ifdef HAVE_LIMITS_H
 # include <limits.h> /* For PATH_MAX */
@@ -106,6 +107,7 @@
 #include <sys/ptms.h>	/* for grantpt() and friends */
 #endif
 
+#include <netinet/in.h>
 #include <netinet/in_systm.h> /* For typedefs */
 #ifdef HAVE_RPC_TYPES_H
 # include <rpc/types.h> /* For INADDR_LOOPBACK */
diff --git a/monitor.c b/monitor.c
index b3ccde017..364bd2316 100644
--- a/monitor.c
+++ b/monitor.c
@@ -43,6 +43,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #ifdef SKEY
 #include <skey.h>
diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c
index ef0eff3b6..e8fb83f23 100644
--- a/openbsd-compat/bindresvport.c
+++ b/openbsd-compat/bindresvport.c
@@ -33,8 +33,10 @@
 #include "includes.h"
 
 #ifndef HAVE_BINDRESVPORT_SA
+#include <sys/types.h>
+#include <sys/socket.h>
 
-#include "includes.h"
+#include <netinet/in.h>
 
 #include <errno.h>
 #include <string.h>
diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c
index 15790e852..17e66ca59 100644
--- a/openbsd-compat/rresvport.c
+++ b/openbsd-compat/rresvport.c
@@ -35,6 +35,11 @@
 
 #ifndef HAVE_RRESVPORT_AF
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>