summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:53:45 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:53:45 +1100
commitc7b06369a846822b0da77b969d4ed72ea8ee38d4 (patch)
tree5542e1aae33335ef5ba9926ceecb3c9475378c72
parent6ff3caddb687a89a5df715337917d0e140985b7f (diff)
- stevesk@cvs.openbsd.org 2006/02/22 00:04:45
[canohost.c clientloop.c includes.h match.c readconf.c scp.c ssh.c] [sshconnect.c] move #include <ctype.h> out of includes.h; ok djm@
-rw-r--r--ChangeLog6
-rw-r--r--canohost.c4
-rw-r--r--clientloop.c3
-rw-r--r--includes.h3
-rw-r--r--match.c4
-rw-r--r--readconf.c4
-rw-r--r--scp.c3
-rw-r--r--ssh.c3
-rw-r--r--sshconnect.c3
9 files changed, 23 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index eafa56ed6..8d19a746d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -146,6 +146,10 @@
146 [sftp-server.c sftp.c ssh-add.c ssh-keygen.c ssh.c sshconnect.c] 146 [sftp-server.c sftp.c ssh-add.c ssh-keygen.c ssh.c sshconnect.c]
147 [sshconnect2.c sshd.c sshpty.c] 147 [sshconnect2.c sshd.c sshpty.c]
148 move #include <sys/stat.h> out of includes.h; ok markus@ 148 move #include <sys/stat.h> out of includes.h; ok markus@
149 - stevesk@cvs.openbsd.org 2006/02/22 00:04:45
150 [canohost.c clientloop.c includes.h match.c readconf.c scp.c ssh.c]
151 [sshconnect.c]
152 move #include <ctype.h> out of includes.h; ok djm@
149 153
15020060313 15420060313
151 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 155 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4047,4 +4051,4 @@
4047 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4051 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4048 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4052 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4049 4053
4050$Id: ChangeLog,v 1.4180 2006/03/15 00:52:09 djm Exp $ 4054$Id: ChangeLog,v 1.4181 2006/03/15 00:53:45 djm Exp $
diff --git a/canohost.c b/canohost.c
index 6ca60e6b4..76b0bee02 100644
--- a/canohost.c
+++ b/canohost.c
@@ -12,7 +12,9 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: canohost.c,v 1.48 2005/12/28 22:46:06 stevesk Exp $"); 15RCSID("$OpenBSD: canohost.c,v 1.49 2006/02/22 00:04:44 stevesk Exp $");
16
17#include <ctype.h>
16 18
17#include "packet.h" 19#include "packet.h"
18#include "xmalloc.h" 20#include "xmalloc.h"
diff --git a/clientloop.c b/clientloop.c
index af5351b7d..dba3e96c3 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
59 */ 59 */
60 60
61#include "includes.h" 61#include "includes.h"
62RCSID("$OpenBSD: clientloop.c,v 1.154 2006/02/20 17:19:54 stevesk Exp $"); 62RCSID("$OpenBSD: clientloop.c,v 1.155 2006/02/22 00:04:44 stevesk Exp $");
63 63
64#include <sys/types.h> 64#include <sys/types.h>
65#ifdef HAVE_SYS_STAT_H 65#ifdef HAVE_SYS_STAT_H
@@ -67,6 +67,7 @@ RCSID("$OpenBSD: clientloop.c,v 1.154 2006/02/20 17:19:54 stevesk Exp $");
67#endif 67#endif
68#include <sys/ioctl.h> 68#include <sys/ioctl.h>
69 69
70#include <ctype.h>
70#include <paths.h> 71#include <paths.h>
71#include <signal.h> 72#include <signal.h>
72#include <termios.h> 73#include <termios.h>
diff --git a/includes.h b/includes.h
index 564bb7634..c3da49ebd 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.35 2006/02/20 17:02:44 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.37 2006/02/22 00:04:44 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -25,7 +25,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
25 25
26#include <stdarg.h> 26#include <stdarg.h>
27#include <stdio.h> 27#include <stdio.h>
28#include <ctype.h>
29#include <errno.h> 28#include <errno.h>
30#include <fcntl.h> /* For O_NONBLOCK */ 29#include <fcntl.h> /* For O_NONBLOCK */
31#include <stdlib.h> 30#include <stdlib.h>
diff --git a/match.c b/match.c
index 29fb7dab9..51407b818 100644
--- a/match.c
+++ b/match.c
@@ -35,7 +35,9 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: match.c,v 1.20 2005/06/17 02:44:32 djm Exp $"); 38RCSID("$OpenBSD: match.c,v 1.21 2006/02/22 00:04:44 stevesk Exp $");
39
40#include <ctype.h>
39 41
40#include "match.h" 42#include "match.h"
41#include "xmalloc.h" 43#include "xmalloc.h"
diff --git a/readconf.c b/readconf.c
index da704d803..392fc52c2 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,11 +12,13 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: readconf.c,v 1.147 2006/02/20 17:19:54 stevesk Exp $"); 15RCSID("$OpenBSD: readconf.c,v 1.148 2006/02/22 00:04:44 stevesk Exp $");
16 16
17#include <sys/types.h> 17#include <sys/types.h>
18#include <sys/stat.h> 18#include <sys/stat.h>
19 19
20#include <ctype.h>
21
20#include "ssh.h" 22#include "ssh.h"
21#include "xmalloc.h" 23#include "xmalloc.h"
22#include "compat.h" 24#include "compat.h"
diff --git a/scp.c b/scp.c
index 9d30ec527..af9317645 100644
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,7 @@
71 */ 71 */
72 72
73#include "includes.h" 73#include "includes.h"
74RCSID("$OpenBSD: scp.c,v 1.134 2006/02/20 17:19:54 stevesk Exp $"); 74RCSID("$OpenBSD: scp.c,v 1.135 2006/02/22 00:04:44 stevesk Exp $");
75 75
76#include <sys/types.h> 76#include <sys/types.h>
77#ifdef HAVE_SYS_STAT_H 77#ifdef HAVE_SYS_STAT_H
@@ -79,6 +79,7 @@ RCSID("$OpenBSD: scp.c,v 1.134 2006/02/20 17:19:54 stevesk Exp $");
79#endif 79#endif
80#include <sys/wait.h> 80#include <sys/wait.h>
81 81
82#include <ctype.h>
82#include <dirent.h> 83#include <dirent.h>
83#include <signal.h> 84#include <signal.h>
84 85
diff --git a/ssh.c b/ssh.c
index 18631f272..e2e7ab329 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.264 2006/02/20 17:19:54 stevesk Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.265 2006/02/22 00:04:45 stevesk Exp $");
44 44
45#include <sys/types.h> 45#include <sys/types.h>
46#ifdef HAVE_SYS_STAT_H 46#ifdef HAVE_SYS_STAT_H
@@ -50,6 +50,7 @@ RCSID("$OpenBSD: ssh.c,v 1.264 2006/02/20 17:19:54 stevesk Exp $");
50#include <sys/ioctl.h> 50#include <sys/ioctl.h>
51#include <sys/un.h> 51#include <sys/un.h>
52 52
53#include <ctype.h>
53#include <paths.h> 54#include <paths.h>
54#include <signal.h> 55#include <signal.h>
55 56
diff --git a/sshconnect.c b/sshconnect.c
index 519a7cf0d..9d1c8593c 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,12 +13,13 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.175 2006/02/20 17:19:54 stevesk Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.176 2006/02/22 00:04:45 stevesk Exp $");
17 17
18#include <sys/types.h> 18#include <sys/types.h>
19#include <sys/wait.h> 19#include <sys/wait.h>
20#include <sys/stat.h> 20#include <sys/stat.h>
21 21
22#include <ctype.h>
22#include <paths.h> 23#include <paths.h>
23 24
24#include "ssh.h" 25#include "ssh.h"