Remove clause 3.

4 files changed, 4 insertions, 12 deletions

diff --git a/sbin/isakmpd/apps/keyconv/Makefile b/sbin/isakmpd/apps/keyconv/Makefile
index a47a5d928c5..c1dd6bac944 100644
--- a/sbin/isakmpd/apps/keyconv/Makefile
+++ b/sbin/isakmpd/apps/keyconv/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2001/08/22 15:29:54 ho Exp $
+#	$OpenBSD: Makefile,v 1.4 2003/06/03 14:34:03 ho Exp $
 
 #
 # Copyright (c) 2000 Håkan Olsson.  All rights reserved.
@@ -11,8 +11,6 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/isakmpd/apps/keyconv/keyconv.8 b/sbin/isakmpd/apps/keyconv/keyconv.8
index 675735f8654..83bd9ad7cf3 100644
--- a/sbin/isakmpd/apps/keyconv/keyconv.8
+++ b/sbin/isakmpd/apps/keyconv/keyconv.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keyconv.8,v 1.7 2003/03/06 04:07:37 david Exp $
+.\" $OpenBSD: keyconv.8,v 1.8 2003/06/03 14:34:03 ho Exp $
 .\"
 .\" Copyright (c) 2001 Hakan Olsson.  All rights reserved.
 .\"
@@ -10,8 +10,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/isakmpd/apps/keyconv/keyconv.c b/sbin/isakmpd/apps/keyconv/keyconv.c
index dd737e875fe..fe5d9df8780 100644
--- a/sbin/isakmpd/apps/keyconv/keyconv.c
+++ b/sbin/isakmpd/apps/keyconv/keyconv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: keyconv.c,v 1.4 2002/06/09 08:13:07 todd Exp $	*/
+/*	$OpenBSD: keyconv.c,v 1.5 2003/06/03 14:34:03 ho Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Hakan Olsson.  All rights reserved.
@@ -11,8 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/sbin/isakmpd/apps/keyconv/keyvalues.h b/sbin/isakmpd/apps/keyconv/keyvalues.h
index 6ec8951dc0d..5d35e7aa8e2 100644
--- a/sbin/isakmpd/apps/keyconv/keyvalues.h
+++ b/sbin/isakmpd/apps/keyconv/keyvalues.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: keyvalues.h,v 1.1 2001/08/22 15:29:22 ho Exp $	*/
+/*	$OpenBSD: keyvalues.h,v 1.2 2003/06/03 14:34:03 ho Exp $	*/
 
 /*
  * Copyright (c) 2001 Hakan Olsson.  All rights reserved.
@@ -11,8 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES