summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--includes.h3
-rw-r--r--ssh-agent.c5
-rw-r--r--ssh-keyscan.c5
-rw-r--r--ssh.c4
5 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 27cf354aa..4639f4e79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,9 @@
40 - stevesk@cvs.openbsd.org 2006/02/08 14:16:59 40 - stevesk@cvs.openbsd.org 2006/02/08 14:16:59
41 [sshconnect.c] 41 [sshconnect.c]
42 <openssl/bn.h> not needed 42 <openssl/bn.h> not needed
43 - stevesk@cvs.openbsd.org 2006/02/08 14:31:30
44 [includes.h ssh-agent.c ssh-keyscan.c ssh.c]
45 move #include <sys/resource.h> out of includes.h; ok markus@
43 46
4420060313 4720060313
45 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 48 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3941,4 +3944,4 @@
3941 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3944 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3942 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3945 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3943 3946
3944$Id: ChangeLog,v 1.4151 2006/03/15 00:20:46 djm Exp $ 3947$Id: ChangeLog,v 1.4152 2006/03/15 00:22:47 djm Exp $
diff --git a/includes.h b/includes.h
index bcc3b41f2..27792e10a 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.27 2006/02/08 12:32:49 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.28 2006/02/08 14:31:30 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -98,7 +98,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
98#ifdef HAVE_SYS_TIME_H 98#ifdef HAVE_SYS_TIME_H
99# include <sys/time.h> /* For timersub */ 99# include <sys/time.h> /* For timersub */
100#endif 100#endif
101#include <sys/resource.h>
102#ifdef HAVE_SYS_SELECT_H 101#ifdef HAVE_SYS_SELECT_H
103# include <sys/select.h> 102# include <sys/select.h>
104#endif 103#endif
diff --git a/ssh-agent.c b/ssh-agent.c
index 0b10f9194..8821e0006 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -34,9 +34,10 @@
34 */ 34 */
35 35
36#include "includes.h" 36#include "includes.h"
37RCSID("$OpenBSD: ssh-agent.c,v 1.127 2006/02/08 14:31:30 stevesk Exp $");
38
37#include "openbsd-compat/sys-queue.h" 39#include "openbsd-compat/sys-queue.h"
38RCSID("$OpenBSD: ssh-agent.c,v 1.126 2006/02/08 12:15:27 stevesk Exp $"); 40#include <sys/resource.h>
39
40#ifdef HAVE_PATHS_H 41#ifdef HAVE_PATHS_H
41# include <paths.h> 42# include <paths.h>
42#endif 43#endif
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 1282a62e0..13e7c721c 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -7,9 +7,10 @@
7 */ 7 */
8 8
9#include "includes.h" 9#include "includes.h"
10RCSID("$OpenBSD: ssh-keyscan.c,v 1.58 2006/02/07 01:18:09 stevesk Exp $"); 10RCSID("$OpenBSD: ssh-keyscan.c,v 1.59 2006/02/08 14:31:30 stevesk Exp $");
11 11
12#include "openbsd-compat/sys-queue.h" 12#include "openbsd-compat/sys-queue.h"
13#include <sys/resource.h>
13 14
14#include <openssl/bn.h> 15#include <openssl/bn.h>
15 16
diff --git a/ssh.c b/ssh.c
index b248c0280..3384de012 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,9 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.258 2006/02/08 12:15:27 stevesk Exp $"); 43RCSID("$OpenBSD: ssh.c,v 1.259 2006/02/08 14:31:30 stevesk Exp $");
44
45#include <sys/resource.h>
44 46
45#include <paths.h> 47#include <paths.h>
46 48