- stevesk@cvs.openbsd.org 2006/07/05 02:42:09

     [canohost.c hostfile.c includes.h misc.c packet.c readconf.c]
     [serverloop.c sshconnect.c uuencode.c]
     move #include <netinet/in.h> out of includes.h; ok deraadt@
     (also ssh-rand-helper.c logintest.c loginrec.c)

diff --git a/ChangeLog b/ChangeLog
index 9366d742b73e02d2d16b05871a82dabeb70ff93f..1dde002344443e48bf04f5c9a863c200929a12db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,11 @@
      [channels.c includes.h]
      move #include <arpa/inet.h> out of includes.h; old ok djm@
      (portable needed session.c too)
+   - stevesk@cvs.openbsd.org 2006/07/05 02:42:09
+     [canohost.c hostfile.c includes.h misc.c packet.c readconf.c]
+     [serverloop.c sshconnect.c uuencode.c]
+     move #include <netinet/in.h> out of includes.h; ok deraadt@
+     (also ssh-rand-helper.c logintest.c loginrec.c)
 
 20060706
  - (dtucker) [configure.ac] Try AIX blibpath test in different order when

diff --git a/canohost.c b/canohost.c
index 34b751a72c09dd645b2d6f5f1199157872ef264b..787d338d452a75b2f681c33c8fdbd22e473996f4 100644 (file)
--- a/canohost.c
+++ b/canohost.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: canohost.c,v 1.53 2006/03/25 13:17:01 djm Exp $ */
+/* $OpenBSD: canohost.c,v 1.54 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -14,6 +14,10 @@
 
 #include "includes.h"
 
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
 #include <ctype.h>
 
 #include "packet.h"

diff --git a/hostfile.c b/hostfile.c
index 39ff197a7fe47a4cdc49129edb7578e68a1ed737..a6714b6e13e04a9479fe15cb8d6431134776da2f 100644 (file)
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.40 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: hostfile.c,v 1.41 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -38,6 +38,10 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+
+#include <netinet/in.h>
+
 #include <resolv.h>
 
 #include <openssl/hmac.h>

diff --git a/includes.h b/includes.h
index c3f0671ecdb754e6a9fd743b1dac8ebbd31d0344..51b6a0b84fc5858fd1d841bacd4a1f701feb2395 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.43 2006/07/03 17:59:32 stevesk Exp $ */
+/* $OpenBSD: includes.h,v 1.44 2006/07/05 02:42:09 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -129,7 +129,6 @@
 #include <sys/ptms.h>  /* for grantpt() and friends */
 #endif
 
-#include <netinet/in.h>
 #include <netinet/in_systm.h> /* For typedefs */
 #if defined(HAVE_NETDB_H)
 # include <netdb.h>

diff --git a/loginrec.c b/loginrec.c
index c2498e1e3da642637554446706517051b643f734..76ddc2000a2bd6b6a0b5ac8d4a6fe8135e677524 100644 (file)
--- a/loginrec.c
+++ b/loginrec.c
@@ -149,6 +149,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #include "ssh.h"
 #include "xmalloc.h"

diff --git a/logintest.c b/logintest.c
index 1159274f8a4ba163004405db7dbddd065d274eb9..7e9fbbfbbdc1e5a6cac726af7de233410e9438d8 100644 (file)
--- a/logintest.c
+++ b/logintest.c
@@ -31,6 +31,10 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/misc.c b/misc.c
index 158d4878f774a3e9b8998be9f684f0040a54db49..63c7ddf1ec80d712d3b7f61ce600c15f676555d7 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.52 2006/03/30 09:58:15 djm Exp $ */
+/* $OpenBSD: misc.c,v 1.53 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@@ -27,7 +27,11 @@
 #include "includes.h"
 
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 #include <netinet/tcp.h>
+
 #ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif

diff --git a/packet.c b/packet.c
index bc0baf3fcd1f383ca35ae0ff549271a3a61f4032..ba2843786f4aaef4c08540743db0f79bd7d7191e 100644 (file)
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.131 2006/03/30 09:58:16 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.132 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -40,6 +40,10 @@
 #include "includes.h"
  
 #include "openbsd-compat/sys-queue.h"
+#include <sys/socket.h>
+
+#include <netinet/in_systm.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
 
 #include "xmalloc.h"

diff --git a/readconf.c b/readconf.c
index 87e41e0c4dcf83729709a8e74920f677bc66eca7..df5e566a51b32c42507a1cc8423a121c465364ec 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.151 2006/03/25 13:17:02 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.152 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -16,6 +16,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #include <ctype.h>
 

diff --git a/serverloop.c b/serverloop.c
index 18f1a10bd175025c6b14df3c93aaec2d9d6467aa..a0832679c9f1d4afac7e081c3d6ce536a03354f8 100644 (file)
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.135 2006/03/25 18:30:55 deraadt Exp $ */
+/* $OpenBSD: serverloop.c,v 1.136 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -39,6 +39,9 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #include <signal.h>
 #include <termios.h>

diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 605de72f9fa20e91fca9a318a8b3b4bafb57f26e..d8da7d3c02ce5638c858d9815675c88f03bed097 100644 (file)
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -28,6 +28,9 @@
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #ifdef HAVE_SYS_UN_H
 # include <sys/un.h>

diff --git a/sshconnect.c b/sshconnect.c
index 776460f43668667a5a617201304d2ed7d15510da..7f9c09b9147c6a0bef0c9565c581b246618eaa06 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.186 2006/07/03 08:54:20 stevesk Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.187 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -18,6 +18,9 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
 
 #include <ctype.h>
 #ifdef HAVE_PATHS_H

diff --git a/uuencode.c b/uuencode.c
index 398aeefe1dd0968b3a28f0028e513104726be33c..b8dcaeae64bb626d900dbf34601f295934060f9f 100644 (file)
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uuencode.c,v 1.21 2006/03/26 01:31:48 deraadt Exp $ */
+/* $OpenBSD: uuencode.c,v 1.22 2006/07/05 02:42:09 stevesk Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -25,6 +25,10 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+
+#include <netinet/in.h>
+
 #include "xmalloc.h"
 #include "uuencode.h"