summaryrefslogtreecommitdiff
path: root/libexec/makekey
diff options
context:
space:
mode:
authoragc <agc@NetBSD.org>2003-08-07 09:46:37 +0000
committeragc <agc@NetBSD.org>2003-08-07 09:46:37 +0000
commit8e6ab8837d8d6b9198e67c1c445300b483e2f304 (patch)
treea2b3ebb25f9f30d1dc180898685b7eddca4e5db4 /libexec/makekey
parent7539e8444502966531cd4420909ec7aa01516b8b (diff)
Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22284, verified by myself.
Diffstat (limited to 'libexec/makekey')
-rw-r--r--libexec/makekey/makekey.88
-rw-r--r--libexec/makekey/makekey.c10
2 files changed, 5 insertions, 13 deletions
diff --git a/libexec/makekey/makekey.8 b/libexec/makekey/makekey.8
index 685bbdadc8f..6e4d15ecc7c 100644
--- a/libexec/makekey/makekey.8
+++ b/libexec/makekey/makekey.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: makekey.8,v 1.9 2002/01/15 02:23:28 wiz Exp $
+.\" $NetBSD: makekey.8,v 1.10 2003/08/07 09:46:45 agc Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -11,11 +11,7 @@
.\" 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 the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/libexec/makekey/makekey.c b/libexec/makekey/makekey.c
index 226978a2c06..99b77303875 100644
--- a/libexec/makekey/makekey.c
+++ b/libexec/makekey/makekey.c
@@ -1,4 +1,4 @@
-/* $NetBSD: makekey.c,v 1.6 2001/01/16 02:44:43 cgd Exp $ */
+/* $NetBSD: makekey.c,v 1.7 2003/08/07 09:46:45 agc Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 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 the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -40,7 +36,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
#if 0
static char sccsid[] = "from: @(#)makekey.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: makekey.c,v 1.6 2001/01/16 02:44:43 cgd Exp $");
+__RCSID("$NetBSD: makekey.c,v 1.7 2003/08/07 09:46:45 agc Exp $");
#endif
#endif /* not lint */