- 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

diff --git a/ChangeLog b/ChangeLog
index 588cb6f01b0aafd2e54e90ef213cbbf7bfb4a984..b7d1b2efad6cd88de253f1a430b7aa70a36347d2 100644 (file)
--- 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

diff --git a/authfd.c b/authfd.c
index 0fa69bd2a8e53de536878c9b9078c10aca35a9ec..0d2b09ecc977bcf60244c0f0aa128540339b6451 100644 (file)
--- 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 787d338d452a75b2f681c33c8fdbd22e473996f4..538b141b169495f32f6046ece1da47b77e5152b4 100644 (file)
--- 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 fb66a6e401424bed8cd4d58587566979a4cc4d63..c59d573c5a2a55bcbd81d2c21b710c24eef04532 100644 (file)
--- 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 69084b57d23cfdb632d42aa1c58b792f8fde2bae..504b5d72e8907eabb8c0cbe3273df691d4e76bd1 100644 (file)
--- 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 305ca07fbdc15b301aadb734d64538bb660c2639..81875038404329bae4a135ced9c32990440399bc 100644 (file)
--- 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 55ca7bedd7ae99509f6064d6c24f26d72e70ce61..417d7c01be693b604c4db9528a011d823dcd004b 100644 (file)
--- 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 72176f9aa6a583d8d3f83da1e2f71e40b6ddbb90..4a295d312572389fd3fe12a980b6ad5663b6991d 100644 (file)
--- 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 4ce9eae197d6aaee3a8a61969935e81fc71b434d..546f7010f9fa0c6c5ebc19fea3c3879f54666ccd 100644 (file)
--- 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 1f4b396713028ca2b790fb541911fcc4d7aef161..58b0e98d598d2ae5f2e8fc47ea8c84c9145bf69a 100644 (file)
--- 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 ba2843786f4aaef4c08540743db0f79bd7d7191e..f04d6fac93cfc85b7a709b1c4ee87eefaffaf596 100644 (file)
--- 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 af0ad1a3556c92644c5340dbe4db3ad28fe21548..c5b933ab9c0e8739b040b3c688a2e1417f98f522 100644 (file)
--- 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 9115c5aa1553d6af240f021d370d60827211a785..8b1a9ed9466183e60e533d97b2044006be8037dc 100644 (file)
--- 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 22fa6ad2a6fd2c74166d20ee94b79f355d6e791e..a6c22aa670cfb60461dfd457369227a022c983ce 100644 (file)
--- 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 db3935ec7705db736e7389f3dc191d3f8a9c8d00..87e94b0ea2bfdbe4cc4c0294b509dad4baa8d2d3 100644 (file)
--- 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 aa2030ea7475c2226566de798dbdb9f13c8f7422..afa718a967fc16e37b72a0f50fef14fa8db2e225 100644 (file)
--- 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 dc47a95760b52d68d15abd9e641b1694aec72052..85ee168e7214aeede96071aebea116fa3a55a373 100644 (file)
--- 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 d9837f1620c785fba061f990fa162785e71a85d0..ee4f92f9295afa5b72d2a3bc6d33e2881165b3b9 100644 (file)
--- 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 c1b07390b38d155ed49988ed5938bad0b54084c4..0b3896f9ddcbd08ba43934051f12a544f9982b1a 100644 (file)
--- 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 790d27576d98816c1cba77848ba4e92aa02ae957..4131f1699d586cde806a8bae6e65d681abae7fcf 100644 (file)
--- 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 4f65b5e919805766ec06ed1ce17de580db3af5c5..a472b511c2305e470b19a1500a9652e8ba2d5c65 100644 (file)
--- 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 f840461cf3766cfb2e3dac32661c9ad99a54fcb9..c0f9cd30021afcd4d48a96a1a09b33eebb6af7b6 100644 (file)
--- 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 *);