summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-09 01:30:39 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-09 01:30:39 +0000
commita238f6e8348502e9f4b32ee1800138f4421a3ce3 (patch)
treee105af9eb2c18a2ca68cbf7822e160468feca178
parent768176b24038a28b8e2e7709b153f6633348efc9 (diff)
- pvalchev@cvs.openbsd.org 2001/06/05 05:05:39
[ssh-keyscan.1 ssh-keyscan.c] License clarification from David Mazieres, ok deraadt@
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keyscan.15
-rw-r--r--ssh-keyscan.c5
3 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 61cc8c9a7..c87d9f805 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,9 @@
46 - markus@cvs.openbsd.org 2001/06/04 23:16:16 46 - markus@cvs.openbsd.org 2001/06/04 23:16:16
47 [session.c] 47 [session.c]
48 merge ssh1/2 x11-fwd setup, create listener after tmp-dir 48 merge ssh1/2 x11-fwd setup, create listener after tmp-dir
49 - pvalchev@cvs.openbsd.org 2001/06/05 05:05:39
50 [ssh-keyscan.1 ssh-keyscan.c]
51 License clarification from David Mazieres, ok deraadt@
49 52
5020010606 5320010606
51 - OpenBSD CVS Sync 54 - OpenBSD CVS Sync
@@ -5557,4 +5560,4 @@
5557 - Wrote replacements for strlcpy and mkdtemp 5560 - Wrote replacements for strlcpy and mkdtemp
5558 - Released 1.0pre1 5561 - Released 1.0pre1
5559 5562
5560$Id: ChangeLog,v 1.1260 2001/06/09 01:29:12 mouring Exp $ 5563$Id: ChangeLog,v 1.1261 2001/06/09 01:30:39 mouring Exp $
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 4db8c5f15..7c756dd16 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,11 +1,10 @@
1.\" $OpenBSD: ssh-keyscan.1,v 1.5 2001/04/18 16:21:05 ian Exp $ 1.\" $OpenBSD: ssh-keyscan.1,v 1.6 2001/06/05 05:05:39 pvalchev 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.\"
5.\" Modification and redistribution in source and binary forms is 5.\" Modification and redistribution in source and binary forms is
6.\" permitted provided that due credit is given to the author and the 6.\" permitted provided that due credit is given to the author and the
7.\" OpenBSD project (for instance by leaving this copyright notice 7.\" OpenBSD project by leaving this copyright notice intact.
8.\" intact).
9.\" 8.\"
10.Dd January 1, 1996 9.Dd January 1, 1996
11.Dt SSH-KEYSCAN 1 10.Dt SSH-KEYSCAN 1
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 3f6c23136..da34f7c63 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -3,12 +3,11 @@
3 * 3 *
4 * Modification and redistribution in source and binary forms is 4 * Modification and redistribution in source and binary forms is
5 * permitted provided that due credit is given to the author and the 5 * permitted provided that due credit is given to the author and the
6 * OpenBSD project (for instance by leaving this copyright notice 6 * OpenBSD project by leaving this copyright notice intact.
7 * intact).
8 */ 7 */
9 8
10#include "includes.h" 9#include "includes.h"
11RCSID("$OpenBSD: ssh-keyscan.c,v 1.22 2001/03/06 06:11:18 deraadt Exp $"); 10RCSID("$OpenBSD: ssh-keyscan.c,v 1.23 2001/06/05 05:05:39 pvalchev Exp $");
12 11
13#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) 12#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
14#include <sys/queue.h> 13#include <sys/queue.h>