From: Kurt Zeilenga Date: Sun, 25 May 2003 02:03:07 +0000 (+0000) Subject: Update IBM copyrights X-Git-Tag: OPENLDAP_REL_ENG_2_2_0ALPHA~39 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4b3545cd2ed5165bc6717d8638daa5bb15925066;p=openldap Update IBM copyrights Kurt Zeilenga, IBM Corporation --- diff --git a/servers/slapd/slapi/Makefile.in b/servers/slapd/slapi/Makefile.in index 640d2d2834..2eddd5362e 100644 --- a/servers/slapd/slapi/Makefile.in +++ b/servers/slapd/slapi/Makefile.in @@ -1,12 +1,12 @@ ## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved. ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file -## (C) Copyright IBM Corp. 1997,2002 -## 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. - +## 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 LIBRARY = libslapi.la #XLIBRARY = libtmpslapd.a diff --git a/servers/slapd/slapi/proto-slapi.h b/servers/slapd/slapi/proto-slapi.h index cef405e9fa..f697d4e1ae 100644 --- a/servers/slapd/slapi/proto-slapi.h +++ b/servers/slapd/slapi/proto-slapi.h @@ -3,11 +3,12 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * (C) Copyright IBM Corp. 1997,2002 - * 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. + * Copyright IBM Corp. 1997,2002 + * Use of this source code is subject to the terms of The OpenLDAP Public + * License (version 2.7 or later). + * 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 */ #ifndef _PROTO_SLAPI_H diff --git a/servers/slapd/slapi/slapi.h b/servers/slapd/slapi/slapi.h index 0766b89fad..86d4432877 100644 --- a/servers/slapd/slapi/slapi.h +++ b/servers/slapd/slapi/slapi.h @@ -3,11 +3,12 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * (C) Copyright IBM Corp. 1997,2002 - * 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. + * Copyright IBM Corp. 1997,2002 + * Use of this source code is subject to the terms of The OpenLDAP Public + * License (version 2.7 or later). + * 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 */ #ifdef LDAP_SLAPI /* SLAPI is OPTIONAL */ diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c index f9a54e84d7..2c49dee2d2 100644 --- a/servers/slapd/slapi/slapi_ops.c +++ b/servers/slapd/slapi/slapi_ops.c @@ -3,11 +3,12 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * (C) Copyright IBM Corp. 1997,2002 - * 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. + * Copyright IBM Corp. 1997,2002 + * Use of this source code is subject to the terms of The OpenLDAP Public + * License (version 2.7 or later). + * 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 */ /* * 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 3441eb4592..5ddd3fb8d8 100644 --- a/servers/slapd/slapi/slapi_pblock.c +++ b/servers/slapd/slapi/slapi_pblock.c @@ -3,11 +3,12 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * (C) Copyright IBM Corp. 1997,2002 - * 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. + * Copyright IBM Corp. 1997,2002 + * Use of this source code is subject to the terms of The OpenLDAP Public + * License (version 2.7 or later). + * 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 */ #include "portable.h" diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c index 2f49c05555..368dc6234e 100644 --- a/servers/slapd/slapi/slapi_utils.c +++ b/servers/slapd/slapi/slapi_utils.c @@ -3,11 +3,12 @@ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* - * (C) Copyright IBM Corp. 1997,2002 - * 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. + * Copyright IBM Corp. 1997,2002 + * Use of this source code is subject to the terms of The OpenLDAP Public + * License (version 2.7 or later). + * 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 */ /* * Portions (C) Copyright PADL Software Pty Ltd. 2003