summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--channels.c5
-rw-r--r--clientloop.c7
-rw-r--r--includes.h8
-rw-r--r--packet.c5
-rw-r--r--scp.c5
-rw-r--r--serverloop.c5
-rw-r--r--sftp-client.c5
-rw-r--r--sftp-server.c5
-rw-r--r--ssh-agent.c5
-rw-r--r--ssh-keyscan.c5
-rw-r--r--sshconnect.c5
-rw-r--r--sshd.c5
13 files changed, 51 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index ae91a5b7a..fbed54378 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
7 - stevesk@cvs.openbsd.org 2006/07/25 02:01:34 7 - stevesk@cvs.openbsd.org 2006/07/25 02:01:34
8 [scard.c] 8 [scard.c]
9 need #include <string.h> 9 need #include <string.h>
10 - stevesk@cvs.openbsd.org 2006/07/25 02:59:21
11 [channels.c clientloop.c packet.c scp.c serverloop.c sftp-client.c]
12 [sftp-server.c ssh-agent.c ssh-keyscan.c sshconnect.c sshd.c]
13 move #include <sys/time.h> out of includes.h
10 14
1120060804 1520060804
12 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent 16 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@@ -5077,4 +5081,4 @@
5077 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5081 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5078 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5082 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5079 5083
5080$Id: ChangeLog,v 1.4443 2006/08/04 23:33:15 djm Exp $ 5084$Id: ChangeLog,v 1.4444 2006/08/05 00:57:45 djm Exp $
diff --git a/channels.c b/channels.c
index 895c43f6a..f59afe01b 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.260 2006/07/22 20:48:22 stevesk Exp $ */ 1/* $OpenBSD: channels.c,v 1.261 2006/07/25 02:59:21 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -45,6 +45,9 @@
45#include <sys/types.h> 45#include <sys/types.h>
46#include <sys/un.h> 46#include <sys/un.h>
47#include <sys/socket.h> 47#include <sys/socket.h>
48#ifdef HAVE_SYS_TIME_H
49# include <sys/time.h>
50#endif
48 51
49#include <netinet/in.h> 52#include <netinet/in.h>
50#include <arpa/inet.h> 53#include <arpa/inet.h>
diff --git a/clientloop.c b/clientloop.c
index 0c700dbd4..e38089c1e 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.170 2006/07/22 20:48:22 stevesk Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.171 2006/07/25 02:59:21 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -62,11 +62,14 @@
62#include "includes.h" 62#include "includes.h"
63 63
64#include <sys/types.h> 64#include <sys/types.h>
65#include <sys/ioctl.h>
65#ifdef HAVE_SYS_STAT_H 66#ifdef HAVE_SYS_STAT_H
66# include <sys/stat.h> 67# include <sys/stat.h>
67#endif 68#endif
69#ifdef HAVE_SYS_TIME_H
70# include <sys/time.h>
71#endif
68#include <sys/socket.h> 72#include <sys/socket.h>
69#include <sys/ioctl.h>
70 73
71#include <ctype.h> 74#include <ctype.h>
72#include <errno.h> 75#include <errno.h>
diff --git a/includes.h b/includes.h
index 7a7bd8176..fc85e6778 100644
--- a/includes.h
+++ b/includes.h
@@ -20,6 +20,7 @@
20 20
21#define _GNU_SOURCE /* activate extra prototypes for glibc */ 21#define _GNU_SOURCE /* activate extra prototypes for glibc */
22 22
23#include <sys/types.h>
23#include <stdio.h> 24#include <stdio.h>
24#include <stdlib.h> 25#include <stdlib.h>
25 26
@@ -69,19 +70,12 @@
69# include <utmp.h> 70# include <utmp.h>
70#endif 71#endif
71#ifdef HAVE_UTMPX_H 72#ifdef HAVE_UTMPX_H
72# ifdef HAVE_TV_IN_UTMPX
73# include <sys/time.h>
74# endif
75# include <utmpx.h> 73# include <utmpx.h>
76#endif 74#endif
77#ifdef HAVE_LASTLOG_H 75#ifdef HAVE_LASTLOG_H
78# include <lastlog.h> 76# include <lastlog.h>
79#endif 77#endif
80 78
81#include <sys/types.h>
82#ifdef HAVE_SYS_TIME_H
83# include <sys/time.h> /* For timersub */
84#endif
85#ifdef HAVE_SYS_SELECT_H 79#ifdef HAVE_SYS_SELECT_H
86# include <sys/select.h> 80# include <sys/select.h>
87#endif 81#endif
diff --git a/packet.c b/packet.c
index 8250b3bc8..a20e4ed02 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.137 2006/07/22 20:48:23 stevesk Exp $ */ 1/* $OpenBSD: packet.c,v 1.138 2006/07/25 02:59:21 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -42,6 +42,9 @@
42#include <sys/types.h> 42#include <sys/types.h>
43#include "openbsd-compat/sys-queue.h" 43#include "openbsd-compat/sys-queue.h"
44#include <sys/socket.h> 44#include <sys/socket.h>
45#ifdef HAVE_SYS_TIME_H
46# include <sys/time.h>
47#endif
45 48
46#include <netinet/in_systm.h> 49#include <netinet/in_systm.h>
47#include <netinet/in.h> 50#include <netinet/in.h>
diff --git a/scp.c b/scp.c
index 5ff6cac9a..cf8db8f34 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: scp.c,v 1.150 2006/07/22 20:48:23 stevesk Exp $ */ 1/* $OpenBSD: scp.c,v 1.151 2006/07/25 02:59:21 stevesk Exp $ */
2/* 2/*
3 * scp - secure remote copy. This is basically patched BSD rcp which 3 * scp - secure remote copy. This is basically patched BSD rcp which
4 * uses ssh to do the data transfer (instead of using rcmd). 4 * uses ssh to do the data transfer (instead of using rcmd).
@@ -77,6 +77,9 @@
77#ifdef HAVE_SYS_STAT_H 77#ifdef HAVE_SYS_STAT_H
78# include <sys/stat.h> 78# include <sys/stat.h>
79#endif 79#endif
80#ifdef HAVE_SYS_TIME_H
81# include <sys/time.h>
82#endif
80#include <sys/wait.h> 83#include <sys/wait.h>
81 84
82#include <ctype.h> 85#include <ctype.h>
diff --git a/serverloop.c b/serverloop.c
index ba1e0dad7..1772992e8 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: serverloop.c,v 1.141 2006/07/22 20:48:23 stevesk Exp $ */ 1/* $OpenBSD: serverloop.c,v 1.142 2006/07/25 02:59:21 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -40,6 +40,9 @@
40#include <sys/types.h> 40#include <sys/types.h>
41#include <sys/wait.h> 41#include <sys/wait.h>
42#include <sys/socket.h> 42#include <sys/socket.h>
43#ifdef HAVE_SYS_TIME_H
44# include <sys/time.h>
45#endif
43 46
44#include <netinet/in.h> 47#include <netinet/in.h>
45 48
diff --git a/sftp-client.c b/sftp-client.c
index 9e7011ffd..b00dc70bd 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-client.c,v 1.70 2006/07/23 01:11:05 stevesk Exp $ */ 1/* $OpenBSD: sftp-client.c,v 1.71 2006/07/25 02:59:21 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -26,6 +26,9 @@
26#ifdef HAVE_SYS_STAT_H 26#ifdef HAVE_SYS_STAT_H
27# include <sys/stat.h> 27# include <sys/stat.h>
28#endif 28#endif
29#ifdef HAVE_SYS_TIME_H
30# include <sys/time.h>
31#endif
29 32
30#include <errno.h> 33#include <errno.h>
31#include <fcntl.h> 34#include <fcntl.h>
diff --git a/sftp-server.c b/sftp-server.c
index 6067f0203..13ba8e625 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.65 2006/07/22 20:48:23 stevesk Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.66 2006/07/25 02:59:21 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
4 * 4 *
@@ -18,6 +18,9 @@
18 18
19#include <sys/types.h> 19#include <sys/types.h>
20#include <sys/stat.h> 20#include <sys/stat.h>
21#ifdef HAVE_SYS_TIME_H
22# include <sys/time.h>
23#endif
21 24
22#include <dirent.h> 25#include <dirent.h>
23#include <errno.h> 26#include <errno.h>
diff --git a/ssh-agent.c b/ssh-agent.c
index 5bf4dbc18..e4b620483 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.146 2006/07/22 20:48:23 stevesk Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.147 2006/07/25 02:59:21 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -39,6 +39,9 @@
39#include <sys/types.h> 39#include <sys/types.h>
40#include <sys/stat.h> 40#include <sys/stat.h>
41#include <sys/socket.h> 41#include <sys/socket.h>
42#ifdef HAVE_SYS_TIME_H
43# include <sys/time.h>
44#endif
42#ifdef HAVE_SYS_UN_H 45#ifdef HAVE_SYS_UN_H
43# include <sys/un.h> 46# include <sys/un.h>
44#endif 47#endif
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 6b706f0af..e47460a8a 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keyscan.c,v 1.69 2006/07/22 20:48:23 stevesk Exp $ */ 1/* $OpenBSD: ssh-keyscan.c,v 1.70 2006/07/25 02:59:21 stevesk Exp $ */
2/* 2/*
3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4 * 4 *
@@ -11,6 +11,9 @@
11 11
12#include "openbsd-compat/sys-queue.h" 12#include "openbsd-compat/sys-queue.h"
13#include <sys/resource.h> 13#include <sys/resource.h>
14#ifdef HAVE_SYS_TIME_H
15# include <sys/time.h>
16#endif
14 17
15#include <openssl/bn.h> 18#include <openssl/bn.h>
16 19
diff --git a/sshconnect.c b/sshconnect.c
index 06844eb71..4301fb20f 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.194 2006/07/24 13:58:22 stevesk Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.195 2006/07/25 02:59:21 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -19,6 +19,9 @@
19#include <sys/wait.h> 19#include <sys/wait.h>
20#include <sys/stat.h> 20#include <sys/stat.h>
21#include <sys/socket.h> 21#include <sys/socket.h>
22#ifdef HAVE_SYS_TIME_H
23# include <sys/time.h>
24#endif
22 25
23#include <netinet/in.h> 26#include <netinet/in.h>
24 27
diff --git a/sshd.c b/sshd.c
index cc1ebd8d9..82a37ef46 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.339 2006/07/22 20:48:23 stevesk Exp $ */ 1/* $OpenBSD: sshd.c,v 1.340 2006/07/25 02:59:21 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -50,6 +50,9 @@
50#endif 50#endif
51#include <sys/ioctl.h> 51#include <sys/ioctl.h>
52#include <sys/socket.h> 52#include <sys/socket.h>
53#ifdef HAVE_SYS_TIME_H
54# include <sys/time.h>
55#endif
53#include <sys/wait.h> 56#include <sys/wait.h>
54 57
55#include <errno.h> 58#include <errno.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 09:44:46 +0000