From 35dc15ad6649d47749455d46e2bf186f035da62e Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 20 Nov 2003 05:11:37 +0000 Subject: [PATCH] Normalize to IBM's OPL notice (with permission). --- servers/slapd/slapi/Makefile.in | 10 ++++------ servers/slapd/slapi/ibm_pblock_params.h | 9 ++++----- servers/slapd/slapi/plugin.c | 9 ++++----- servers/slapd/slapi/printmsg.c | 9 ++++----- servers/slapd/slapi/proto-slapi.h | 9 ++++----- servers/slapd/slapi/slapi.h | 9 ++++----- servers/slapd/slapi/slapi_ext.c | 7 +++---- servers/slapd/slapi/slapi_ops.c | 9 ++++----- servers/slapd/slapi/slapi_pblock.c | 9 ++++----- servers/slapd/slapi/slapi_utils.c | 9 ++++----- 10 files changed, 39 insertions(+), 50 deletions(-) diff --git a/servers/slapd/slapi/Makefile.in b/servers/slapd/slapi/Makefile.in index d803f02f80..a8a2e59fed 100644 --- a/servers/slapd/slapi/Makefile.in +++ b/servers/slapd/slapi/Makefile.in @@ -1,12 +1,10 @@ ## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file -## Copyright IBM Corp. 1997,2002 -## Use of this source code is subject to the terms of The OpenLDAP Public -## License Version 2.7, 7 September 2001. -## No trademarks of the IBM Corporation are to be used to identify, endorse -## or promote any products derived from this code without the prior -## written consent of IBM +## Copyright IBM Corp. 1997,2002,2003 +## Redistribution and use in source and binary forms, with or without +## modification, are permitted only as authorized by the OpenLDAP +## Public License. LIBRARY = libslapi.la diff --git a/servers/slapd/slapi/ibm_pblock_params.h b/servers/slapd/slapi/ibm_pblock_params.h index 4a4cb2c45b..0e6baa0cb5 100644 --- a/servers/slapd/slapi/ibm_pblock_params.h +++ b/servers/slapd/slapi/ibm_pblock_params.h @@ -3,11 +3,10 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * Portions Copyright IBM Corp. 1997,2002,2003 - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and that due credit is - * given to IBM Corporation. This software is provided ``as is'' - * without express or implied warranty. + * Portions Copyright IBM Corp. 1997,2002-2003 + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License, version 2.7 or later. */ #ifndef _ibm_pblock_params_H diff --git a/servers/slapd/slapi/plugin.c b/servers/slapd/slapi/plugin.c index 30521b50bd..f22c26286e 100644 --- a/servers/slapd/slapi/plugin.c +++ b/servers/slapd/slapi/plugin.c @@ -3,11 +3,10 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * Portions Copyright IBM Corp. 1997,2002,2003 - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and that due credit is - * given to IBM Corporation. This software is provided ``as is'' - * without express or implied warranty. + * Portions Copyright IBM Corp. 1997,2002-2003 + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License, version 2.7 or later. */ #include "portable.h" diff --git a/servers/slapd/slapi/printmsg.c b/servers/slapd/slapi/printmsg.c index e053a556d7..0ecdd17815 100644 --- a/servers/slapd/slapi/printmsg.c +++ b/servers/slapd/slapi/printmsg.c @@ -3,11 +3,10 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * Portions Copyright IBM Corp. 1997,2002,2003 - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and that due credit is - * given to IBM Corporation. This software is provided ``as is'' - * without express or implied warranty. + * Portions Copyright IBM Corp. 1997,2002-2003 + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License, version 2.7 or later. */ #include diff --git a/servers/slapd/slapi/proto-slapi.h b/servers/slapd/slapi/proto-slapi.h index 85a53129e4..78d5d386cf 100644 --- a/servers/slapd/slapi/proto-slapi.h +++ b/servers/slapd/slapi/proto-slapi.h @@ -3,11 +3,10 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * Portions Copyright IBM Corp. 1997,2002,2003 - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and that due credit is - * given to IBM Corporation. This software is provided ``as is'' - * without express or implied warranty. + * Portions Copyright IBM Corp. 1997,2002-2003 + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License, version 2.7 or later. */ #ifndef _PROTO_SLAPI_H diff --git a/servers/slapd/slapi/slapi.h b/servers/slapd/slapi/slapi.h index be683a0915..ff5b82af81 100644 --- a/servers/slapd/slapi/slapi.h +++ b/servers/slapd/slapi/slapi.h @@ -3,11 +3,10 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * Portions Copyright IBM Corp. 1997,2002,2003 - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and that due credit is - * given to IBM Corporation. This software is provided ``as is'' - * without express or implied warranty. + * Portions Copyright IBM Corp. 1997,2002-2003 + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License, version 2.7 or later. */ #ifdef LDAP_SLAPI /* SLAPI is OPTIONAL */ diff --git a/servers/slapd/slapi/slapi_ext.c b/servers/slapd/slapi/slapi_ext.c index 19eaf362b8..27f4dfbe1c 100644 --- a/servers/slapd/slapi/slapi_ext.c +++ b/servers/slapd/slapi/slapi_ext.c @@ -3,11 +3,10 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * (C) Copyright PADL Software Pty Ltd. 2003 + * Portions Copyright IBM Corp. 1997,2002-2003 * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that this notice is preserved - * and that due credit is given to PADL Software Pty Ltd. This software - * is provided ``as is'' without express or implied warranty. + * modification, are permitted only as authorized by the OpenLDAP + * Public License, version 2.7 or later. */ #include "portable.h" diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c index b5f41815a5..199fc8daf3 100644 --- a/servers/slapd/slapi/slapi_ops.c +++ b/servers/slapd/slapi/slapi_ops.c @@ -3,11 +3,10 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * Portions Copyright IBM Corp. 1997,2002,2003 - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and that due credit is - * given to IBM Corporation. This software is provided ``as is'' - * without express or implied warranty. + * Portions Copyright IBM Corp. 1997,2002-2003 + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License, version 2.7 or later. */ /* * Portions (C) Copyright PADL Software Pty Ltd. 2003 diff --git a/servers/slapd/slapi/slapi_pblock.c b/servers/slapd/slapi/slapi_pblock.c index dc2c7d0b25..33d1babe4b 100644 --- a/servers/slapd/slapi/slapi_pblock.c +++ b/servers/slapd/slapi/slapi_pblock.c @@ -3,11 +3,10 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * Portions Copyright IBM Corp. 1997,2002,2003 - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and that due credit is - * given to IBM Corporation. This software is provided ``as is'' - * without express or implied warranty. + * Portions Copyright IBM Corp. 1997,2002-2003 + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License, version 2.7 or later. */ #include "portable.h" diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c index cdbb8cb117..9832636354 100644 --- a/servers/slapd/slapi/slapi_utils.c +++ b/servers/slapd/slapi/slapi_utils.c @@ -3,11 +3,10 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * Portions Copyright IBM Corp. 1997,2002,2003 - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and that due credit is - * given to IBM Corporation. This software is provided ``as is'' - * without express or implied warranty. + * Portions Copyright IBM Corp. 1997,2002-2003 + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License, version 2.7 or later. */ /* * Portions (C) Copyright PADL Software Pty Ltd. 2003 -- 2.39.5