Remove some conflicting copyright lines.

4 files changed, 4 insertions, 16 deletions

diff --git a/usr.sbin/ppp/ppp/alias.c b/usr.sbin/ppp/ppp/alias.c
index 06b9c0ce65a..6c1e9156cbc 100644
--- a/usr.sbin/ppp/ppp/alias.c
+++ b/usr.sbin/ppp/ppp/alias.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: alias.c,v 1.14 2001/06/07 09:32:55 brian Exp $
+ * $OpenBSD: alias.c,v 1.15 2001/08/21 04:09:15 brian Exp $
  */
 
 /*
@@ -45,9 +45,6 @@
     data connections, while alias_irc.c does the same for IRC
     DCC. Alias_util.c contains a few utility routines.
 
-    This software is placed into the public domain with no restrictions
-    on its distribution.
-
     Version 1.0 August, 1996  (cjm)
 
     Version 1.1 August 20, 1996  (cjm)
diff --git a/usr.sbin/ppp/ppp/alias_db.c b/usr.sbin/ppp/ppp/alias_db.c
index 424a40f605a..59ff0ceb9fc 100644
--- a/usr.sbin/ppp/ppp/alias_db.c
+++ b/usr.sbin/ppp/ppp/alias_db.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: alias_db.c,v 1.18 2001/06/07 09:32:55 brian Exp $
+ * $OpenBSD: alias_db.c,v 1.19 2001/08/21 04:09:15 brian Exp $
  */
 
 /*
@@ -48,9 +48,6 @@
     can be deleted after a certain amount of time.
 
 
-    This software is placed into the public domain with no restrictions
-    on its distribution.
-
     Initial version: August, 1996  (cjm)
 
     Version 1.4: September 16, 1996 (cjm)
diff --git a/usr.sbin/ppp/ppp/alias_ftp.c b/usr.sbin/ppp/ppp/alias_ftp.c
index 6e3d7fe0da6..3a0a63f3b9f 100644
--- a/usr.sbin/ppp/ppp/alias_ftp.c
+++ b/usr.sbin/ppp/ppp/alias_ftp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: alias_ftp.c,v 1.10 2001/06/27 16:15:13 brian Exp $
+ * $OpenBSD: alias_ftp.c,v 1.11 2001/08/21 04:09:15 brian Exp $
  */
 
 /*
@@ -44,9 +44,6 @@
     machine is totally unaware of the modification to the TCP stream.
 
 
-    This software is placed into the public domain with no restrictions
-    on its distribution.
-
     References: RFC 959, RFC 2428.
 
     Initial version:  August, 1996  (cjm)
diff --git a/usr.sbin/ppp/ppp/alias_irc.c b/usr.sbin/ppp/ppp/alias_irc.c
index afcf859fd45..abb70d718dd 100644
--- a/usr.sbin/ppp/ppp/alias_irc.c
+++ b/usr.sbin/ppp/ppp/alias_irc.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $OpenBSD: alias_irc.c,v 1.6 2001/08/18 22:15:28 brian Exp $
+ * $OpenBSD: alias_irc.c,v 1.7 2001/08/21 04:09:15 brian Exp $
  */
 
 /* Alias_irc.c intercepts packages contain IRC CTCP commands, and
@@ -38,9 +38,6 @@
 	 The handling of this is copied more-or-less verbatim from
 	 ftp_alias.c
 
-    This software is placed into the public domain with no restrictions
-    on its distribution.
-
 	 Initial version: Eivind Eklund <perhaps@yes.no> (ee) 97-01-29
 
          Version 2.1:  May, 1997 (cjm)