From e33b60343b7cef82ec229d7bfec008d3a932f2ad Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Mon, 10 Jul 2006 21:08:34 +1000
Subject: [PATCH]    - stevesk@cvs.openbsd.org 2006/07/08 21:48:53     
 [monitor.c session.c]      missed these from last commit:      move #include
 <sys/socket.h> out of includes.h

---
 ChangeLog | 6 +++++-
 monitor.c | 3 ++-
 session.c | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 162881faa..9d93ab4a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,10 @@
      [monitor_fdpass.c nchan.c packet.c servconf.c sftp.c ssh-agent.c]
      [ssh-keyscan.c ssh.c sshconnect.h sshd.c sshlogin.h]
      move #include <sys/socket.h> out of includes.h
+   - stevesk@cvs.openbsd.org 2006/07/08 21:48:53
+     [monitor.c session.c]
+     missed these from last commit:
+     move #include <sys/socket.h> out of includes.h
 
 20060706
  - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4794,4 +4798,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.4374 2006/07/10 11:08:03 djm Exp $
+$Id: ChangeLog,v 1.4375 2006/07/10 11:08:34 djm Exp $
diff --git a/monitor.c b/monitor.c
index 4a295d312..f01f921ae 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.78 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: monitor.c,v 1.79 2006/07/08 21:48:53 stevesk Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -30,6 +30,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
 
 #ifdef HAVE_PATHS_H
 #include <paths.h>
diff --git a/session.c b/session.c
index 8b1a9ed94..0a321be30 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.206 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: session.c,v 1.207 2006/07/08 21:48:53 stevesk Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved