summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2003-06-03 20:49:30 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2003-06-03 20:49:30 +0000
commit180323fc3ed7b0f10957836db6b8efb08c0cfe52 (patch)
tree21e7dacfe235b327c2d4dd452491f70d275df655 /usr.bin
parentdf50f093bb792fa0afd44283cacbe830242e728a (diff)
fix various 3/4 licenses according to "terms" file
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/nc/socks.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/usr.bin/nc/socks.c b/usr.bin/nc/socks.c
index 41f886edd63..25779d2e992 100644
--- a/usr.bin/nc/socks.c
+++ b/usr.bin/nc/socks.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: socks.c,v 1.6 2002/12/30 17:55:25 stevesk Exp $ */
+/* $OpenBSD: socks.c,v 1.7 2003/06/03 20:49:29 deraadt Exp $ */
/*
* Copyright (c) 1999 Niklas Hallqvist. 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 Niklas Hallqvist.
- * 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