summaryrefslogtreecommitdiff
path: root/sbin/isakmpd
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2003-06-03 15:20:42 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2003-06-03 15:20:42 +0000
commit855c200580ca0601fa1fa3e33a54de8f667738de (patch)
treebc4bcfd75f056254505ba9d60af18c8ba5510fd5 /sbin/isakmpd
parent606bf31c59b254b66c1ac6b507b3b999f8473f92 (diff)
Remove clause 3. Approved by niklas@ and Thomas Walpuski.
Diffstat (limited to 'sbin/isakmpd')
-rw-r--r--sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep4
-rw-r--r--sbin/isakmpd/sysdep/linux/sysdep-os.h4
-rw-r--r--sbin/isakmpd/sysdep/linux/sysdep.c4
3 files changed, 3 insertions, 9 deletions
diff --git a/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep b/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep
index 4b22d3be841..d161d24770f 100644
--- a/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep
+++ b/sbin/isakmpd/sysdep/linux/GNUmakefile.sysdep
@@ -1,4 +1,4 @@
-# $OpenBSD: GNUmakefile.sysdep,v 1.6 2003/05/18 18:16:34 ho Exp $
+# $OpenBSD: GNUmakefile.sysdep,v 1.7 2003/06/03 15:20:41 ho Exp $
#
# Copyright (c) 1999 Niklas Hallqvist. All rights reserved.
@@ -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/sysdep/linux/sysdep-os.h b/sbin/isakmpd/sysdep/linux/sysdep-os.h
index 22b1381520c..4bd5dfddd90 100644
--- a/sbin/isakmpd/sysdep/linux/sysdep-os.h
+++ b/sbin/isakmpd/sysdep/linux/sysdep-os.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysdep-os.h,v 1.7 2003/05/18 18:16:34 ho Exp $ */
+/* $OpenBSD: sysdep-os.h,v 1.8 2003/06/03 15:20:41 ho Exp $ */
/*
* Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
@@ -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/sysdep/linux/sysdep.c b/sbin/isakmpd/sysdep/linux/sysdep.c
index ecd9af10692..80b4bdd82b8 100644
--- a/sbin/isakmpd/sysdep/linux/sysdep.c
+++ b/sbin/isakmpd/sysdep/linux/sysdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysdep.c,v 1.13 2003/05/18 18:16:34 ho Exp $ */
+/* $OpenBSD: sysdep.c,v 1.14 2003/06/03 15:20:41 ho Exp $ */
/*
* Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved.
@@ -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