diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth-rhosts.c | 5 | ||||
-rw-r--r-- | auth-rsa.c | 5 | ||||
-rw-r--r-- | auth.c | 5 | ||||
-rw-r--r-- | auth2-none.c | 5 | ||||
-rw-r--r-- | auth2-pubkey.c | 5 | ||||
-rw-r--r-- | authfile.c | 5 | ||||
-rw-r--r-- | clientloop.c | 6 | ||||
-rw-r--r-- | includes.h | 5 | ||||
-rw-r--r-- | readconf.c | 5 | ||||
-rw-r--r-- | scp.c | 5 | ||||
-rw-r--r-- | session.c | 5 | ||||
-rw-r--r-- | sftp-client.c | 7 | ||||
-rw-r--r-- | sftp-common.c | 5 | ||||
-rw-r--r-- | sftp-common.h | 5 | ||||
-rw-r--r-- | sftp-glob.c | 7 | ||||
-rw-r--r-- | sftp-server.c | 5 | ||||
-rw-r--r-- | sftp.c | 7 | ||||
-rw-r--r-- | ssh-add.c | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 5 | ||||
-rw-r--r-- | ssh.c | 7 | ||||
-rw-r--r-- | sshconnect.c | 3 | ||||
-rw-r--r-- | sshconnect2.c | 3 | ||||
-rw-r--r-- | sshd.c | 7 | ||||
-rw-r--r-- | sshpty.c | 4 |
25 files changed, 101 insertions, 31 deletions
@@ -135,6 +135,10 @@ - stevesk@cvs.openbsd.org 2006/02/20 16:36:15 [authfd.c channels.c includes.h session.c ssh-agent.c ssh.c] move #include <sys/un.h> out of includes.h; ok djm@ + - 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@ 20060313 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) @@ -4036,4 +4040,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4178 2006/03/15 00:40:10 djm Exp $ +$Id: ChangeLog,v 1.4179 2006/03/15 00:45:54 djm Exp $ diff --git a/auth-rhosts.c b/auth-rhosts.c index 9748a945..1deeb30b 100644 --- a/auth-rhosts.c +++ b/auth-rhosts.c @@ -14,7 +14,10 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-rhosts.c,v 1.34 2006/02/07 01:08:04 stevesk Exp $"); +RCSID("$OpenBSD: auth-rhosts.c,v 1.35 2006/02/20 17:19:53 stevesk Exp $"); + +#include <sys/types.h> +#include <sys/stat.h> #ifdef HAVE_NETGROUP_H # include <netgroup.h> @@ -14,7 +14,10 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-rsa.c,v 1.63 2005/06/17 02:44:32 djm Exp $"); +RCSID("$OpenBSD: auth-rsa.c,v 1.64 2006/02/20 17:19:53 stevesk Exp $"); + +#include <sys/types.h> +#include <sys/stat.h> #include <openssl/rsa.h> #include <openssl/md5.h> @@ -23,7 +23,10 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth.c,v 1.61 2006/02/08 12:15:27 stevesk Exp $"); +RCSID("$OpenBSD: auth.c,v 1.62 2006/02/20 17:19:53 stevesk Exp $"); + +#include <sys/types.h> +#include <sys/stat.h> #ifdef HAVE_PATHS_H # include <paths.h> diff --git a/auth2-none.c b/auth2-none.c index 1c30a320..2eb27a91 100644 --- a/auth2-none.c +++ b/auth2-none.c @@ -23,7 +23,10 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2-none.c,v 1.7 2004/05/11 19:01:43 deraadt Exp $"); +RCSID("$OpenBSD: auth2-none.c,v 1.8 2006/02/20 17:19:54 stevesk Exp $"); + +#include <sys/types.h> +#include <sys/stat.h> #include "auth.h" #include "xmalloc.h" diff --git a/auth2-pubkey.c b/auth2-pubkey.c index a97d0f43..ea136707 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c @@ -23,7 +23,10 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2-pubkey.c,v 1.9 2004/12/11 01:48:56 dtucker Exp $"); +RCSID("$OpenBSD: auth2-pubkey.c,v 1.10 2006/02/20 17:19:54 stevesk Exp $"); + +#include <sys/types.h> +#include <sys/stat.h> #include "ssh.h" #include "ssh2.h" @@ -36,7 +36,10 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfile.c,v 1.61 2005/06/17 02:44:32 djm Exp $"); +RCSID("$OpenBSD: authfile.c,v 1.62 2006/02/20 17:19:54 stevesk Exp $"); + +#include <sys/types.h> +#include <sys/stat.h> #include <openssl/err.h> #include <openssl/evp.h> diff --git a/clientloop.c b/clientloop.c index 52f3bd5b..a7c510cc 100644 --- a/clientloop.c +++ b/clientloop.c @@ -59,8 +59,12 @@ */ #include "includes.h" -RCSID("$OpenBSD: clientloop.c,v 1.152 2006/02/10 00:27:13 stevesk Exp $"); +RCSID("$OpenBSD: clientloop.c,v 1.154 2006/02/20 17:19:54 stevesk Exp $"); +#include <sys/types.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #include <sys/ioctl.h> #include <paths.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: includes.h,v 1.34 2006/02/20 16:36:14 stevesk Exp $ */ +/* $OpenBSD: includes.h,v 1.36 2006/02/20 17:19:53 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -111,9 +111,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg } #ifdef HAVE_SYS_CDEFS_H # include <sys/cdefs.h> /* For __P() */ #endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> /* For S_* constants and macros */ -#endif #ifdef HAVE_SYS_SYSMACROS_H # include <sys/sysmacros.h> /* For MIN, MAX, etc */ #endif @@ -12,7 +12,10 @@ */ #include "includes.h" -RCSID("$OpenBSD: readconf.c,v 1.146 2006/02/12 10:44:18 djm Exp $"); +RCSID("$OpenBSD: readconf.c,v 1.147 2006/02/20 17:19:54 stevesk Exp $"); + +#include <sys/types.h> +#include <sys/stat.h> #include "ssh.h" #include "xmalloc.h" @@ -71,9 +71,12 @@ */ #include "includes.h" -RCSID("$OpenBSD: scp.c,v 1.132 2006/02/10 01:44:26 stevesk Exp $"); +RCSID("$OpenBSD: scp.c,v 1.134 2006/02/20 17:19:54 stevesk Exp $"); #include <sys/types.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #include <sys/wait.h> #include <dirent.h> @@ -33,9 +33,12 @@ */ #include "includes.h" -RCSID("$OpenBSD: session.c,v 1.194 2006/02/20 16:36:14 stevesk Exp $"); +RCSID("$OpenBSD: session.c,v 1.196 2006/02/20 17:19:54 stevesk Exp $"); #include <sys/types.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #include <sys/wait.h> #include <sys/un.h> diff --git a/sftp-client.c b/sftp-client.c index 9dfdf5ad..042ab887 100644 --- a/sftp-client.c +++ b/sftp-client.c @@ -20,7 +20,12 @@ /* XXX: copy between two remote sites */ #include "includes.h" -RCSID("$OpenBSD: sftp-client.c,v 1.59 2006/02/15 05:08:24 david Exp $"); +RCSID("$OpenBSD: sftp-client.c,v 1.60 2006/02/20 17:19:54 stevesk Exp $"); + +#include <sys/types.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #include "openbsd-compat/sys-queue.h" diff --git a/sftp-common.c b/sftp-common.c index 4cea3c30..aa075756 100644 --- a/sftp-common.c +++ b/sftp-common.c @@ -24,7 +24,10 @@ */ #include "includes.h" -RCSID("$OpenBSD: sftp-common.c,v 1.10 2003/11/10 16:23:41 jakob Exp $"); +RCSID("$OpenBSD: sftp-common.c,v 1.11 2006/02/20 17:19:54 stevesk Exp $"); + +#include <sys/types.h> +#include <sys/stat.h> #include "buffer.h" #include "bufaux.h" diff --git a/sftp-common.h b/sftp-common.h index 2b1995a2..72be6e61 100644 --- a/sftp-common.h +++ b/sftp-common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-common.h,v 1.6 2006/01/02 01:20:31 djm Exp $ */ +/* $OpenBSD: sftp-common.h,v 1.7 2006/02/20 17:19:54 stevesk Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -25,6 +25,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/types.h> +#include <sys/stat.h> + /* Maximum packet that we are willing to send/accept */ #define SFTP_MAX_MSG_LENGTH (256 * 1024) diff --git a/sftp-glob.c b/sftp-glob.c index 9dfbf953..baa84aa7 100644 --- a/sftp-glob.c +++ b/sftp-glob.c @@ -15,7 +15,12 @@ */ #include "includes.h" -RCSID("$OpenBSD: sftp-glob.c,v 1.16 2006/02/08 23:51:24 stevesk Exp $"); +RCSID("$OpenBSD: sftp-glob.c,v 1.17 2006/02/20 17:19:54 stevesk Exp $"); + +#include <sys/types.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #include <dirent.h> diff --git a/sftp-server.c b/sftp-server.c index 96fe1a7b..30bd1b0e 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -14,7 +14,10 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include "includes.h" -RCSID("$OpenBSD: sftp-server.c,v 1.51 2006/02/08 23:51:24 stevesk Exp $"); +RCSID("$OpenBSD: sftp-server.c,v 1.52 2006/02/20 17:19:54 stevesk Exp $"); + +#include <sys/types.h> +#include <sys/stat.h> #include <dirent.h> @@ -15,10 +15,13 @@ */ #include "includes.h" -RCSID("$OpenBSD: sftp.c,v 1.73 2006/02/10 01:44:27 stevesk Exp $"); +RCSID("$OpenBSD: sftp.c,v 1.75 2006/02/20 17:19:54 stevesk Exp $"); -#include <sys/ioctl.h> #include <sys/types.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#include <sys/ioctl.h> #include <sys/wait.h> #ifdef HAVE_PATHS_H @@ -35,7 +35,10 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-add.c,v 1.74 2005/11/12 18:37:59 deraadt Exp $"); +RCSID("$OpenBSD: ssh-add.c,v 1.75 2006/02/20 17:19:54 stevesk Exp $"); + +#include <sys/types.h> +#include <sys/stat.h> #include <openssl/evp.h> diff --git a/ssh-keygen.c b/ssh-keygen.c index 64fadc7a..8acbf778 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -12,7 +12,10 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.135 2005/11/29 02:04:55 dtucker Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.136 2006/02/20 17:19:54 stevesk Exp $"); + +#include <sys/types.h> +#include <sys/stat.h> #include <openssl/evp.h> #include <openssl/pem.h> @@ -40,11 +40,14 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.262 2006/02/20 16:36:15 stevesk Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.264 2006/02/20 17:19:54 stevesk Exp $"); +#include <sys/types.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #include <sys/resource.h> #include <sys/ioctl.h> -#include <sys/types.h> #include <sys/un.h> #include <paths.h> diff --git a/sshconnect.c b/sshconnect.c index dc74d75c..519a7cf0 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -13,10 +13,11 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.174 2006/02/10 01:44:27 stevesk Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.175 2006/02/20 17:19:54 stevesk Exp $"); #include <sys/types.h> #include <sys/wait.h> +#include <sys/stat.h> #include <paths.h> diff --git a/sshconnect2.c b/sshconnect2.c index eb9a4d87..f2776edb 100644 --- a/sshconnect2.c +++ b/sshconnect2.c @@ -23,11 +23,12 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.145 2006/02/10 01:44:27 stevesk Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.146 2006/02/20 17:19:54 stevesk Exp $"); #include <sys/types.h> #include <sys/wait.h> #include <sys/queue.h> +#include <sys/stat.h> #include "openbsd-compat/sys-queue.h" @@ -42,10 +42,13 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.321 2006/02/10 01:44:27 stevesk Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.323 2006/02/20 17:19:54 stevesk Exp $"); -#include <sys/ioctl.h> #include <sys/types.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif +#include <sys/ioctl.h> #include <sys/wait.h> #include <paths.h> @@ -12,9 +12,11 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshpty.c,v 1.15 2006/02/10 00:27:13 stevesk Exp $"); +RCSID("$OpenBSD: sshpty.c,v 1.16 2006/02/20 17:19:54 stevesk Exp $"); #include <sys/ioctl.h> +#include <sys/types.h> +#include <sys/stat.h> #ifdef HAVE_PATHS_H # include <paths.h> |