summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/ssh/includes.h3
-rw-r--r--usr.bin/ssh/moduli.c11
-rw-r--r--usr.bin/ssh/progressmeter.c3
-rw-r--r--usr.bin/ssh/scp.c3
-rw-r--r--usr.bin/ssh/sftp-common.c3
-rw-r--r--usr.bin/ssh/sftp-server.c3
-rw-r--r--usr.bin/ssh/ssh-agent.c3
-rw-r--r--usr.bin/ssh/sshlogin.c3
8 files changed, 21 insertions, 11 deletions
diff --git a/usr.bin/ssh/includes.h b/usr.bin/ssh/includes.h
index 72fbc918fac..cb90dbf7275 100644
--- a/usr.bin/ssh/includes.h
+++ b/usr.bin/ssh/includes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: includes.h,v 1.52 2006/07/17 01:31:09 stevesk Exp $ */
+/* $OpenBSD: includes.h,v 1.53 2006/07/22 19:08:54 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -23,6 +23,5 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#endif /* INCLUDES_H */
diff --git a/usr.bin/ssh/moduli.c b/usr.bin/ssh/moduli.c
index f6f15a2a40c..9d4aedd5b7e 100644
--- a/usr.bin/ssh/moduli.c
+++ b/usr.bin/ssh/moduli.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.13 2006/03/25 00:05:41 djm Exp $ */
+/* $OpenBSD: moduli.c,v 1.14 2006/07/22 19:08:54 stevesk Exp $ */
/*
* Copyright 1994 Phil Karn <karn@qualcomm.com>
* Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -38,11 +38,16 @@
*/
#include "includes.h"
-#include "xmalloc.h"
-#include "log.h"
+
+#include <sys/types.h>
#include <openssl/bn.h>
+#include <time.h>
+
+#include "xmalloc.h"
+#include "log.h"
+
/*
* File output defines
*/
diff --git a/usr.bin/ssh/progressmeter.c b/usr.bin/ssh/progressmeter.c
index 08b7e990ee8..ff207ed0937 100644
--- a/usr.bin/ssh/progressmeter.c
+++ b/usr.bin/ssh/progressmeter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: progressmeter.c,v 1.32 2006/07/21 21:26:55 stevesk Exp $ */
+/* $OpenBSD: progressmeter.c,v 1.33 2006/07/22 19:08:54 stevesk Exp $ */
/*
* Copyright (c) 2003 Nils Nordman. All rights reserved.
*
@@ -30,6 +30,7 @@
#include <errno.h>
#include <signal.h>
+#include <time.h>
#include <unistd.h>
#include "progressmeter.h"
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index 016d37a27ef..40f6e56a066 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.148 2006/07/17 01:31:09 stevesk Exp $ */
+/* $OpenBSD: scp.c,v 1.149 2006/07/22 19:08:54 stevesk Exp $ */
/*
* scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd).
@@ -84,6 +84,7 @@
#include <pwd.h>
#include <signal.h>
#include <stdarg.h>
+#include <time.h>
#include <unistd.h>
#include "xmalloc.h"
diff --git a/usr.bin/ssh/sftp-common.c b/usr.bin/ssh/sftp-common.c
index 92ce9066113..6fd0d76b69e 100644
--- a/usr.bin/ssh/sftp-common.c
+++ b/usr.bin/ssh/sftp-common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-common.c,v 1.15 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: sftp-common.c,v 1.16 2006/07/22 19:08:54 stevesk Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2001 Damien Miller. All rights reserved.
@@ -31,6 +31,7 @@
#include <grp.h>
#include <pwd.h>
+#include <time.h>
#include "buffer.h"
#include "bufaux.h"
diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c
index 4df6a071e34..e13b1d302c6 100644
--- a/usr.bin/ssh/sftp-server.c
+++ b/usr.bin/ssh/sftp-server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.63 2006/07/17 01:31:09 stevesk Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.64 2006/07/22 19:08:54 stevesk Exp $ */
/*
* Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
*
@@ -22,6 +22,7 @@
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
+#include <time.h>
#include <unistd.h>
#include "buffer.h"
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index deeead12da8..3577642bdb8 100644
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.144 2006/07/17 01:31:10 stevesk Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.145 2006/07/22 19:08:54 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -46,6 +46,7 @@
#include <fcntl.h>
#include <paths.h>
#include <signal.h>
+#include <time.h>
#include <unistd.h>
#include <openssl/evp.h>
diff --git a/usr.bin/ssh/sshlogin.c b/usr.bin/ssh/sshlogin.c
index 29e9e8bd9b1..395c2ba1cb8 100644
--- a/usr.bin/ssh/sshlogin.c
+++ b/usr.bin/ssh/sshlogin.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshlogin.c,v 1.20 2006/07/17 01:31:10 stevesk Exp $ */
+/* $OpenBSD: sshlogin.c,v 1.21 2006/07/22 19:08:54 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -45,6 +45,7 @@
#include <errno.h>
#include <fcntl.h>
+#include <time.h>
#include <unistd.h>
#include <util.h>
#include <utmp.h>