Replace license with something that's actually free.

Approved by original author.  Julian.Onions@nexor.co.uk

2 files changed, 48 insertions, 10 deletions

diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 52c6c339ef4..5c162249014 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,13 +1,33 @@
-/*	$OpenBSD: if_tun.c,v 1.43 2002/06/30 13:04:36 itojun Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.44 2002/12/06 15:58:49 nate Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
- * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
+ * Copyright (c) 1988, Julian Onions <Julian.Onions@nexor.co.uk>
  * Nottingham University 1987.
+ * All rights reserved.
  *
- * This source may be freely distributed, however I would be interested
- * in any changes that are made.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
  *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
  * This driver takes packets off the IP i/f and hands them up to a
  * user process to have its wicked way with. This driver has its
  * roots in a similar driver written by Phil Cockcroft (formerly) at
diff --git a/sys/net/if_tun.h b/sys/net/if_tun.h
index f3d7eda1037..c6eea32864d 100644
--- a/sys/net/if_tun.h
+++ b/sys/net/if_tun.h
@@ -1,19 +1,37 @@
-/*	$OpenBSD: if_tun.h,v 1.10 2001/06/09 06:16:38 angelos Exp $	*/
+/*	$OpenBSD: if_tun.h,v 1.11 2002/12/06 15:58:49 nate Exp $	*/
 
 /*
- * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
+ * Copyright (c) 1988, Julian Onions <Julian.Onions@nexor.co.uk>
  * Nottingham University 1987.
+ * All rights reserved.
  *
- * This source may be freely distributed, however I would be interested
- * in any changes that are made.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
  *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
  * This driver takes packets off the IP i/f and hands them up to a
  * user process to have it's wicked way with. This driver has it's
  * roots in a similar driver written by Phil Cockcroft (formerly) at
  * UCL. This driver is based much more on read/write/select mode of
  * operation though.
- * 
- * from: @Header: if_tnreg.h,v 1.1.2.1 1992/07/16 22:39:16 friedl Exp
  */
 
 #ifndef _NET_IF_TUN_H_