summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-10-24 03:01:16 +1000
committerDamien Miller <djm@mindrot.org>2006-10-24 03:01:16 +1000
commit952dce6593720a5f24d556a3ec53126d041d28ab (patch)
treea4b41ced65003eebbb2cf1ed137e7caaea2aa452
parente7658a50f0c28cf9fe33e35bee9084844b09288c (diff)
- djm@cvs.openbsd.org 2006/10/06 02:29:19
[ssh-agent.c ssh-keyscan.c ssh.c] sys/resource.h needs sys/time.h; prompted by brad@ (NB. Id sync only for portable)
-rw-r--r--ChangeLog6
-rw-r--r--ssh-agent.c2
-rw-r--r--ssh-keyscan.c2
-rw-r--r--ssh.c2
4 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e0f0fa7b..8109dd671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
5 Clear errno before calling the strtol functions. 5 Clear errno before calling the strtol functions.
6 From Paul Stoeber <x0001 at x dot de1 dot cc>. 6 From Paul Stoeber <x0001 at x dot de1 dot cc>.
7 OK deraadt@. 7 OK deraadt@.
8 - djm@cvs.openbsd.org 2006/10/06 02:29:19
9 [ssh-agent.c ssh-keyscan.c ssh.c]
10 sys/resource.h needs sys/time.h; prompted by brad@
11 (NB. Id sync only for portable)
8 12
920061018 1320061018
10 - (dtucker) OpenBSD CVS Sync 14 - (dtucker) OpenBSD CVS Sync
@@ -2546,4 +2550,4 @@
2546 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2550 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2547 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2551 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2548 2552
2549$Id: ChangeLog,v 1.4573 2006/10/23 17:00:12 djm Exp $ 2553$Id: ChangeLog,v 1.4574 2006/10/23 17:01:16 djm Exp $
diff --git a/ssh-agent.c b/ssh-agent.c
index 08b07212e..ef95eb878 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.152 2006/08/04 20:46:05 stevesk Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.153 2006/10/06 02:29:19 djm 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
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 416d3f5c1..b19864007 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keyscan.c,v 1.73 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: ssh-keyscan.c,v 1.74 2006/10/06 02:29:19 djm Exp $ */
2/* 2/*
3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3 * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4 * 4 *
diff --git a/ssh.c b/ssh.c
index efc4af6d4..47297edbb 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.293 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: ssh.c,v 1.294 2006/10/06 02:29:19 djm 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