summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--includes.h3
-rw-r--r--monitor.c5
-rw-r--r--readpass.c5
-rw-r--r--scp.c5
-rw-r--r--serverloop.c5
-rw-r--r--session.c5
-rw-r--r--sftp.c4
-rw-r--r--sshconnect.c5
-rw-r--r--sshconnect2.c4
-rw-r--r--sshd.c4
11 files changed, 39 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 1582d97c7..b6ddb879d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,10 @@
62 [channels.c clientloop.c includes.h misc.c progressmeter.c sftp.c] 62 [channels.c clientloop.c includes.h misc.c progressmeter.c sftp.c]
63 [ssh.c sshd.c sshpty.c] 63 [ssh.c sshd.c sshpty.c]
64 move #include <sys/ioctl.h> out of includes.h; ok markus@ 64 move #include <sys/ioctl.h> out of includes.h; ok markus@
65 - stevesk@cvs.openbsd.org 2006/02/10 01:44:27
66 [includes.h monitor.c readpass.c scp.c serverloop.c session.c]
67 [sftp.c sshconnect.c sshconnect2.c sshd.c]
68 move #include <sys/wait.h> out of includes.h; ok markus@
65 69
6620060313 7020060313
67 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 71 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3963,4 +3967,4 @@
3963 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3967 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3964 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3968 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3965 3969
3966$Id: ChangeLog,v 1.4157 2006/03/15 00:28:34 djm Exp $ 3970$Id: ChangeLog,v 1.4158 2006/03/15 00:29:24 djm Exp $
diff --git a/includes.h b/includes.h
index 9cf7d30a2..1dbe16b78 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.32 2006/02/10 00:27:13 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.33 2006/02/10 01:44:26 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -92,7 +92,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
92 92
93#include <sys/types.h> 93#include <sys/types.h>
94#include <sys/socket.h> 94#include <sys/socket.h>
95#include <sys/wait.h>
96#ifdef HAVE_SYS_TIME_H 95#ifdef HAVE_SYS_TIME_H
97# include <sys/time.h> /* For timersub */ 96# include <sys/time.h> /* For timersub */
98#endif 97#endif
diff --git a/monitor.c b/monitor.c
index 4ba78db9c..c21c0fab8 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,10 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor.c,v 1.66 2006/02/08 13:15:44 stevesk Exp $"); 28RCSID("$OpenBSD: monitor.c,v 1.67 2006/02/10 01:44:26 stevesk Exp $");
29
30#include <sys/types.h>
31#include <sys/wait.h>
29 32
30#include <paths.h> 33#include <paths.h>
31 34
diff --git a/readpass.c b/readpass.c
index 9f74bec19..811cfa231 100644
--- a/readpass.c
+++ b/readpass.c
@@ -23,7 +23,10 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: readpass.c,v 1.34 2006/02/08 12:15:27 stevesk Exp $"); 26RCSID("$OpenBSD: readpass.c,v 1.35 2006/02/10 01:44:26 stevesk Exp $");
27
28#include <sys/types.h>
29#include <sys/wait.h>
27 30
28#ifdef HAVE_PATHS_H 31#ifdef HAVE_PATHS_H
29# include <paths.h> 32# include <paths.h>
diff --git a/scp.c b/scp.c
index 0b65ff081..4521f6343 100644
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,10 @@
71 */ 71 */
72 72
73#include "includes.h" 73#include "includes.h"
74RCSID("$OpenBSD: scp.c,v 1.131 2006/02/08 23:51:24 stevesk Exp $"); 74RCSID("$OpenBSD: scp.c,v 1.132 2006/02/10 01:44:26 stevesk Exp $");
75
76#include <sys/types.h>
77#include <sys/wait.h>
75 78
76#include <dirent.h> 79#include <dirent.h>
77 80
diff --git a/serverloop.c b/serverloop.c
index 23f8831ef..11dcaf703 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,10 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: serverloop.c,v 1.125 2006/02/07 01:42:00 stevesk Exp $"); 38RCSID("$OpenBSD: serverloop.c,v 1.126 2006/02/10 01:44:26 stevesk Exp $");
39
40#include <sys/types.h>
41#include <sys/wait.h>
39 42
40#include <termios.h> 43#include <termios.h>
41 44
diff --git a/session.c b/session.c
index 88e0a04d2..ecd6cf216 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,10 @@
33 */ 33 */
34 34
35#include "includes.h" 35#include "includes.h"
36RCSID("$OpenBSD: session.c,v 1.192 2006/02/08 12:15:27 stevesk Exp $"); 36RCSID("$OpenBSD: session.c,v 1.193 2006/02/10 01:44:27 stevesk Exp $");
37
38#include <sys/types.h>
39#include <sys/wait.h>
37 40
38#include <paths.h> 41#include <paths.h>
39 42
diff --git a/sftp.c b/sftp.c
index 0599e587a..4e170ee60 100644
--- a/sftp.c
+++ b/sftp.c
@@ -15,9 +15,11 @@
15 */ 15 */
16 16
17#include "includes.h" 17#include "includes.h"
18RCSID("$OpenBSD: sftp.c,v 1.72 2006/02/10 00:27:13 stevesk Exp $"); 18RCSID("$OpenBSD: sftp.c,v 1.73 2006/02/10 01:44:27 stevesk Exp $");
19 19
20#include <sys/ioctl.h> 20#include <sys/ioctl.h>
21#include <sys/types.h>
22#include <sys/wait.h>
21 23
22#ifdef HAVE_PATHS_H 24#ifdef HAVE_PATHS_H
23# include <paths.h> 25# include <paths.h>
diff --git a/sshconnect.c b/sshconnect.c
index a71251ea0..dc74d75c4 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,10 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.173 2006/02/08 14:16:59 stevesk Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.174 2006/02/10 01:44:27 stevesk Exp $");
17
18#include <sys/types.h>
19#include <sys/wait.h>
17 20
18#include <paths.h> 21#include <paths.h>
19 22
diff --git a/sshconnect2.c b/sshconnect2.c
index ce64586d8..eb9a4d870 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,8 +23,10 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.144 2006/02/07 01:18:09 stevesk Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.145 2006/02/10 01:44:27 stevesk Exp $");
27 27
28#include <sys/types.h>
29#include <sys/wait.h>
28#include <sys/queue.h> 30#include <sys/queue.h>
29 31
30#include "openbsd-compat/sys-queue.h" 32#include "openbsd-compat/sys-queue.h"
diff --git a/sshd.c b/sshd.c
index 3bf489723..8a68a537b 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,9 +42,11 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.320 2006/02/10 00:27:13 stevesk Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.321 2006/02/10 01:44:27 stevesk Exp $");
46 46
47#include <sys/ioctl.h> 47#include <sys/ioctl.h>
48#include <sys/types.h>
49#include <sys/wait.h>
48 50
49#include <paths.h> 51#include <paths.h>
50 52