summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--auth-rhosts.c5
-rw-r--r--auth-rsa.c5
-rw-r--r--auth.c5
-rw-r--r--auth2-none.c5
-rw-r--r--auth2-pubkey.c5
-rw-r--r--authfile.c5
-rw-r--r--clientloop.c6
-rw-r--r--includes.h5
-rw-r--r--readconf.c5
-rw-r--r--scp.c5
-rw-r--r--session.c5
-rw-r--r--sftp-client.c7
-rw-r--r--sftp-common.c5
-rw-r--r--sftp-common.h5
-rw-r--r--sftp-glob.c7
-rw-r--r--sftp-server.c5
-rw-r--r--sftp.c7
-rw-r--r--ssh-add.c5
-rw-r--r--ssh-keygen.c5
-rw-r--r--ssh.c7
-rw-r--r--sshconnect.c3
-rw-r--r--sshconnect2.c3
-rw-r--r--sshd.c7
-rw-r--r--sshpty.c4
25 files changed, 101 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog
index 29ee4407d..be7263bd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -135,6 +135,10 @@
135 - stevesk@cvs.openbsd.org 2006/02/20 16:36:15 135 - stevesk@cvs.openbsd.org 2006/02/20 16:36:15
136 [authfd.c channels.c includes.h session.c ssh-agent.c ssh.c] 136 [authfd.c channels.c includes.h session.c ssh-agent.c ssh.c]
137 move #include <sys/un.h> out of includes.h; ok djm@ 137 move #include <sys/un.h> out of includes.h; ok djm@
138 - stevesk@cvs.openbsd.org 2006/02/20 17:02:44
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]
141 move #include <signal.h> out of includes.h; ok markus@
138 142
13920060313 14320060313
140 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 144 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4036,4 +4040,4 @@
4036 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4040 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4037 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4041 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4038 4042
4039$Id: ChangeLog,v 1.4178 2006/03/15 00:40:10 djm Exp $ 4043$Id: ChangeLog,v 1.4179 2006/03/15 00:45:54 djm Exp $
diff --git a/auth-rhosts.c b/auth-rhosts.c
index 9748a9457..1deeb30b9 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -14,7 +14,10 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: auth-rhosts.c,v 1.34 2006/02/07 01:08:04 stevesk Exp $"); 17RCSID("$OpenBSD: auth-rhosts.c,v 1.35 2006/02/20 17:19:53 stevesk Exp $");
18
19#include <sys/types.h>
20#include <sys/stat.h>
18 21
19#ifdef HAVE_NETGROUP_H 22#ifdef HAVE_NETGROUP_H
20# include <netgroup.h> 23# include <netgroup.h>
diff --git a/auth-rsa.c b/auth-rsa.c
index d9c9652dc..275c0b67b 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -14,7 +14,10 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: auth-rsa.c,v 1.63 2005/06/17 02:44:32 djm Exp $"); 17RCSID("$OpenBSD: auth-rsa.c,v 1.64 2006/02/20 17:19:53 stevesk Exp $");
18
19#include <sys/types.h>
20#include <sys/stat.h>
18 21
19#include <openssl/rsa.h> 22#include <openssl/rsa.h>
20#include <openssl/md5.h> 23#include <openssl/md5.h>
diff --git a/auth.c b/auth.c
index 666a2dd22..fca373b80 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,10 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth.c,v 1.61 2006/02/08 12:15:27 stevesk Exp $"); 26RCSID("$OpenBSD: auth.c,v 1.62 2006/02/20 17:19:53 stevesk Exp $");
27
28#include <sys/types.h>
29#include <sys/stat.h>
27 30
28#ifdef HAVE_PATHS_H 31#ifdef HAVE_PATHS_H
29# include <paths.h> 32# include <paths.h>
diff --git a/auth2-none.c b/auth2-none.c
index 1c30a3203..2eb27a914 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -23,7 +23,10 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2-none.c,v 1.7 2004/05/11 19:01:43 deraadt Exp $"); 26RCSID("$OpenBSD: auth2-none.c,v 1.8 2006/02/20 17:19:54 stevesk Exp $");
27
28#include <sys/types.h>
29#include <sys/stat.h>
27 30
28#include "auth.h" 31#include "auth.h"
29#include "xmalloc.h" 32#include "xmalloc.h"
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index a97d0f430..ea1367070 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -23,7 +23,10 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2-pubkey.c,v 1.9 2004/12/11 01:48:56 dtucker Exp $"); 26RCSID("$OpenBSD: auth2-pubkey.c,v 1.10 2006/02/20 17:19:54 stevesk Exp $");
27
28#include <sys/types.h>
29#include <sys/stat.h>
27 30
28#include "ssh.h" 31#include "ssh.h"
29#include "ssh2.h" 32#include "ssh2.h"
diff --git a/authfile.c b/authfile.c
index 420813f37..f97cf1820 100644
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,10 @@
36 */ 36 */
37 37
38#include "includes.h" 38#include "includes.h"
39RCSID("$OpenBSD: authfile.c,v 1.61 2005/06/17 02:44:32 djm Exp $"); 39RCSID("$OpenBSD: authfile.c,v 1.62 2006/02/20 17:19:54 stevesk Exp $");
40
41#include <sys/types.h>
42#include <sys/stat.h>
40 43
41#include <openssl/err.h> 44#include <openssl/err.h>
42#include <openssl/evp.h> 45#include <openssl/evp.h>
diff --git a/clientloop.c b/clientloop.c
index 52f3bd5b5..a7c510cca 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,8 +59,12 @@
59 */ 59 */
60 60
61#include "includes.h" 61#include "includes.h"
62RCSID("$OpenBSD: clientloop.c,v 1.152 2006/02/10 00:27:13 stevesk Exp $"); 62RCSID("$OpenBSD: clientloop.c,v 1.154 2006/02/20 17:19:54 stevesk Exp $");
63 63
64#include <sys/types.h>
65#ifdef HAVE_SYS_STAT_H
66# include <sys/stat.h>
67#endif
64#include <sys/ioctl.h> 68#include <sys/ioctl.h>
65 69
66#include <paths.h> 70#include <paths.h>
diff --git a/includes.h b/includes.h
index ef4a269cc..be844c80b 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.34 2006/02/20 16:36:14 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.36 2006/02/20 17:19:53 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -111,9 +111,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
111#ifdef HAVE_SYS_CDEFS_H 111#ifdef HAVE_SYS_CDEFS_H
112# include <sys/cdefs.h> /* For __P() */ 112# include <sys/cdefs.h> /* For __P() */
113#endif 113#endif
114#ifdef HAVE_SYS_STAT_H
115# include <sys/stat.h> /* For S_* constants and macros */
116#endif
117#ifdef HAVE_SYS_SYSMACROS_H 114#ifdef HAVE_SYS_SYSMACROS_H
118# include <sys/sysmacros.h> /* For MIN, MAX, etc */ 115# include <sys/sysmacros.h> /* For MIN, MAX, etc */
119#endif 116#endif
diff --git a/readconf.c b/readconf.c
index bc5cf6188..da704d803 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,10 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: readconf.c,v 1.146 2006/02/12 10:44:18 djm Exp $"); 15RCSID("$OpenBSD: readconf.c,v 1.147 2006/02/20 17:19:54 stevesk Exp $");
16
17#include <sys/types.h>
18#include <sys/stat.h>
16 19
17#include "ssh.h" 20#include "ssh.h"
18#include "xmalloc.h" 21#include "xmalloc.h"
diff --git a/scp.c b/scp.c
index 4521f6343..8b806d637 100644
--- a/scp.c
+++ b/scp.c
@@ -71,9 +71,12 @@
71 */ 71 */
72 72
73#include "includes.h" 73#include "includes.h"
74RCSID("$OpenBSD: scp.c,v 1.132 2006/02/10 01:44:26 stevesk Exp $"); 74RCSID("$OpenBSD: scp.c,v 1.134 2006/02/20 17:19:54 stevesk Exp $");
75 75
76#include <sys/types.h> 76#include <sys/types.h>
77#ifdef HAVE_SYS_STAT_H
78# include <sys/stat.h>
79#endif
77#include <sys/wait.h> 80#include <sys/wait.h>
78 81
79#include <dirent.h> 82#include <dirent.h>
diff --git a/session.c b/session.c
index 969a7792a..1e883036b 100644
--- a/session.c
+++ b/session.c
@@ -33,9 +33,12 @@
33 */ 33 */
34 34
35#include "includes.h" 35#include "includes.h"
36RCSID("$OpenBSD: session.c,v 1.194 2006/02/20 16:36:14 stevesk Exp $"); 36RCSID("$OpenBSD: session.c,v 1.196 2006/02/20 17:19:54 stevesk Exp $");
37 37
38#include <sys/types.h> 38#include <sys/types.h>
39#ifdef HAVE_SYS_STAT_H
40# include <sys/stat.h>
41#endif
39#include <sys/wait.h> 42#include <sys/wait.h>
40#include <sys/un.h> 43#include <sys/un.h>
41 44
diff --git a/sftp-client.c b/sftp-client.c
index 9dfdf5ad5..042ab8879 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -20,7 +20,12 @@
20/* XXX: copy between two remote sites */ 20/* XXX: copy between two remote sites */
21 21
22#include "includes.h" 22#include "includes.h"
23RCSID("$OpenBSD: sftp-client.c,v 1.59 2006/02/15 05:08:24 david Exp $"); 23RCSID("$OpenBSD: sftp-client.c,v 1.60 2006/02/20 17:19:54 stevesk Exp $");
24
25#include <sys/types.h>
26#ifdef HAVE_SYS_STAT_H
27# include <sys/stat.h>
28#endif
24 29
25#include "openbsd-compat/sys-queue.h" 30#include "openbsd-compat/sys-queue.h"
26 31
diff --git a/sftp-common.c b/sftp-common.c
index 4cea3c305..aa0757561 100644
--- a/sftp-common.c
+++ b/sftp-common.c
@@ -24,7 +24,10 @@
24 */ 24 */
25 25
26#include "includes.h" 26#include "includes.h"
27RCSID("$OpenBSD: sftp-common.c,v 1.10 2003/11/10 16:23:41 jakob Exp $"); 27RCSID("$OpenBSD: sftp-common.c,v 1.11 2006/02/20 17:19:54 stevesk Exp $");
28
29#include <sys/types.h>
30#include <sys/stat.h>
28 31
29#include "buffer.h" 32#include "buffer.h"
30#include "bufaux.h" 33#include "bufaux.h"
diff --git a/sftp-common.h b/sftp-common.h
index 2b1995a2d..72be6e61c 100644
--- a/sftp-common.h
+++ b/sftp-common.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-common.h,v 1.6 2006/01/02 01:20:31 djm Exp $ */ 1/* $OpenBSD: sftp-common.h,v 1.7 2006/02/20 17:19:54 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -25,6 +25,9 @@
25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28#include <sys/types.h>
29#include <sys/stat.h>
30
28/* Maximum packet that we are willing to send/accept */ 31/* Maximum packet that we are willing to send/accept */
29#define SFTP_MAX_MSG_LENGTH (256 * 1024) 32#define SFTP_MAX_MSG_LENGTH (256 * 1024)
30 33
diff --git a/sftp-glob.c b/sftp-glob.c
index 9dfbf9538..baa84aa71 100644
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -15,7 +15,12 @@
15 */ 15 */
16 16
17#include "includes.h" 17#include "includes.h"
18RCSID("$OpenBSD: sftp-glob.c,v 1.16 2006/02/08 23:51:24 stevesk Exp $"); 18RCSID("$OpenBSD: sftp-glob.c,v 1.17 2006/02/20 17:19:54 stevesk Exp $");
19
20#include <sys/types.h>
21#ifdef HAVE_SYS_STAT_H
22# include <sys/stat.h>
23#endif
19 24
20#include <dirent.h> 25#include <dirent.h>
21 26
diff --git a/sftp-server.c b/sftp-server.c
index 96fe1a7bb..30bd1b0ee 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -14,7 +14,10 @@
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */ 15 */
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: sftp-server.c,v 1.51 2006/02/08 23:51:24 stevesk Exp $"); 17RCSID("$OpenBSD: sftp-server.c,v 1.52 2006/02/20 17:19:54 stevesk Exp $");
18
19#include <sys/types.h>
20#include <sys/stat.h>
18 21
19#include <dirent.h> 22#include <dirent.h>
20 23
diff --git a/sftp.c b/sftp.c
index 4e170ee60..f5589f2b9 100644
--- a/sftp.c
+++ b/sftp.c
@@ -15,10 +15,13 @@
15 */ 15 */
16 16
17#include "includes.h" 17#include "includes.h"
18RCSID("$OpenBSD: sftp.c,v 1.73 2006/02/10 01:44:27 stevesk Exp $"); 18RCSID("$OpenBSD: sftp.c,v 1.75 2006/02/20 17:19:54 stevesk Exp $");
19 19
20#include <sys/ioctl.h>
21#include <sys/types.h> 20#include <sys/types.h>
21#ifdef HAVE_SYS_STAT_H
22# include <sys/stat.h>
23#endif
24#include <sys/ioctl.h>
22#include <sys/wait.h> 25#include <sys/wait.h>
23 26
24#ifdef HAVE_PATHS_H 27#ifdef HAVE_PATHS_H
diff --git a/ssh-add.c b/ssh-add.c
index 2b01e6f13..8bfc401e8 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,10 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: ssh-add.c,v 1.74 2005/11/12 18:37:59 deraadt Exp $"); 38RCSID("$OpenBSD: ssh-add.c,v 1.75 2006/02/20 17:19:54 stevesk Exp $");
39
40#include <sys/types.h>
41#include <sys/stat.h>
39 42
40#include <openssl/evp.h> 43#include <openssl/evp.h>
41 44
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 64fadc7a1..8acbf7783 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,10 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.135 2005/11/29 02:04:55 dtucker Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.136 2006/02/20 17:19:54 stevesk Exp $");
16
17#include <sys/types.h>
18#include <sys/stat.h>
16 19
17#include <openssl/evp.h> 20#include <openssl/evp.h>
18#include <openssl/pem.h> 21#include <openssl/pem.h>
diff --git a/ssh.c b/ssh.c
index 84246b5c4..196da80c5 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,11 +40,14 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.262 2006/02/20 16:36:15 stevesk Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.264 2006/02/20 17:19:54 stevesk Exp $");
44 44
45#include <sys/types.h>
46#ifdef HAVE_SYS_STAT_H
47# include <sys/stat.h>
48#endif
45#include <sys/resource.h> 49#include <sys/resource.h>
46#include <sys/ioctl.h> 50#include <sys/ioctl.h>
47#include <sys/types.h>
48#include <sys/un.h> 51#include <sys/un.h>
49 52
50#include <paths.h> 53#include <paths.h>
diff --git a/sshconnect.c b/sshconnect.c
index dc74d75c4..519a7cf0d 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,10 +13,11 @@
13 */ 13 */
14 14
15#include "includes.h" 15#include "includes.h"
16RCSID("$OpenBSD: sshconnect.c,v 1.174 2006/02/10 01:44:27 stevesk Exp $"); 16RCSID("$OpenBSD: sshconnect.c,v 1.175 2006/02/20 17:19:54 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 21
21#include <paths.h> 22#include <paths.h>
22 23
diff --git a/sshconnect2.c b/sshconnect2.c
index eb9a4d870..f2776edb7 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,11 +23,12 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.145 2006/02/10 01:44:27 stevesk Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.146 2006/02/20 17:19:54 stevesk Exp $");
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29#include <sys/wait.h> 29#include <sys/wait.h>
30#include <sys/queue.h> 30#include <sys/queue.h>
31#include <sys/stat.h>
31 32
32#include "openbsd-compat/sys-queue.h" 33#include "openbsd-compat/sys-queue.h"
33 34
diff --git a/sshd.c b/sshd.c
index 8a68a537b..f06b41188 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,10 +42,13 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.321 2006/02/10 01:44:27 stevesk Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.323 2006/02/20 17:19:54 stevesk Exp $");
46 46
47#include <sys/ioctl.h>
48#include <sys/types.h> 47#include <sys/types.h>
48#ifdef HAVE_SYS_STAT_H
49# include <sys/stat.h>
50#endif
51#include <sys/ioctl.h>
49#include <sys/wait.h> 52#include <sys/wait.h>
50 53
51#include <paths.h> 54#include <paths.h>
diff --git a/sshpty.c b/sshpty.c
index 884df26ae..7cfcf91f6 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -12,9 +12,11 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: sshpty.c,v 1.15 2006/02/10 00:27:13 stevesk Exp $"); 15RCSID("$OpenBSD: sshpty.c,v 1.16 2006/02/20 17:19:54 stevesk Exp $");
16 16
17#include <sys/ioctl.h> 17#include <sys/ioctl.h>
18#include <sys/types.h>
19#include <sys/stat.h>
18 20
19#ifdef HAVE_PATHS_H 21#ifdef HAVE_PATHS_H
20# include <paths.h> 22# include <paths.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 18:03:52 +0000