summaryrefslogtreecommitdiff
path: root/sbin/isakmpd/timer.h
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2003-06-03 14:28:17 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2003-06-03 14:28:17 +0000
commit47b93419f757d3a538ff2136cae9617e07ea7389 (patch)
tree6d2bdb8880ed73b8c0be7470418c27ec534eb265 /sbin/isakmpd/timer.h
parent2cf124e6dbd711198131ac89dd8f98ef5f8deb65 (diff)
Remove clauses 3 and 4. With approval from Niklas Hallqvist and
Niels Provos.
Diffstat (limited to 'sbin/isakmpd/timer.h')
-rw-r--r--sbin/isakmpd/timer.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/sbin/isakmpd/timer.h b/sbin/isakmpd/timer.h
index 3d191e22e59..253f0b63539 100644
--- a/sbin/isakmpd/timer.h
+++ b/sbin/isakmpd/timer.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: timer.h,v 1.4 1999/04/19 21:02:30 niklas Exp $ */
+/* $OpenBSD: timer.h,v 1.5 2003/06/03 14:28:16 ho Exp $ */
/* $EOM: timer.h,v 1.6 1999/04/11 22:35:55 ho Exp $ */
/*
@@ -12,11 +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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Ericsson Radio Systems.
- * 4. 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