summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Weingartner <weingart@cvs.openbsd.org>2003-06-03 00:33:35 +0000
committerTobias Weingartner <weingart@cvs.openbsd.org>2003-06-03 00:33:35 +0000
commit41568dc30e8f9d1a306361ae62419f9faede71ba (patch)
tree8ce3bdee58eb3dfbb8c6cbb44d36f9e21540d79c
parent02a2a0b599efa1bfb533fff40b5043175bcc890a (diff)
Kill clause 3 & 4 on some of my code.
-rw-r--r--sbin/scan_ffs/scan_ffs.87
-rw-r--r--sbin/scan_ffs/scan_ffs.c7
2 files changed, 2 insertions, 12 deletions
diff --git a/sbin/scan_ffs/scan_ffs.8 b/sbin/scan_ffs/scan_ffs.8
index e71e955fd8a..90eb6503cb7 100644
--- a/sbin/scan_ffs/scan_ffs.8
+++ b/sbin/scan_ffs/scan_ffs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: scan_ffs.8,v 1.11 2000/11/09 17:53:07 aaron Exp $
+.\" $OpenBSD: scan_ffs.8,v 1.12 2003/06/03 00:33:34 weingart Exp $
.\"
.\" Copyright (c) 1997 Niklas Hallqvist, Tobias Weingartner
.\" All rights reserved.
@@ -11,11 +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. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by Tobias Weingartner.
-.\" 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
diff --git a/sbin/scan_ffs/scan_ffs.c b/sbin/scan_ffs/scan_ffs.c
index b1219986e84..4aaa0f62671 100644
--- a/sbin/scan_ffs/scan_ffs.c
+++ b/sbin/scan_ffs/scan_ffs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scan_ffs.c,v 1.8 2002/07/03 22:32:33 deraadt Exp $ */
+/* $OpenBSD: scan_ffs.c,v 1.9 2003/06/03 00:33:34 weingart Exp $ */
/*
* Copyright (c) 1998 Niklas Hallqvist, Tobias Weingartner
@@ -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 Tobias Weingartner.
- * 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