diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | channels.c | 4 | ||||
-rw-r--r-- | clientloop.c | 4 | ||||
-rw-r--r-- | includes.h | 3 | ||||
-rw-r--r-- | misc.c | 5 | ||||
-rw-r--r-- | progressmeter.c | 4 | ||||
-rw-r--r-- | sftp.c | 3 | ||||
-rw-r--r-- | ssh.c | 3 | ||||
-rw-r--r-- | sshd.c | 4 | ||||
-rw-r--r-- | sshpty.c | 4 |
10 files changed, 28 insertions, 12 deletions
@@ -58,6 +58,10 @@ | |||
58 | [sshd.8] | 58 | [sshd.8] |
59 | - move some text into a CAVEATS section | 59 | - move some text into a CAVEATS section |
60 | - merge the COMMAND EXECUTION... section into AUTHENTICATION | 60 | - merge the COMMAND EXECUTION... section into AUTHENTICATION |
61 | - stevesk@cvs.openbsd.org 2006/02/10 00:27:13 | ||
62 | [channels.c clientloop.c includes.h misc.c progressmeter.c sftp.c] | ||
63 | [ssh.c sshd.c sshpty.c] | ||
64 | move #include <sys/ioctl.h> out of includes.h; ok markus@ | ||
61 | 65 | ||
62 | 20060313 | 66 | 20060313 |
63 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 67 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -3959,4 +3963,4 @@ | |||
3959 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3963 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3960 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3964 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3961 | 3965 | ||
3962 | $Id: ChangeLog,v 1.4156 2006/03/15 00:27:20 djm Exp $ | 3966 | $Id: ChangeLog,v 1.4157 2006/03/15 00:28:34 djm Exp $ |
diff --git a/channels.c b/channels.c index 78d4d9187..3955b6158 100644 --- a/channels.c +++ b/channels.c | |||
@@ -39,7 +39,9 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.233 2006/02/07 01:42:00 stevesk Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.234 2006/02/10 00:27:13 stevesk Exp $"); |
43 | |||
44 | #include <sys/ioctl.h> | ||
43 | 45 | ||
44 | #include <termios.h> | 46 | #include <termios.h> |
45 | 47 | ||
diff --git a/clientloop.c b/clientloop.c index 893ba30ff..52f3bd5b5 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,9 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.151 2006/02/08 12:15:27 stevesk Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.152 2006/02/10 00:27:13 stevesk Exp $"); |
63 | |||
64 | #include <sys/ioctl.h> | ||
63 | 65 | ||
64 | #include <paths.h> | 66 | #include <paths.h> |
65 | #include <termios.h> | 67 | #include <termios.h> |
diff --git a/includes.h b/includes.h index b4cd092b6..9cf7d30a2 100644 --- a/includes.h +++ b/includes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: includes.h,v 1.31 2006/02/09 00:32:07 stevesk Exp $ */ | 1 | /* $OpenBSD: includes.h,v 1.32 2006/02/10 00:27:13 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/ioctl.h> | ||
96 | #include <sys/wait.h> | 95 | #include <sys/wait.h> |
97 | #ifdef HAVE_SYS_TIME_H | 96 | #ifdef HAVE_SYS_TIME_H |
98 | # include <sys/time.h> /* For timersub */ | 97 | # include <sys/time.h> /* For timersub */ |
@@ -24,8 +24,9 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: misc.c,v 1.44 2006/02/08 12:32:49 stevesk Exp $"); | 27 | RCSID("$OpenBSD: misc.c,v 1.45 2006/02/10 00:27:13 stevesk Exp $"); |
28 | 28 | ||
29 | #include <sys/ioctl.h> | ||
29 | #include <netinet/tcp.h> | 30 | #include <netinet/tcp.h> |
30 | #ifdef HAVE_PATHS_H | 31 | #ifdef HAVE_PATHS_H |
31 | # include <paths.h> | 32 | # include <paths.h> |
diff --git a/progressmeter.c b/progressmeter.c index 13c51d87e..4f76c53d0 100644 --- a/progressmeter.c +++ b/progressmeter.c | |||
@@ -23,7 +23,9 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: progressmeter.c,v 1.24 2005/06/07 13:25:23 jaredy Exp $"); | 26 | RCSID("$OpenBSD: progressmeter.c,v 1.25 2006/02/10 00:27:13 stevesk Exp $"); |
27 | |||
28 | #include <sys/ioctl.h> | ||
27 | 29 | ||
28 | #include "progressmeter.h" | 30 | #include "progressmeter.h" |
29 | #include "atomicio.h" | 31 | #include "atomicio.h" |
@@ -15,8 +15,9 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | RCSID("$OpenBSD: sftp.c,v 1.72 2006/02/10 00:27:13 stevesk Exp $"); | ||
18 | 19 | ||
19 | RCSID("$OpenBSD: sftp.c,v 1.71 2006/02/08 12:15:27 stevesk Exp $"); | 20 | #include <sys/ioctl.h> |
20 | 21 | ||
21 | #ifdef HAVE_PATHS_H | 22 | #ifdef HAVE_PATHS_H |
22 | # include <paths.h> | 23 | # include <paths.h> |
@@ -40,9 +40,10 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.259 2006/02/08 14:31:30 stevesk Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.260 2006/02/10 00:27:13 stevesk Exp $"); |
44 | 44 | ||
45 | #include <sys/resource.h> | 45 | #include <sys/resource.h> |
46 | #include <sys/ioctl.h> | ||
46 | 47 | ||
47 | #include <paths.h> | 48 | #include <paths.h> |
48 | 49 | ||
@@ -42,7 +42,9 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.319 2006/02/08 12:15:27 stevesk Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.320 2006/02/10 00:27:13 stevesk Exp $"); |
46 | |||
47 | #include <sys/ioctl.h> | ||
46 | 48 | ||
47 | #include <paths.h> | 49 | #include <paths.h> |
48 | 50 | ||
@@ -12,7 +12,9 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: sshpty.c,v 1.14 2006/02/08 12:15:27 stevesk Exp $"); | 15 | RCSID("$OpenBSD: sshpty.c,v 1.15 2006/02/10 00:27:13 stevesk Exp $"); |
16 | |||
17 | #include <sys/ioctl.h> | ||
16 | 18 | ||
17 | #ifdef HAVE_PATHS_H | 19 | #ifdef HAVE_PATHS_H |
18 | # include <paths.h> | 20 | # include <paths.h> |