- pvalchev@cvs.openbsd.org 2001/06/05 05:05:39

     [ssh-keyscan.1 ssh-keyscan.c]
     License clarification from David Mazieres, ok deraadt@

diff --git a/ChangeLog b/ChangeLog
index 3087d1ce4c6667f2821c7ea7d6510cf099596246..e09e047865af4600f2aa852e54ab2d8511c47da9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,9 @@
    - markus@cvs.openbsd.org 2001/06/04 23:16:16
      [session.c]
      merge ssh1/2 x11-fwd setup, create listener after tmp-dir
+   - pvalchev@cvs.openbsd.org 2001/06/05 05:05:39
+     [ssh-keyscan.1 ssh-keyscan.c]
+     License clarification from David Mazieres, ok deraadt@
 
 20010606
  - OpenBSD CVS Sync

diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 4db8c5f15f9d4e07b771e2e7f92a0e43e25d3d71..7c756dd1625447f1a749c25aa7cb2fe34c4860e0 100644 (file)
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,11 +1,10 @@
-.\"    $OpenBSD: ssh-keyscan.1,v 1.5 2001/04/18 16:21:05 ian Exp $
+.\"    $OpenBSD: ssh-keyscan.1,v 1.6 2001/06/05 05:05:39 pvalchev Exp $
 .\"
 .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
 .\"
 .\" Modification and redistribution in source and binary forms is
 .\" permitted provided that due credit is given to the author and the
-.\" OpenBSD project (for instance by leaving this copyright notice
-.\" intact).
+.\" OpenBSD project by leaving this copyright notice intact.
 .\"
 .Dd January 1, 1996
 .Dt SSH-KEYSCAN 1

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 3f6c23136356437785f234858b73bcb9a1b9e993..da34f7c63d96aaddcaf725e830be316fd50c93c0 100644 (file)
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -3,12 +3,11 @@
  *
  * Modification and redistribution in source and binary forms is
  * permitted provided that due credit is given to the author and the
- * OpenBSD project (for instance by leaving this copyright notice
- * intact).
+ * OpenBSD project by leaving this copyright notice intact.
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-keyscan.c,v 1.22 2001/03/06 06:11:18 deraadt Exp $");
+RCSID("$OpenBSD: ssh-keyscan.c,v 1.23 2001/06/05 05:05:39 pvalchev Exp $");
 
 #if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
 #include <sys/queue.h>