From ad9b63f6fb40cebbdbb5d3a018997f4875af7765 Mon Sep 17 00:00:00 2001 From: agc Date: Sat, 16 Jun 2007 23:13:25 +0000 Subject: [PATCH] Move my own code from a 4 clause to a 3 clause licence. --- dist/iscsi/include/scsi_cmd_codes.h | 8 ++------ dist/iscsi/src/disk.c | 8 ++------ dist/iscsi/src/iscsi-target.c | 8 ++------ dist/iscsi/src/netmask.c | 8 ++------ dist/iscsi/src/osd-target.c | 10 +++------- dist/iscsi/src/storage.c | 8 ++------ dist/iscsi/src/strtoll.c | 8 ++------ dist/iscsi/src/uuid.c | 8 ++------ 8 files changed, 17 insertions(+), 49 deletions(-) diff --git a/dist/iscsi/include/scsi_cmd_codes.h b/dist/iscsi/include/scsi_cmd_codes.h index fd495ed14405..cb69c42cfbcf 100644 --- a/dist/iscsi/include/scsi_cmd_codes.h +++ b/dist/iscsi/include/scsi_cmd_codes.h @@ -1,4 +1,4 @@ -/* $NetBSD: scsi_cmd_codes.h,v 1.10 2007/01/10 18:04:31 agc Exp $ */ +/* $NetBSD: scsi_cmd_codes.h,v 1.11 2007/06/16 23:13:25 agc Exp $ */ /* * Copyright © 2006 Alistair Crooks. 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 Alistair Crooks - * for the NetBSD project. - * 4. The name of the author may not be used to endorse or promote + * 3. The name of the author may not be used to endorse or promote * products derived from this software without specific prior written * permission. * diff --git a/dist/iscsi/src/disk.c b/dist/iscsi/src/disk.c index 6c892ba7d5f4..16f6dab23ef5 100644 --- a/dist/iscsi/src/disk.c +++ b/dist/iscsi/src/disk.c @@ -1,4 +1,4 @@ -/* $NetBSD: disk.c,v 1.24 2007/01/10 22:40:31 agc Exp $ */ +/* $NetBSD: disk.c,v 1.25 2007/06/16 23:13:26 agc Exp $ */ /* * Copyright © 2006 Alistair Crooks. 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 Alistair Crooks - * for the NetBSD project. - * 4. The name of the author may not be used to endorse or promote + * 3. The name of the author may not be used to endorse or promote * products derived from this software without specific prior written * permission. * diff --git a/dist/iscsi/src/iscsi-target.c b/dist/iscsi/src/iscsi-target.c index 22dcc7606f16..b3c862e25995 100644 --- a/dist/iscsi/src/iscsi-target.c +++ b/dist/iscsi/src/iscsi-target.c @@ -1,4 +1,4 @@ -/* $NetBSD: iscsi-target.c,v 1.11 2006/08/03 20:21:59 agc Exp $ */ +/* $NetBSD: iscsi-target.c,v 1.12 2007/06/16 23:13:26 agc Exp $ */ /* * Copyright © 2006 Alistair Crooks. 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 Alistair Crooks - * for the NetBSD project. - * 4. The name of the author may not be used to endorse or promote + * 3. The name of the author may not be used to endorse or promote * products derived from this software without specific prior written * permission. * diff --git a/dist/iscsi/src/netmask.c b/dist/iscsi/src/netmask.c index 23ca8d8d2940..be85dc1025a3 100644 --- a/dist/iscsi/src/netmask.c +++ b/dist/iscsi/src/netmask.c @@ -1,4 +1,4 @@ -/* $NetBSD: netmask.c,v 1.7 2006/11/27 22:24:27 agc Exp $ */ +/* $NetBSD: netmask.c,v 1.8 2007/06/16 23:13:26 agc Exp $ */ /* * Copyright © 2006 Alistair Crooks. 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 Alistair Crooks - * for the NetBSD project. - * 4. The name of the author may not be used to endorse or promote + * 3. The name of the author may not be used to endorse or promote * products derived from this software without specific prior written * permission. * diff --git a/dist/iscsi/src/osd-target.c b/dist/iscsi/src/osd-target.c index b13f2668bf03..6c6a3513b15a 100644 --- a/dist/iscsi/src/osd-target.c +++ b/dist/iscsi/src/osd-target.c @@ -1,4 +1,4 @@ -/* $NetBSD: osd-target.c,v 1.5 2006/03/31 23:22:24 agc Exp $ */ +/* $NetBSD: osd-target.c,v 1.6 2007/06/16 23:13:26 agc Exp $ */ /* * Copyright © 2006 Alistair Crooks. 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 Alistair Crooks - * for the NetBSD project. - * 4. The name of the author may not be used to endorse or promote + * 3. The name of the author may not be used to endorse or promote * products derived from this software without specific prior written * permission. * @@ -36,7 +32,7 @@ #ifndef lint __COPYRIGHT("@(#) Copyright © 2006 \ The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: osd-target.c,v 1.5 2006/03/31 23:22:24 agc Exp $"); +__RCSID("$NetBSD: osd-target.c,v 1.6 2007/06/16 23:13:26 agc Exp $"); #endif #include "config.h" diff --git a/dist/iscsi/src/storage.c b/dist/iscsi/src/storage.c index 0760ce97aff7..aa8d2e1df3d6 100644 --- a/dist/iscsi/src/storage.c +++ b/dist/iscsi/src/storage.c @@ -1,4 +1,4 @@ -/* $NetBSD: storage.c,v 1.5 2006/08/03 20:21:59 agc Exp $ */ +/* $NetBSD: storage.c,v 1.6 2007/06/16 23:13:26 agc Exp $ */ /* * Copyright © 2006 Alistair Crooks. 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 Alistair Crooks - * for the NetBSD project. - * 4. The name of the author may not be used to endorse or promote + * 3. The name of the author may not be used to endorse or promote * products derived from this software without specific prior written * permission. * diff --git a/dist/iscsi/src/strtoll.c b/dist/iscsi/src/strtoll.c index 5482e7d61057..fb7b5595c152 100644 --- a/dist/iscsi/src/strtoll.c +++ b/dist/iscsi/src/strtoll.c @@ -1,4 +1,4 @@ -/* $NetBSD: strtoll.c,v 1.2 2006/03/27 22:26:28 agc Exp $ */ +/* $NetBSD: strtoll.c,v 1.3 2007/06/16 23:13:26 agc Exp $ */ /* * Copyright © 2006 Alistair Crooks. 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 Alistair Crooks - * for the NetBSD project. - * 4. The name of the author may not be used to endorse or promote + * 3. The name of the author may not be used to endorse or promote * products derived from this software without specific prior written * permission. * diff --git a/dist/iscsi/src/uuid.c b/dist/iscsi/src/uuid.c index 371ef7372d72..cab88ff3e93d 100644 --- a/dist/iscsi/src/uuid.c +++ b/dist/iscsi/src/uuid.c @@ -1,4 +1,4 @@ -/* $NetBSD: uuid.c,v 1.2 2006/05/25 19:41:06 agc Exp $ */ +/* $NetBSD: uuid.c,v 1.3 2007/06/16 23:13:26 agc Exp $ */ /* * Copyright © 2006 Alistair Crooks. 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 Alistair Crooks - * for the NetBSD project. - * 4. The name of the author may not be used to endorse or promote + * 3. The name of the author may not be used to endorse or promote * products derived from this software without specific prior written * permission. *