summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:52:09 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:52:09 +1100
commit6ff3caddb687a89a5df715337917d0e140985b7f (patch)
tree2df448777122ec5037bafd66664764e445b51bea
parentf17883e6a0f9462c8bc163cce44331862581b0cb (diff)
oops, this commit is really:
- stevesk@cvs.openbsd.org 2006/02/20 17:02:44 [clientloop.c includes.h monitor.c progressmeter.c scp.c] [serverloop.c session.c sftp.c ssh-agent.c ssh.c sshd.c] move #include <signal.h> out of includes.h; ok markus@ the previous was: - stevesk@cvs.openbsd.org 2006/02/20 17:19:54 [auth-rhosts.c auth-rsa.c auth.c auth2-none.c auth2-pubkey.c] [authfile.c clientloop.c includes.h readconf.c scp.c session.c] [sftp-client.c sftp-common.c sftp-common.h sftp-glob.c] [sftp-server.c sftp.c ssh-add.c ssh-keygen.c ssh.c sshconnect.c] [sshconnect2.c sshd.c sshpty.c] move #include <sys/stat.h> out of includes.h; ok markus@
-rw-r--r--ChangeLog9
-rw-r--r--clientloop.c1
-rw-r--r--includes.h3
-rw-r--r--monitor.c3
-rw-r--r--progressmeter.c4
-rw-r--r--scp.c1
-rw-r--r--serverloop.c3
-rw-r--r--session.c1
-rw-r--r--sftp.c1
-rw-r--r--ssh-agent.c4
-rw-r--r--ssh.c1
-rw-r--r--sshd.c1
12 files changed, 25 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index be7263bd8..eafa56ed6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -139,6 +139,13 @@
139 [clientloop.c includes.h monitor.c progressmeter.c scp.c] 139 [clientloop.c includes.h monitor.c progressmeter.c scp.c]
140 [serverloop.c session.c sftp.c ssh-agent.c ssh.c sshd.c] 140 [serverloop.c session.c sftp.c ssh-agent.c ssh.c sshd.c]
141 move #include <signal.h> out of includes.h; ok markus@ 141 move #include <signal.h> out of includes.h; ok markus@
142 - stevesk@cvs.openbsd.org 2006/02/20 17:19:54
143 [auth-rhosts.c auth-rsa.c auth.c auth2-none.c auth2-pubkey.c]
144 [authfile.c clientloop.c includes.h readconf.c scp.c session.c]
145 [sftp-client.c sftp-common.c sftp-common.h sftp-glob.c]
146 [sftp-server.c sftp.c ssh-add.c ssh-keygen.c ssh.c sshconnect.c]
147 [sshconnect2.c sshd.c sshpty.c]
148 move #include <sys/stat.h> out of includes.h; ok markus@
142 149
14320060313 15020060313
144 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 151 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4040,4 +4047,4 @@
4040 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4047 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4041 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4048 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4042 4049
4043$Id: ChangeLog,v 1.4179 2006/03/15 00:45:54 djm Exp $ 4050$Id: ChangeLog,v 1.4180 2006/03/15 00:52:09 djm Exp $
diff --git a/clientloop.c b/clientloop.c
index a7c510cca..af5351b7d 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -68,6 +68,7 @@ RCSID("$OpenBSD: clientloop.c,v 1.154 2006/02/20 17:19:54 stevesk Exp $");
68#include <sys/ioctl.h> 68#include <sys/ioctl.h>
69 69
70#include <paths.h> 70#include <paths.h>
71#include <signal.h>
71#include <termios.h> 72#include <termios.h>
72 73
73#include "ssh.h" 74#include "ssh.h"
diff --git a/includes.h b/includes.h
index be844c80b..564bb7634 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.36 2006/02/20 17:19:53 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.35 2006/02/20 17:02:44 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -28,7 +28,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
28#include <ctype.h> 28#include <ctype.h>
29#include <errno.h> 29#include <errno.h>
30#include <fcntl.h> /* For O_NONBLOCK */ 30#include <fcntl.h> /* For O_NONBLOCK */
31#include <signal.h>
32#include <stdlib.h> 31#include <stdlib.h>
33#include <string.h> 32#include <string.h>
34#include <stdarg.h> 33#include <stdarg.h>
diff --git a/monitor.c b/monitor.c
index c21c0fab8..3260d473d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,12 +25,13 @@
25 */ 25 */
26 26
27#include "includes.h" 27#include "includes.h"
28RCSID("$OpenBSD: monitor.c,v 1.67 2006/02/10 01:44:26 stevesk Exp $"); 28RCSID("$OpenBSD: monitor.c,v 1.68 2006/02/20 17:02:44 stevesk Exp $");
29 29
30#include <sys/types.h> 30#include <sys/types.h>
31#include <sys/wait.h> 31#include <sys/wait.h>
32 32
33#include <paths.h> 33#include <paths.h>
34#include <signal.h>
34 35
35#ifdef SKEY 36#ifdef SKEY
36#include <skey.h> 37#include <skey.h>
diff --git a/progressmeter.c b/progressmeter.c
index 4f76c53d0..5ae02493b 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -23,10 +23,12 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: progressmeter.c,v 1.25 2006/02/10 00:27:13 stevesk Exp $"); 26RCSID("$OpenBSD: progressmeter.c,v 1.26 2006/02/20 17:02:44 stevesk Exp $");
27 27
28#include <sys/ioctl.h> 28#include <sys/ioctl.h>
29 29
30#include <signal.h>
31
30#include "progressmeter.h" 32#include "progressmeter.h"
31#include "atomicio.h" 33#include "atomicio.h"
32#include "misc.h" 34#include "misc.h"
diff --git a/scp.c b/scp.c
index 8b806d637..9d30ec527 100644
--- a/scp.c
+++ b/scp.c
@@ -80,6 +80,7 @@ RCSID("$OpenBSD: scp.c,v 1.134 2006/02/20 17:19:54 stevesk Exp $");
80#include <sys/wait.h> 80#include <sys/wait.h>
81 81
82#include <dirent.h> 82#include <dirent.h>
83#include <signal.h>
83 84
84#include "xmalloc.h" 85#include "xmalloc.h"
85#include "atomicio.h" 86#include "atomicio.h"
diff --git a/serverloop.c b/serverloop.c
index 11dcaf703..0a1bbf1ad 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,11 +35,12 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: serverloop.c,v 1.126 2006/02/10 01:44:26 stevesk Exp $"); 38RCSID("$OpenBSD: serverloop.c,v 1.127 2006/02/20 17:02:44 stevesk Exp $");
39 39
40#include <sys/types.h> 40#include <sys/types.h>
41#include <sys/wait.h> 41#include <sys/wait.h>
42 42
43#include <signal.h>
43#include <termios.h> 44#include <termios.h>
44 45
45#include "xmalloc.h" 46#include "xmalloc.h"
diff --git a/session.c b/session.c
index 1e883036b..f69074500 100644
--- a/session.c
+++ b/session.c
@@ -43,6 +43,7 @@ RCSID("$OpenBSD: session.c,v 1.196 2006/02/20 17:19:54 stevesk Exp $");
43#include <sys/un.h> 43#include <sys/un.h>
44 44
45#include <paths.h> 45#include <paths.h>
46#include <signal.h>
46 47
47#include "ssh.h" 48#include "ssh.h"
48#include "ssh1.h" 49#include "ssh1.h"
diff --git a/sftp.c b/sftp.c
index f5589f2b9..c4f027846 100644
--- a/sftp.c
+++ b/sftp.c
@@ -32,6 +32,7 @@ RCSID("$OpenBSD: sftp.c,v 1.75 2006/02/20 17:19:54 stevesk Exp $");
32#else 32#else
33typedef void EditLine; 33typedef void EditLine;
34#endif 34#endif
35#include <signal.h>
35 36
36#include "buffer.h" 37#include "buffer.h"
37#include "xmalloc.h" 38#include "xmalloc.h"
diff --git a/ssh-agent.c b/ssh-agent.c
index 0ab232191..b45087629 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -34,7 +34,7 @@
34 */ 34 */
35 35
36#include "includes.h" 36#include "includes.h"
37RCSID("$OpenBSD: ssh-agent.c,v 1.128 2006/02/20 16:36:14 stevesk Exp $"); 37RCSID("$OpenBSD: ssh-agent.c,v 1.129 2006/02/20 17:02:44 stevesk Exp $");
38 38
39#include <sys/types.h> 39#include <sys/types.h>
40#ifdef HAVE_SYS_UN_H 40#ifdef HAVE_SYS_UN_H
@@ -45,6 +45,8 @@ RCSID("$OpenBSD: ssh-agent.c,v 1.128 2006/02/20 16:36:14 stevesk Exp $");
45#ifdef HAVE_PATHS_H 45#ifdef HAVE_PATHS_H
46# include <paths.h> 46# include <paths.h>
47#endif 47#endif
48#include <signal.h>
49
48#include <openssl/evp.h> 50#include <openssl/evp.h>
49#include <openssl/md5.h> 51#include <openssl/md5.h>
50 52
diff --git a/ssh.c b/ssh.c
index 196da80c5..18631f272 100644
--- a/ssh.c
+++ b/ssh.c
@@ -51,6 +51,7 @@ RCSID("$OpenBSD: ssh.c,v 1.264 2006/02/20 17:19:54 stevesk Exp $");
51#include <sys/un.h> 51#include <sys/un.h>
52 52
53#include <paths.h> 53#include <paths.h>
54#include <signal.h>
54 55
55#include <openssl/evp.h> 56#include <openssl/evp.h>
56#include <openssl/err.h> 57#include <openssl/err.h>
diff --git a/sshd.c b/sshd.c
index f06b41188..40593ee2e 100644
--- a/sshd.c
+++ b/sshd.c
@@ -52,6 +52,7 @@ RCSID("$OpenBSD: sshd.c,v 1.323 2006/02/20 17:19:54 stevesk Exp $");
52#include <sys/wait.h> 52#include <sys/wait.h>
53 53
54#include <paths.h> 54#include <paths.h>
55#include <signal.h>
55 56
56#include <openssl/dh.h> 57#include <openssl/dh.h>
57#include <openssl/bn.h> 58#include <openssl/bn.h>