summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--auth2-none.c4
-rw-r--r--authfd.c4
-rw-r--r--authfile.c4
-rw-r--r--includes.h3
-rw-r--r--misc.c3
-rw-r--r--monitor.c3
-rw-r--r--readpass.c3
-rw-r--r--scp.c3
-rw-r--r--serverloop.c3
-rw-r--r--sftp-client.c6
-rw-r--r--sftp-server.c3
-rw-r--r--ssh-add.c3
-rw-r--r--ssh-agent.c3
-rw-r--r--ssh-keygen.c3
-rw-r--r--ssh-keysign.c3
-rw-r--r--ssh.c3
-rw-r--r--sshd.c3
-rw-r--r--sshlogin.c4
-rw-r--r--sshpty.c3
20 files changed, 50 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 3acb62484..f690573b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,12 @@
68 - stevesk@cvs.openbsd.org 2006/07/08 23:30:06 68 - stevesk@cvs.openbsd.org 2006/07/08 23:30:06
69 [log.c] 69 [log.c]
70 move user includes after /usr/include files 70 move user includes after /usr/include files
71 - stevesk@cvs.openbsd.org 2006/07/09 15:15:11
72 [auth2-none.c authfd.c authfile.c includes.h misc.c monitor.c]
73 [readpass.c scp.c serverloop.c sftp-client.c sftp-server.c]
74 [ssh-add.c ssh-agent.c ssh-keygen.c ssh-keysign.c ssh.c sshd.c]
75 [sshlogin.c sshpty.c]
76 move #include <fcntl.h> out of includes.h
71 77
7220060706 7820060706
73 - (dtucker) [configure.ac] Try AIX blibpath test in different order when 79 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4801,4 +4807,4 @@
4801 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4807 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4802 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4808 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4803 4809
4804$Id: ChangeLog,v 1.4376 2006/07/10 11:09:22 djm Exp $ 4810$Id: ChangeLog,v 1.4377 2006/07/10 11:13:46 djm Exp $
diff --git a/auth2-none.c b/auth2-none.c
index 3fdf09a3a..d6738175f 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth2-none.c,v 1.10 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: auth2-none.c,v 1.11 2006/07/09 15:15:10 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -28,6 +28,8 @@
28#include <sys/types.h> 28#include <sys/types.h>
29#include <sys/stat.h> 29#include <sys/stat.h>
30 30
31#include <fcntl.h>
32
31#include "auth.h" 33#include "auth.h"
32#include "xmalloc.h" 34#include "xmalloc.h"
33#include "packet.h" 35#include "packet.h"
diff --git a/authfd.c b/authfd.c
index 0d2b09ecc..5cec7a97c 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfd.c,v 1.75 2006/07/08 21:47:12 stevesk Exp $ */ 1/* $OpenBSD: authfd.c,v 1.76 2006/07/09 15:15: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
@@ -43,6 +43,8 @@
43 43
44#include <openssl/evp.h> 44#include <openssl/evp.h>
45 45
46#include <fcntl.h>
47
46#include "ssh.h" 48#include "ssh.h"
47#include "rsa.h" 49#include "rsa.h"
48#include "buffer.h" 50#include "buffer.h"
diff --git a/authfile.c b/authfile.c
index b1a28528f..e928b0b0e 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfile.c,v 1.67 2006/04/25 08:02:27 dtucker Exp $ */ 1/* $OpenBSD: authfile.c,v 1.68 2006/07/09 15:15: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
@@ -45,6 +45,8 @@
45#include <openssl/evp.h> 45#include <openssl/evp.h>
46#include <openssl/pem.h> 46#include <openssl/pem.h>
47 47
48#include <fcntl.h>
49
48#include "cipher.h" 50#include "cipher.h"
49#include "xmalloc.h" 51#include "xmalloc.h"
50#include "buffer.h" 52#include "buffer.h"
diff --git a/includes.h b/includes.h
index 417d7c01b..6e8f5416f 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.46 2006/07/08 21:47:12 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.47 2006/07/09 15:15:10 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -23,7 +23,6 @@
23#include <stdarg.h> 23#include <stdarg.h>
24#include <stdio.h> 24#include <stdio.h>
25#include <errno.h> 25#include <errno.h>
26#include <fcntl.h> /* For O_NONBLOCK */
27#include <stdlib.h> 26#include <stdlib.h>
28#include <string.h> 27#include <string.h>
29#include <stdarg.h> 28#include <stdarg.h>
diff --git a/misc.c b/misc.c
index b7316519d..2abb14051 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.54 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: misc.c,v 1.55 2006/07/09 15:15:10 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.
@@ -33,6 +33,7 @@
33#include <netinet/in.h> 33#include <netinet/in.h>
34#include <netinet/tcp.h> 34#include <netinet/tcp.h>
35 35
36#include <fcntl.h>
36#ifdef HAVE_PATHS_H 37#ifdef HAVE_PATHS_H
37# include <paths.h> 38# include <paths.h>
38#include <pwd.h> 39#include <pwd.h>
diff --git a/monitor.c b/monitor.c
index 73306948a..b06cecf7d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.79 2006/07/08 21:48:53 stevesk Exp $ */ 1/* $OpenBSD: monitor.c,v 1.80 2006/07/09 15:15:10 stevesk Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -31,6 +31,7 @@
31#include <sys/socket.h> 31#include <sys/socket.h>
32#include <sys/wait.h> 32#include <sys/wait.h>
33 33
34#include <fcntl.h>
34#ifdef HAVE_PATHS_H 35#ifdef HAVE_PATHS_H
35#include <paths.h> 36#include <paths.h>
36#endif 37#endif
diff --git a/readpass.c b/readpass.c
index 34d70b07a..b83b6f5ee 100644
--- a/readpass.c
+++ b/readpass.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readpass.c,v 1.39 2006/06/08 14:45:49 markus Exp $ */ 1/* $OpenBSD: readpass.c,v 1.40 2006/07/09 15:15:10 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -28,6 +28,7 @@
28#include <sys/types.h> 28#include <sys/types.h>
29#include <sys/wait.h> 29#include <sys/wait.h>
30 30
31#include <fcntl.h>
31#ifdef HAVE_PATHS_H 32#ifdef HAVE_PATHS_H
32# include <paths.h> 33# include <paths.h>
33#endif 34#endif
diff --git a/scp.c b/scp.c
index cfe2165e6..600df161a 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: scp.c,v 1.143 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: scp.c,v 1.144 2006/07/09 15:15:10 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).
@@ -81,6 +81,7 @@
81 81
82#include <ctype.h> 82#include <ctype.h>
83#include <dirent.h> 83#include <dirent.h>
84#include <fcntl.h>
84#include <pwd.h> 85#include <pwd.h>
85#include <signal.h> 86#include <signal.h>
86 87
diff --git a/serverloop.c b/serverloop.c
index 14baecae1..09063ab8c 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: serverloop.c,v 1.137 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: serverloop.c,v 1.138 2006/07/09 15:15:11 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
@@ -43,6 +43,7 @@
43 43
44#include <netinet/in.h> 44#include <netinet/in.h>
45 45
46#include <fcntl.h>
46#include <pwd.h> 47#include <pwd.h>
47#include <signal.h> 48#include <signal.h>
48#include <termios.h> 49#include <termios.h>
diff --git a/sftp-client.c b/sftp-client.c
index 8778439b9..e10361e93 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-client.c,v 1.65 2006/04/16 00:54:10 djm Exp $ */ 1/* $OpenBSD: sftp-client.c,v 1.66 2006/07/09 15:15:11 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,7 +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# include <signal.h> 29
30#include <fcntl.h>
31#include <signal.h>
30 32
31#include "openbsd-compat/sys-queue.h" 33#include "openbsd-compat/sys-queue.h"
32 34
diff --git a/sftp-server.c b/sftp-server.c
index b95cb96c2..0c6f4c24e 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-server.c,v 1.58 2006/07/06 10:47:57 djm Exp $ */ 1/* $OpenBSD: sftp-server.c,v 1.59 2006/07/09 15:15:11 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 *
@@ -20,6 +20,7 @@
20#include <sys/stat.h> 20#include <sys/stat.h>
21 21
22#include <dirent.h> 22#include <dirent.h>
23#include <fcntl.h>
23#include <pwd.h> 24#include <pwd.h>
24 25
25#include "buffer.h" 26#include "buffer.h"
diff --git a/ssh-add.c b/ssh-add.c
index 1cc10295f..f8db1eb3d 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.81 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.82 2006/07/09 15:15:11 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,7 @@
42 42
43#include <openssl/evp.h> 43#include <openssl/evp.h>
44 44
45#include <fcntl.h>
45#include <pwd.h> 46#include <pwd.h>
46 47
47#include "ssh.h" 48#include "ssh.h"
diff --git a/ssh-agent.c b/ssh-agent.c
index 87e94b0ea..57c7380f3 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.141 2006/07/08 21:47:12 stevesk Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.142 2006/07/09 15:15:11 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,7 @@
45#include "openbsd-compat/sys-queue.h" 45#include "openbsd-compat/sys-queue.h"
46#include <sys/resource.h> 46#include <sys/resource.h>
47 47
48#include <fcntl.h>
48#ifdef HAVE_PATHS_H 49#ifdef HAVE_PATHS_H
49# include <paths.h> 50# include <paths.h>
50#endif 51#endif
diff --git a/ssh-keygen.c b/ssh-keygen.c
index afa718a96..b6959ca11 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.146 2006/07/06 16:22:39 stevesk Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.147 2006/07/09 15:15:11 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
@@ -21,6 +21,7 @@
21#include <openssl/evp.h> 21#include <openssl/evp.h>
22#include <openssl/pem.h> 22#include <openssl/pem.h>
23 23
24#include <fcntl.h>
24#include <paths.h> 25#include <paths.h>
25#include <pwd.h> 26#include <pwd.h>
26 27
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 751d49a90..02c10e2e9 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keysign.c,v 1.24 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: ssh-keysign.c,v 1.25 2006/07/09 15:15:11 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,6 +24,7 @@
24 */ 24 */
25#include "includes.h" 25#include "includes.h"
26 26
27#include <fcntl.h>
27#ifdef HAVE_PATHS_H 28#ifdef HAVE_PATHS_H
28#include <paths.h> 29#include <paths.h>
29#endif 30#endif
diff --git a/ssh.c b/ssh.c
index ee4f92f92..d5c067018 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.280 2006/07/08 21:47:12 stevesk Exp $ */ 1/* $OpenBSD: ssh.c,v 1.281 2006/07/09 15:15:11 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
@@ -52,6 +52,7 @@
52#include <sys/un.h> 52#include <sys/un.h>
53 53
54#include <ctype.h> 54#include <ctype.h>
55#include <fcntl.h>
55#ifdef HAVE_PATHS_H 56#ifdef HAVE_PATHS_H
56#include <paths.h> 57#include <paths.h>
57#endif 58#endif
diff --git a/sshd.c b/sshd.c
index 4131f1699..591622fd0 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.334 2006/07/08 21:47:12 stevesk Exp $ */ 1/* $OpenBSD: sshd.c,v 1.335 2006/07/09 15:15:11 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
@@ -52,6 +52,7 @@
52#include <sys/socket.h> 52#include <sys/socket.h>
53#include <sys/wait.h> 53#include <sys/wait.h>
54 54
55#include <fcntl.h>
55#ifdef HAVE_PATHS_H 56#ifdef HAVE_PATHS_H
56#include <paths.h> 57#include <paths.h>
57#endif 58#endif
diff --git a/sshlogin.c b/sshlogin.c
index a472b511c..9b5ce1fde 100644
--- a/sshlogin.c
+++ b/sshlogin.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshlogin.c,v 1.17 2006/03/25 18:36:15 deraadt Exp $ */ 1/* $OpenBSD: sshlogin.c,v 1.18 2006/07/09 15:15:11 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,6 +41,8 @@
41 41
42#include "includes.h" 42#include "includes.h"
43 43
44#include <fcntl.h>
45
44#include "loginrec.h" 46#include "loginrec.h"
45#include "log.h" 47#include "log.h"
46#include "buffer.h" 48#include "buffer.h"
diff --git a/sshpty.c b/sshpty.c
index 973c2d2d8..7f4e8bc16 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshpty.c,v 1.21 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: sshpty.c,v 1.22 2006/07/09 15:15:11 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,7 @@
19#include <sys/stat.h> 19#include <sys/stat.h>
20#include <signal.h> 20#include <signal.h>
21 21
22#include <fcntl.h>
22#include <grp.h> 23#include <grp.h>
23#ifdef HAVE_PATHS_H 24#ifdef HAVE_PATHS_H
24# include <paths.h> 25# include <paths.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-30 19:51:59 +0000