22 files changed, 54 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index c0b850342..162881faa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,11 @@
    - stevesk@cvs.openbsd.org 2006/07/06 17:36:37
      [monitor_wrap.h]
      typo in comment
+   - stevesk@cvs.openbsd.org 2006/07/08 21:47:12
+     [authfd.c canohost.c clientloop.c dns.c dns.h includes.h]
+     [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
 
 20060706
  - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4789,4 +4794,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.4373 2006/07/10 10:53:45 djm Exp $
+$Id: ChangeLog,v 1.4374 2006/07/10 11:08:03 djm Exp $
diff --git a/authfd.c b/authfd.c
index 0fa69bd2a..0d2b09ecc 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.74 2006/03/30 09:58:15 djm Exp $ */
+/* $OpenBSD: authfd.c,v 1.75 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -39,6 +39,7 @@
 
 #include <sys/types.h>
 #include <sys/un.h>
+#include <sys/socket.h>
 
 #include <openssl/evp.h>
 
diff --git a/canohost.c b/canohost.c
index 787d338d4..538b141b1 100644
--- a/canohost.c
+++ b/canohost.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.c,v 1.54 2006/07/05 02:42:09 stevesk Exp $ */
+/* $OpenBSD: canohost.c,v 1.55 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -14,6 +14,7 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>
diff --git a/clientloop.c b/clientloop.c
index fb66a6e40..c59d573c5 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.165 2006/07/02 23:01:55 stevesk Exp $ */
+/* $OpenBSD: clientloop.c,v 1.166 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -65,6 +65,7 @@
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
+#include <sys/socket.h>
 #include <sys/ioctl.h>
 
 #include <ctype.h>
diff --git a/dns.c b/dns.c
index 69084b57d..504b5d72e 100644
--- a/dns.c
+++ b/dns.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dns.c,v 1.19 2006/03/25 22:22:43 djm Exp $ */
+/* $OpenBSD: dns.c,v 1.20 2006/07/08 21:47:12 stevesk Exp $ */
 
 /*
  * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -27,6 +27,9 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #include <netdb.h>
 
 #include "xmalloc.h"
diff --git a/dns.h b/dns.h
index 305ca07fb..818750384 100644
--- a/dns.h
+++ b/dns.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dns.h,v 1.7 2006/03/25 22:22:43 djm Exp $ */
+/* $OpenBSD: dns.h,v 1.8 2006/07/08 21:47:12 stevesk Exp $ */
 
 /*
  * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -27,6 +27,9 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #ifndef DNS_H
 #define DNS_H
 
diff --git a/includes.h b/includes.h
index 55ca7bedd..417d7c01b 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.45 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: includes.h,v 1.46 2006/07/08 21:47:12 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -87,7 +87,6 @@
 #endif
 
 #include <sys/types.h>
-#include <sys/socket.h>
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h> /* For timersub */
 #endif
diff --git a/monitor.c b/monitor.c
index 72176f9aa..4a295d312 100644
--- a/monitor.c
+++ b/monitor.c
@@ -28,6 +28,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <sys/wait.h>
 
 #ifdef HAVE_PATHS_H
diff --git a/monitor_fdpass.c b/monitor_fdpass.c
index 4ce9eae19..546f7010f 100644
--- a/monitor_fdpass.c
+++ b/monitor_fdpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_fdpass.c,v 1.8 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: monitor_fdpass.c,v 1.9 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -26,6 +26,8 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+#include <sys/socket.h>
 #include <sys/uio.h>
 
 #include "log.h"
diff --git a/nchan.c b/nchan.c
index 1f4b39671..58b0e98d5 100644
--- a/nchan.c
+++ b/nchan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nchan.c,v 1.53 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: nchan.c,v 1.54 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl.  All rights reserved.
  *
@@ -25,6 +25,9 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #include "ssh1.h"
 #include "ssh2.h"
 #include "buffer.h"
diff --git a/packet.c b/packet.c
index ba2843786..f04d6fac9 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.132 2006/07/05 02:42:09 stevesk Exp $ */
+/* $OpenBSD: packet.c,v 1.133 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -39,6 +39,7 @@
 
 #include "includes.h"
  
+#include <sys/types.h>
 #include "openbsd-compat/sys-queue.h"
 #include <sys/socket.h>
 
diff --git a/servconf.c b/servconf.c
index af0ad1a35..c5b933ab9 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.151 2006/07/06 10:47:05 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.152 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -12,6 +12,9 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #include "ssh.h"
 #include "log.h"
 #include "servconf.h"
diff --git a/session.c b/session.c
index 9115c5aa1..8b1a9ed94 100644
--- a/session.c
+++ b/session.c
@@ -39,6 +39,7 @@
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
+#include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/un.h>
 
diff --git a/sftp.c b/sftp.c
index 22fa6ad2a..a6c22aa67 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.82 2006/05/17 12:43:34 markus Exp $ */
+/* $OpenBSD: sftp.c,v 1.83 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -22,6 +22,7 @@
 # include <sys/stat.h>
 #endif
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/wait.h>
 
 #ifdef HAVE_PATHS_H
diff --git a/ssh-agent.c b/ssh-agent.c
index db3935ec7..87e94b0ea 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.140 2006/06/13 02:17:07 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.141 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -38,11 +38,13 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
 #ifdef HAVE_SYS_UN_H
 # include <sys/un.h>
 #endif
 #include "openbsd-compat/sys-queue.h"
 #include <sys/resource.h>
+
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif
diff --git a/ssh-keygen.c b/ssh-keygen.c
index aa2030ea7..afa718a96 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -15,6 +15,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <sys/stat.h>
 
 #include <openssl/evp.h>
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index dc47a9576..85ee168e7 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.64 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.65 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
  *
diff --git a/ssh.c b/ssh.c
index d9837f162..ee4f92f92 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.279 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: ssh.c,v 1.280 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -48,6 +48,7 @@
 #endif
 #include <sys/resource.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/un.h>
 
 #include <ctype.h>
diff --git a/sshconnect.h b/sshconnect.h
index c1b07390b..0b3896f9d 100644
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.h,v 1.21 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: sshconnect.h,v 1.22 2006/07/08 21:47:12 stevesk Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -27,6 +27,7 @@
 #define SSHCONNECT_H
 
 #include <sys/types.h>
+#include <sys/socket.h>
 
 #include <pwd.h>
 
diff --git a/sshd.c b/sshd.c
index 790d27576..4131f1699 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.333 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: sshd.c,v 1.334 2006/07/08 21:47:12 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -49,6 +49,7 @@
 # include <sys/stat.h>
 #endif
 #include <sys/ioctl.h>
+#include <sys/socket.h>
 #include <sys/wait.h>
 
 #ifdef HAVE_PATHS_H
diff --git a/sshlogin.c b/sshlogin.c
index 4f65b5e91..a472b511c 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -119,7 +119,7 @@ record_login(pid_t pid, const char *tty, const char *user, uid_t uid,
 #ifdef LOGIN_NEEDS_UTMPX
 void
 record_utmp_only(pid_t pid, const char *ttyname, const char *user,
-                 const char *host, struct sockaddr * addr, socklen_t addrlen)
+                 const char *host, struct sockaddr *addr, socklen_t addrlen)
 {
         struct logininfo *li;
 
diff --git a/sshlogin.h b/sshlogin.h
index f840461cf..c0f9cd300 100644
--- a/sshlogin.h
+++ b/sshlogin.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshlogin.h,v 1.6 2006/03/25 22:22:43 djm Exp $ */
+/* $OpenBSD: sshlogin.h,v 1.7 2006/07/08 21:47:12 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -14,6 +14,9 @@
 #ifndef SSHLOGIN_H
 #define SSHLOGIN_H
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 void    record_login(pid_t, const char *, const char *, uid_t,
     const char *, struct sockaddr *, socklen_t);
 void   record_logout(pid_t, const char *, const char *);