- 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 10bf3c8..1582d97 100644
--- 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)
@@ -3959,4 +3963,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.4156 2006/03/15 00:27:20 djm Exp $
+$Id: ChangeLog,v 1.4157 2006/03/15 00:28:34 djm Exp $
diff --git a/channels.c b/channels.c
index 78d4d91..3955b61 100644
--- 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 893ba30..52f3bd5 100644
--- 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 b4cd092..9cf7d30 100644
--- 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 @@
#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 e4a47e6..e1da651 100644
--- 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 13c51d8..4f76c53 100644
--- 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 636c1f5..0599e58 100644
--- 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 3384de0..5331402 100644
--- 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 10f9f52..3bf4897 100644
--- 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 4434a90..884df26 100644
--- 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>