diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | channels.c | 5 | ||||
| -rw-r--r-- | clientloop.c | 7 | ||||
| -rw-r--r-- | includes.h | 8 | ||||
| -rw-r--r-- | packet.c | 5 | ||||
| -rw-r--r-- | scp.c | 5 | ||||
| -rw-r--r-- | serverloop.c | 5 | ||||
| -rw-r--r-- | sftp-client.c | 5 | ||||
| -rw-r--r-- | sftp-server.c | 5 | ||||
| -rw-r--r-- | ssh-agent.c | 5 | ||||
| -rw-r--r-- | ssh-keyscan.c | 5 | ||||
| -rw-r--r-- | sshconnect.c | 5 | ||||
| -rw-r--r-- | sshd.c | 5 |
13 files changed, 51 insertions, 20 deletions
@@ -7,6 +7,10 @@ - stevesk@cvs.openbsd.org 2006/07/25 02:01:34 [scard.c] need #include <string.h> + - stevesk@cvs.openbsd.org 2006/07/25 02:59:21 + [channels.c clientloop.c packet.c scp.c serverloop.c sftp-client.c] + [sftp-server.c ssh-agent.c ssh-keyscan.c sshconnect.c sshd.c] + move #include <sys/time.h> out of includes.h 20060804 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent @@ -5077,4 +5081,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.4443 2006/08/04 23:33:15 djm Exp $ +$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 @@ -/* $OpenBSD: channels.c,v 1.260 2006/07/22 20:48:22 stevesk Exp $ */ +/* $OpenBSD: channels.c,v 1.261 2006/07/25 02:59:21 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -45,6 +45,9 @@ #include <sys/types.h> #include <sys/un.h> #include <sys/socket.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #include <netinet/in.h> #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 @@ -/* $OpenBSD: clientloop.c,v 1.170 2006/07/22 20:48:22 stevesk Exp $ */ +/* $OpenBSD: clientloop.c,v 1.171 2006/07/25 02:59:21 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -62,11 +62,14 @@ #include "includes.h" #include <sys/types.h> +#include <sys/ioctl.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #include <sys/socket.h> -#include <sys/ioctl.h> #include <ctype.h> #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 @@ #define _GNU_SOURCE /* activate extra prototypes for glibc */ +#include <sys/types.h> #include <stdio.h> #include <stdlib.h> @@ -69,19 +70,12 @@ # include <utmp.h> #endif #ifdef HAVE_UTMPX_H -# ifdef HAVE_TV_IN_UTMPX -# include <sys/time.h> -# endif # include <utmpx.h> #endif #ifdef HAVE_LASTLOG_H # include <lastlog.h> #endif -#include <sys/types.h> -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> /* For timersub */ -#endif #ifdef HAVE_SYS_SELECT_H # include <sys/select.h> #endif @@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.137 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: packet.c,v 1.138 2006/07/25 02:59:21 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -42,6 +42,9 @@ #include <sys/types.h> #include "openbsd-compat/sys-queue.h" #include <sys/socket.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #include <netinet/in_systm.h> #include <netinet/in.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.150 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: scp.c,v 1.151 2006/07/25 02:59:21 stevesk Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -77,6 +77,9 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #include <sys/wait.h> #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 @@ -/* $OpenBSD: serverloop.c,v 1.141 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: serverloop.c,v 1.142 2006/07/25 02:59:21 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -40,6 +40,9 @@ #include <sys/types.h> #include <sys/wait.h> #include <sys/socket.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #include <netinet/in.h> 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 @@ -/* $OpenBSD: sftp-client.c,v 1.70 2006/07/23 01:11:05 stevesk Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.71 2006/07/25 02:59:21 stevesk Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -26,6 +26,9 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #include <errno.h> #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 @@ -/* $OpenBSD: sftp-server.c,v 1.65 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: sftp-server.c,v 1.66 2006/07/25 02:59:21 stevesk Exp $ */ /* * Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * @@ -18,6 +18,9 @@ #include <sys/types.h> #include <sys/stat.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #include <dirent.h> #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 @@ -/* $OpenBSD: ssh-agent.c,v 1.146 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.147 2006/07/25 02:59:21 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -39,6 +39,9 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/socket.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #ifdef HAVE_SYS_UN_H # include <sys/un.h> #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 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.69 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.70 2006/07/25 02:59:21 stevesk Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -11,6 +11,9 @@ #include "openbsd-compat/sys-queue.h" #include <sys/resource.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #include <openssl/bn.h> diff --git a/sshconnect.c b/sshconnect.c index 06844eb71..4301fb20f 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.194 2006/07/24 13:58:22 stevesk Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.195 2006/07/25 02:59:21 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -19,6 +19,9 @@ #include <sys/wait.h> #include <sys/stat.h> #include <sys/socket.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #include <netinet/in.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: sshd.c,v 1.339 2006/07/22 20:48:23 stevesk Exp $ */ +/* $OpenBSD: sshd.c,v 1.340 2006/07/25 02:59:21 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -50,6 +50,9 @@ #endif #include <sys/ioctl.h> #include <sys/socket.h> +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif #include <sys/wait.h> #include <errno.h> |