- stevesk@cvs.openbsd.org 2006/02/10 00:27:13

     [channels.c clientloop.c includes.h misc.c progressmeter.c sftp.c]
     [ssh.c sshd.c sshpty.c]
     move #include <sys/ioctl.h> out of includes.h; ok markus@

diff --git a/ChangeLog b/ChangeLog
index 435e0746d2361a7a9f7168d9fe22b58b30ff0430..32b5ebc9b1e55b21fac6fa8f57fa411e352e6913 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,6 +58,10 @@
      [sshd.8]
      - move some text into a CAVEATS section
      - merge the COMMAND EXECUTION... section into AUTHENTICATION
+   - stevesk@cvs.openbsd.org 2006/02/10 00:27:13
+     [channels.c clientloop.c includes.h misc.c progressmeter.c sftp.c]
+     [ssh.c sshd.c sshpty.c]
+     move #include <sys/ioctl.h> out of includes.h; ok markus@
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)

diff --git a/channels.c b/channels.c
index 78d4d918729cb100e479ab2c0f5bb25e2265297b..3955b6158041bc56b67a35cc187a326a243f0085 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.233 2006/02/07 01:42:00 stevesk Exp $");
+RCSID("$OpenBSD: channels.c,v 1.234 2006/02/10 00:27:13 stevesk Exp $");
+
+#include <sys/ioctl.h>
 
 #include <termios.h>
 

diff --git a/clientloop.c b/clientloop.c
index 893ba30ffb4d6bca7e5e431df07532f99bd71b4a..52f3bd5b55c4be38633da24ac23cc9d96c5589a0 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.151 2006/02/08 12:15:27 stevesk Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.152 2006/02/10 00:27:13 stevesk Exp $");
+
+#include <sys/ioctl.h>
 
 #include <paths.h>
 #include <termios.h>

diff --git a/includes.h b/includes.h
index b4cd092b6c50664f62d126a331cae221e95c2089..9cf7d30a2a70c400b4023dfdeddc0364ca9b859d 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: includes.h,v 1.31 2006/02/09 00:32:07 stevesk Exp $   */
+/*     $OpenBSD: includes.h,v 1.32 2006/02/10 00:27:13 stevesk Exp $   */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -92,7 +92,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/wait.h>
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h> /* For timersub */

diff --git a/misc.c b/misc.c
index e4a47e6104086c7bd644145061ff57354e6bc6f1..e1da651efe03472023342358e13246a207a2eb38 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -24,8 +24,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.44 2006/02/08 12:32:49 stevesk Exp $");
- 
+RCSID("$OpenBSD: misc.c,v 1.45 2006/02/10 00:27:13 stevesk Exp $");
+
+#include <sys/ioctl.h>
 #include <netinet/tcp.h>
 #ifdef HAVE_PATHS_H
 # include <paths.h>

diff --git a/progressmeter.c b/progressmeter.c
index 13c51d87ef703dd0d1afeb11618d699b4680672a..4f76c53d0f81419b9aa38cb05bae6355a319adc9 100644 (file)
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,7 +23,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: progressmeter.c,v 1.24 2005/06/07 13:25:23 jaredy Exp $");
+RCSID("$OpenBSD: progressmeter.c,v 1.25 2006/02/10 00:27:13 stevesk Exp $");
+
+#include <sys/ioctl.h>
 
 #include "progressmeter.h"
 #include "atomicio.h"

diff --git a/sftp.c b/sftp.c
index 636c1f5f477f8e579a391f6fab3809bb7bdaa923..0599e587a72e48044c35ae901d63005b12f41b7e 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -15,8 +15,9 @@
  */
 
 #include "includes.h"
+RCSID("$OpenBSD: sftp.c,v 1.72 2006/02/10 00:27:13 stevesk Exp $");
 
-RCSID("$OpenBSD: sftp.c,v 1.71 2006/02/08 12:15:27 stevesk Exp $");
+#include <sys/ioctl.h>
 
 #ifdef HAVE_PATHS_H
 # include <paths.h>

diff --git a/ssh.c b/ssh.c
index 3384de0120e4bac2365c7f8d7ecaeca2748a7703..5331402e501fe0f189c1cb1bc3b2f21d79b9eeea 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -40,9 +40,10 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.259 2006/02/08 14:31:30 stevesk Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.260 2006/02/10 00:27:13 stevesk Exp $");
 
 #include <sys/resource.h>
+#include <sys/ioctl.h>
 
 #include <paths.h>
 

diff --git a/sshd.c b/sshd.c
index 10f9f52a58c6616352685805a11d1f2bf5540421..3bf4897235be329c692603fe6c9e57b8dc2590bc 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.319 2006/02/08 12:15:27 stevesk Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.320 2006/02/10 00:27:13 stevesk Exp $");
+
+#include <sys/ioctl.h>
 
 #include <paths.h>
 

diff --git a/sshpty.c b/sshpty.c
index 4434a908d5dfcfe8f771eadab40508cff098420a..884df26ae0899395eb0e6e1b56784858d2430619 100644 (file)
--- a/sshpty.c
+++ b/sshpty.c
@@ -12,7 +12,9 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshpty.c,v 1.14 2006/02/08 12:15:27 stevesk Exp $");
+RCSID("$OpenBSD: sshpty.c,v 1.15 2006/02/10 00:27:13 stevesk Exp $");
+
+#include <sys/ioctl.h>
 
 #ifdef HAVE_PATHS_H
 # include <paths.h>