summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--authfd.c3
-rw-r--r--authfile.c3
-rw-r--r--channels.c3
-rw-r--r--cleanup.c5
-rw-r--r--clientloop.c3
-rw-r--r--groupaccess.c3
-rw-r--r--includes.h3
-rw-r--r--log.c3
-rw-r--r--misc.c3
-rw-r--r--msg.c5
-rw-r--r--packet.c3
-rw-r--r--progressmeter.c4
-rw-r--r--readconf.c3
-rw-r--r--readpass.c3
-rw-r--r--scp.c3
-rw-r--r--servconf.c3
-rw-r--r--sftp-client.c3
-rw-r--r--sftp-server.c3
-rw-r--r--sftp.c3
-rw-r--r--ssh-add.c3
-rw-r--r--ssh-agent.c3
-rw-r--r--ssh-keygen.c3
-rw-r--r--ssh-keyscan.c3
-rw-r--r--ssh-keysign.c3
-rw-r--r--ssh.c3
-rw-r--r--sshconnect.c3
-rw-r--r--sshlogin.c5
-rw-r--r--sshpty.c3
-rw-r--r--uidswap.c3
30 files changed, 71 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index 12fa3c6e2..046cadc84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,13 @@
16 [monitor_wrap.h] 16 [monitor_wrap.h]
17 don't need incompletely-typed 'struct passwd' now with 17 don't need incompletely-typed 'struct passwd' now with
18 #include <pwd.h>; ok markus@ 18 #include <pwd.h>; ok markus@
19 - stevesk@cvs.openbsd.org 2006/07/17 01:31:10
20 [authfd.c authfile.c channels.c cleanup.c clientloop.c groupaccess.c]
21 [includes.h log.c misc.c msg.c packet.c progressmeter.c readconf.c]
22 [readpass.c scp.c servconf.c sftp-client.c sftp-server.c sftp.c]
23 [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c]
24 [sshconnect.c sshlogin.c sshpty.c uidswap.c]
25 move #include <unistd.h> out of includes.h
19 26
2020060713 2720060713
21 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h 28 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -4934,4 +4941,4 @@
4934 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4941 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4935 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4942 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4936 4943
4937$Id: ChangeLog,v 1.4412 2006/07/24 03:55:56 djm Exp $ 4944$Id: ChangeLog,v 1.4413 2006/07/24 04:01:23 djm Exp $
diff --git a/authfd.c b/authfd.c
index 5cec7a97c..f8b7ed71f 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfd.c,v 1.76 2006/07/09 15:15:10 stevesk Exp $ */ 1/* $OpenBSD: authfd.c,v 1.77 2006/07/17 01:31:09 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
@@ -44,6 +44,7 @@
44#include <openssl/evp.h> 44#include <openssl/evp.h>
45 45
46#include <fcntl.h> 46#include <fcntl.h>
47#include <unistd.h>
47 48
48#include "ssh.h" 49#include "ssh.h"
49#include "rsa.h" 50#include "rsa.h"
diff --git a/authfile.c b/authfile.c
index cf3d3d9e1..53397ea53 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfile.c,v 1.69 2006/07/11 20:27:56 stevesk Exp $ */ 1/* $OpenBSD: authfile.c,v 1.70 2006/07/17 01:31:09 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
@@ -47,6 +47,7 @@
47 47
48#include <errno.h> 48#include <errno.h>
49#include <fcntl.h> 49#include <fcntl.h>
50#include <unistd.h>
50 51
51#include "cipher.h" 52#include "cipher.h"
52#include "xmalloc.h" 53#include "xmalloc.h"
diff --git a/channels.c b/channels.c
index 2021bad53..fbbae9ed7 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.255 2006/07/12 22:28:51 stevesk Exp $ */ 1/* $OpenBSD: channels.c,v 1.256 2006/07/17 01:31:09 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
@@ -54,6 +54,7 @@
54# include <netdb.h> 54# include <netdb.h>
55#endif 55#endif
56#include <termios.h> 56#include <termios.h>
57#include <unistd.h>
57 58
58#include "ssh.h" 59#include "ssh.h"
59#include "ssh1.h" 60#include "ssh1.h"
diff --git a/cleanup.c b/cleanup.c
index dcf456830..4e6c79ce7 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cleanup.c,v 1.3 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: cleanup.c,v 1.4 2006/07/17 01:31:09 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2003 Markus Friedl <markus@openbsd.org> 3 * Copyright (c) 2003 Markus Friedl <markus@openbsd.org>
4 * 4 *
@@ -14,7 +14,8 @@
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */ 16 */
17#include "includes.h" 17
18#include <unistd.h>
18 19
19#include "log.h" 20#include "log.h"
20 21
diff --git a/clientloop.c b/clientloop.c
index 978289b61..9398dc989 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.168 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.169 2006/07/17 01:31:09 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
@@ -75,6 +75,7 @@
75#endif 75#endif
76#include <signal.h> 76#include <signal.h>
77#include <termios.h> 77#include <termios.h>
78#include <unistd.h>
78 79
79#include "ssh.h" 80#include "ssh.h"
80#include "ssh1.h" 81#include "ssh1.h"
diff --git a/groupaccess.c b/groupaccess.c
index 2b7117b70..41f419740 100644
--- a/groupaccess.c
+++ b/groupaccess.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: groupaccess.c,v 1.9 2006/07/02 22:45:59 stevesk Exp $ */ 1/* $OpenBSD: groupaccess.c,v 1.10 2006/07/17 01:31:09 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Kevin Steves. All rights reserved. 3 * Copyright (c) 2001 Kevin Steves. All rights reserved.
4 * 4 *
@@ -28,6 +28,7 @@
28#include <sys/types.h> 28#include <sys/types.h>
29 29
30#include <grp.h> 30#include <grp.h>
31#include <unistd.h>
31 32
32#include "groupaccess.h" 33#include "groupaccess.h"
33#include "xmalloc.h" 34#include "xmalloc.h"
diff --git a/includes.h b/includes.h
index fbd22e9a1..da89decdd 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.51 2006/07/12 22:42:32 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.52 2006/07/17 01:31:09 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -56,7 +56,6 @@
56#ifdef HAVE_PATHS 56#ifdef HAVE_PATHS
57# include <paths.h> 57# include <paths.h>
58#endif 58#endif
59#include <unistd.h> /* For STDIN_FILENO, etc */
60 59
61/* 60/*
62 *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively 61 *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively
diff --git a/log.c b/log.c
index 8702c3e52..4ad7cfff7 100644
--- a/log.c
+++ b/log.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: log.c,v 1.33 2006/07/10 16:37:36 stevesk Exp $ */ 1/* $OpenBSD: log.c,v 1.34 2006/07/17 01:31:09 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
@@ -38,6 +38,7 @@
38 38
39#include <stdarg.h> 39#include <stdarg.h>
40#include <syslog.h> 40#include <syslog.h>
41#include <unistd.h>
41#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H) 42#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H)
42# include <vis.h> 43# include <vis.h>
43#endif 44#endif
diff --git a/misc.c b/misc.c
index fba085d9b..e9c5ddf8b 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.58 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: misc.c,v 1.59 2006/07/17 01:31:09 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -31,6 +31,7 @@
31#include <sys/socket.h> 31#include <sys/socket.h>
32 32
33#include <stdarg.h> 33#include <stdarg.h>
34#include <unistd.h>
34 35
35#include <netinet/in.h> 36#include <netinet/in.h>
36#include <netinet/tcp.h> 37#include <netinet/tcp.h>
diff --git a/msg.c b/msg.c
index 4344a1312..5c535d1af 100644
--- a/msg.c
+++ b/msg.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: msg.c,v 1.12 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: msg.c,v 1.13 2006/07/17 01:31:09 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -24,7 +24,10 @@
24 */ 24 */
25#include "includes.h" 25#include "includes.h"
26 26
27#include <sys/types.h>
28
27#include <errno.h> 29#include <errno.h>
30#include <unistd.h>
28 31
29#include "buffer.h" 32#include "buffer.h"
30#include "log.h" 33#include "log.h"
diff --git a/packet.c b/packet.c
index e153a7c1b..ce652cfd8 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.135 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: packet.c,v 1.136 2006/07/17 01:31:09 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
@@ -49,6 +49,7 @@
49 49
50#include <errno.h> 50#include <errno.h>
51#include <stdarg.h> 51#include <stdarg.h>
52#include <unistd.h>
52 53
53#include "xmalloc.h" 54#include "xmalloc.h"
54#include "buffer.h" 55#include "buffer.h"
diff --git a/progressmeter.c b/progressmeter.c
index 98a30e11b..cc5f664ab 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: progressmeter.c,v 1.30 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: progressmeter.c,v 1.31 2006/07/17 01:31:09 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2003 Nils Nordman. All rights reserved. 3 * Copyright (c) 2003 Nils Nordman. All rights reserved.
4 * 4 *
@@ -25,10 +25,12 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include <sys/types.h>
28#include <sys/ioctl.h> 29#include <sys/ioctl.h>
29 30
30#include <errno.h> 31#include <errno.h>
31#include <signal.h> 32#include <signal.h>
33#include <unistd.h>
32 34
33#include "progressmeter.h" 35#include "progressmeter.h"
34#include "atomicio.h" 36#include "atomicio.h"
diff --git a/readconf.c b/readconf.c
index 4f790e246..73271e84e 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.155 2006/07/12 22:28:52 stevesk Exp $ */ 1/* $OpenBSD: readconf.c,v 1.156 2006/07/17 01:31:09 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
@@ -25,6 +25,7 @@
25#if defined(HAVE_NETDB_H) 25#if defined(HAVE_NETDB_H)
26# include <netdb.h> 26# include <netdb.h>
27#endif 27#endif
28#include <unistd.h>
28 29
29#include "ssh.h" 30#include "ssh.h"
30#include "xmalloc.h" 31#include "xmalloc.h"
diff --git a/readpass.c b/readpass.c
index 63197c915..725ae5789 100644
--- a/readpass.c
+++ b/readpass.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readpass.c,v 1.42 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: readpass.c,v 1.43 2006/07/17 01:31:09 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -34,6 +34,7 @@
34# include <paths.h> 34# include <paths.h>
35#endif 35#endif
36#include <stdarg.h> 36#include <stdarg.h>
37#include <unistd.h>
37 38
38#include "xmalloc.h" 39#include "xmalloc.h"
39#include "misc.h" 40#include "misc.h"
diff --git a/scp.c b/scp.c
index 5e3a93ed5..03f815fbe 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: scp.c,v 1.147 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: scp.c,v 1.148 2006/07/17 01:31:09 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).
@@ -86,6 +86,7 @@
86#include <pwd.h> 86#include <pwd.h>
87#include <signal.h> 87#include <signal.h>
88#include <stdarg.h> 88#include <stdarg.h>
89#include <unistd.h>
89 90
90#include "xmalloc.h" 91#include "xmalloc.h"
91#include "atomicio.h" 92#include "atomicio.h"
diff --git a/servconf.c b/servconf.c
index 20e3f1a86..330e79143 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.c,v 1.154 2006/07/12 22:28:52 stevesk Exp $ */ 1/* $OpenBSD: servconf.c,v 1.155 2006/07/17 01:31:09 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -18,6 +18,7 @@
18#if defined(HAVE_NETDB_H) 18#if defined(HAVE_NETDB_H)
19# include <netdb.h> 19# include <netdb.h>
20#endif 20#endif
21#include <unistd.h>
21 22
22#include "ssh.h" 23#include "ssh.h"
23#include "log.h" 24#include "log.h"
diff --git a/sftp-client.c b/sftp-client.c
index 8fe0c0fe5..5ba4f0a9f 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-client.c,v 1.67 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: sftp-client.c,v 1.68 2006/07/17 01:31:09 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 *
@@ -30,6 +30,7 @@
30#include <errno.h> 30#include <errno.h>
31#include <fcntl.h> 31#include <fcntl.h>
32#include <signal.h> 32#include <signal.h>
33#include <unistd.h>
33 34
34#include "openbsd-compat/sys-queue.h" 35#include "openbsd-compat/sys-queue.h"
35 36
diff --git a/sftp-server.c b/sftp-server.c
index 29503246e..923cc8c19 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.62 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.63 2006/07/17 01:31:09 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 *
@@ -23,6 +23,7 @@
23#include <errno.h> 23#include <errno.h>
24#include <fcntl.h> 24#include <fcntl.h>
25#include <pwd.h> 25#include <pwd.h>
26#include <unistd.h>
26 27
27#include "buffer.h" 28#include "buffer.h"
28#include "bufaux.h" 29#include "bufaux.h"
diff --git a/sftp.c b/sftp.c
index 649f08e5d..1a88f33f9 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.85 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: sftp.c,v 1.86 2006/07/17 01:31:09 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 *
@@ -36,6 +36,7 @@
36typedef void EditLine; 36typedef void EditLine;
37#endif 37#endif
38#include <signal.h> 38#include <signal.h>
39#include <unistd.h>
39 40
40#include "xmalloc.h" 41#include "xmalloc.h"
41#include "log.h" 42#include "log.h"
diff --git a/ssh-add.c b/ssh-add.c
index 07de9246e..974a1629b 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.83 2006/07/09 15:27:59 stevesk Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.84 2006/07/17 01:31:09 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
@@ -44,6 +44,7 @@
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46#include <pwd.h> 46#include <pwd.h>
47#include <unistd.h>
47 48
48#include "ssh.h" 49#include "ssh.h"
49#include "rsa.h" 50#include "rsa.h"
diff --git a/ssh-agent.c b/ssh-agent.c
index 4421fa424..621b09771 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.143 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.144 2006/07/17 01:31:10 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
@@ -51,6 +51,7 @@
51# include <paths.h> 51# include <paths.h>
52#endif 52#endif
53#include <signal.h> 53#include <signal.h>
54#include <unistd.h>
54 55
55#include <openssl/evp.h> 56#include <openssl/evp.h>
56#include <openssl/md5.h> 57#include <openssl/md5.h>
diff --git a/ssh-keygen.c b/ssh-keygen.c
index b217c55e8..56ad725d8 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.148 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.149 2006/07/17 01:31:10 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -30,6 +30,7 @@
30# include <paths.h> 30# include <paths.h>
31#endif 31#endif
32#include <pwd.h> 32#include <pwd.h>
33#include <unistd.h>
33 34
34#include "xmalloc.h" 35#include "xmalloc.h"
35#include "key.h" 36#include "key.h"
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 38c37e579..fd71f7224 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keyscan.c,v 1.67 2006/07/12 22:28:52 stevesk Exp $ */ 1/* $OpenBSD: ssh-keyscan.c,v 1.68 2006/07/17 01:31:10 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 *
@@ -17,6 +17,7 @@
17#include <errno.h> 17#include <errno.h>
18#include <stdarg.h> 18#include <stdarg.h>
19#include <setjmp.h> 19#include <setjmp.h>
20#include <unistd.h>
20 21
21#include <openssl/bn.h> 22#include <openssl/bn.h>
22 23
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 02c10e2e9..b558e54f7 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keysign.c,v 1.25 2006/07/09 15:15:11 stevesk Exp $ */ 1/* $OpenBSD: ssh-keysign.c,v 1.26 2006/07/17 01:31:10 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -29,6 +29,7 @@
29#include <paths.h> 29#include <paths.h>
30#endif 30#endif
31#include <pwd.h> 31#include <pwd.h>
32#include <unistd.h>
32 33
33#include <openssl/evp.h> 34#include <openssl/evp.h>
34#include <openssl/rand.h> 35#include <openssl/rand.h>
diff --git a/ssh.c b/ssh.c
index 461b39817..e482eb1b5 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.287 2006/07/12 22:42:32 stevesk Exp $ */ 1/* $OpenBSD: ssh.c,v 1.288 2006/07/17 01:31:10 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
@@ -63,6 +63,7 @@
63#include <pwd.h> 63#include <pwd.h>
64#include <signal.h> 64#include <signal.h>
65#include <stddef.h> 65#include <stddef.h>
66#include <unistd.h>
66 67
67#include <openssl/evp.h> 68#include <openssl/evp.h>
68#include <openssl/err.h> 69#include <openssl/err.h>
diff --git a/sshconnect.c b/sshconnect.c
index fe9b4842c..1c69044ea 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.191 2006/07/12 22:28:52 stevesk Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.192 2006/07/17 01:31:10 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
@@ -31,6 +31,7 @@
31#include <paths.h> 31#include <paths.h>
32#endif 32#endif
33#include <pwd.h> 33#include <pwd.h>
34#include <unistd.h>
34 35
35#include "ssh.h" 36#include "ssh.h"
36#include "xmalloc.h" 37#include "xmalloc.h"
diff --git a/sshlogin.c b/sshlogin.c
index 808ad605e..335069313 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshlogin.c,v 1.19 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: sshlogin.c,v 1.20 2006/07/17 01:31:10 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
@@ -41,8 +41,11 @@
41 41
42#include "includes.h" 42#include "includes.h"
43 43
44#include <sys/types.h>
45
44#include <errno.h> 46#include <errno.h>
45#include <fcntl.h> 47#include <fcntl.h>
48#include <unistd.h>
46 49
47#include "loginrec.h" 50#include "loginrec.h"
48#include "log.h" 51#include "log.h"
diff --git a/sshpty.c b/sshpty.c
index 10dae0328..931c91f47 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshpty.c,v 1.23 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: sshpty.c,v 1.24 2006/07/17 01:31:10 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
@@ -30,6 +30,7 @@
30#ifdef HAVE_UTIL_H 30#ifdef HAVE_UTIL_H
31# include <util.h> 31# include <util.h>
32#endif /* HAVE_UTIL_H */ 32#endif /* HAVE_UTIL_H */
33#include <unistd.h>
33 34
34#include "sshpty.h" 35#include "sshpty.h"
35#include "log.h" 36#include "log.h"
diff --git a/uidswap.c b/uidswap.c
index e97cd7059..2fe5feaed 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: uidswap.c,v 1.31 2006/07/11 20:07:25 stevesk Exp $ */ 1/* $OpenBSD: uidswap.c,v 1.32 2006/07/17 01:31:10 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
@@ -18,6 +18,7 @@
18 18
19#include <errno.h> 19#include <errno.h>
20#include <pwd.h> 20#include <pwd.h>
21#include <unistd.h>
21 22
22#include <grp.h> 23#include <grp.h>
23 24