Remove clause 3. Approved by niklas@

7 files changed, 7 insertions, 21 deletions

diff --git a/sbin/isakmpd/features/aggressive b/sbin/isakmpd/features/aggressive
index f9d78dfd67a..945678c53a6 100644
--- a/sbin/isakmpd/features/aggressive
+++ b/sbin/isakmpd/features/aggressive
@@ -1,4 +1,4 @@
-#	$OpenBSD: aggressive,v 1.3 2000/02/20 16:42:20 niklas Exp $
+#	$OpenBSD: aggressive,v 1.4 2003/06/03 14:29:41 ho Exp $
 #	$EOM: aggressive,v 1.3 2000/02/20 16:38:15 niklas Exp $
 
 #
@@ -12,8 +12,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/features/dnssec b/sbin/isakmpd/features/dnssec
index 7e7f87c25a3..aab768dedb1 100644
--- a/sbin/isakmpd/features/dnssec
+++ b/sbin/isakmpd/features/dnssec
@@ -1,4 +1,4 @@
-#	$OpenBSD: dnssec,v 1.2 2001/08/16 07:04:28 jakob Exp $
+#	$OpenBSD: dnssec,v 1.3 2003/06/03 14:29:41 ho Exp $
 
 #
 # Copyright (c) 2001 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/features/ec b/sbin/isakmpd/features/ec
index 80f1fcd1ddc..6452a8e576b 100644
--- a/sbin/isakmpd/features/ec
+++ b/sbin/isakmpd/features/ec
@@ -1,4 +1,4 @@
-#	$OpenBSD: ec,v 1.3 2000/02/20 16:42:20 niklas Exp $
+#	$OpenBSD: ec,v 1.4 2003/06/03 14:29:41 ho Exp $
 #	$EOM: ec,v 1.3 2000/02/20 16:38:15 niklas Exp $
 
 #
@@ -12,8 +12,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/features/isakmp_cfg b/sbin/isakmpd/features/isakmp_cfg
index 4849d42a5cd..55710fcfa84 100644
--- a/sbin/isakmpd/features/isakmp_cfg
+++ b/sbin/isakmpd/features/isakmp_cfg
@@ -1,4 +1,4 @@
-#	$OpenBSD: isakmp_cfg,v 1.1 2001/07/01 20:43:40 niklas Exp $
+#	$OpenBSD: isakmp_cfg,v 1.2 2003/06/03 14:29:41 ho Exp $
 
 #
 # Copyright (c) 2001 Niklas Hallqvist.  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/features/policy b/sbin/isakmpd/features/policy
index d9d425b0686..680cc3753e8 100644
--- a/sbin/isakmpd/features/policy
+++ b/sbin/isakmpd/features/policy
@@ -1,4 +1,4 @@
-#	$OpenBSD: policy,v 1.5 2003/05/14 23:29:20 ho Exp $
+#	$OpenBSD: policy,v 1.6 2003/06/03 14:29:41 ho Exp $
 #	$EOM: policy,v 1.4 2000/02/20 16:38:15 niklas Exp $
 
 #
@@ -12,8 +12,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/features/privsep b/sbin/isakmpd/features/privsep
index 2a239df6769..20690a09508 100644
--- a/sbin/isakmpd/features/privsep
+++ b/sbin/isakmpd/features/privsep
@@ -1,4 +1,4 @@
-#	$OpenBSD: privsep,v 1.1 2003/05/15 00:28:53 ho Exp $
+#	$OpenBSD: privsep,v 1.2 2003/06/03 14:29:41 ho Exp $
 
 #
 # Copyright (c) 2003 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/features/x509 b/sbin/isakmpd/features/x509
index 14d90396cd7..be1b2aadcb5 100644
--- a/sbin/isakmpd/features/x509
+++ b/sbin/isakmpd/features/x509
@@ -1,4 +1,4 @@
-#	$OpenBSD: x509,v 1.4 2002/08/23 18:01:33 ho Exp $
+#	$OpenBSD: x509,v 1.5 2003/06/03 14:29:41 ho Exp $
 #	$EOM: x509,v 1.4 2000/02/20 16:38:15 niklas Exp $
 
 #
@@ -12,8 +12,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