Update IBM copyrights

	Kurt Zeilenga, IBM Corporation

diff --git a/servers/slapd/slapi/Makefile.in b/servers/slapd/slapi/Makefile.in
index 640d2d2834a3049e105f7b037b2b838cbee1cd7e..2eddd5362e30e1c14da3e7816a517d7961f13feb 100644 (file)
--- 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
 
 ## 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
 
 LIBRARY = libslapi.la
 #XLIBRARY = libtmpslapd.a

diff --git a/servers/slapd/slapi/proto-slapi.h b/servers/slapd/slapi/proto-slapi.h
index cef405e9fa3ad50e0fe7aa77f7f70017333285a4..f697d4e1aee0c8aad57da03b170168b02f6b38b2 100644 (file)
--- a/servers/slapd/slapi/proto-slapi.h
+++ b/servers/slapd/slapi/proto-slapi.h
@@ -3,11 +3,12 @@
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
  * 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
  */
 
 #ifndef _PROTO_SLAPI_H

diff --git a/servers/slapd/slapi/slapi.h b/servers/slapd/slapi/slapi.h
index 0766b89fad65906218beb27058f3e133a1263b2c..86d44328778732bd60ca0776fdfa4a245df19e9f 100644 (file)
--- a/servers/slapd/slapi/slapi.h
+++ b/servers/slapd/slapi/slapi.h
@@ -3,11 +3,12 @@
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
  * 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 */
  */
 
 #ifdef LDAP_SLAPI /* SLAPI is OPTIONAL */

diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index f9a54e84d704911d19cab79cc299d3369e85f5e1..2c49dee2d20fd76aef98eb42dabe34f8f2d927e6 100644 (file)
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -3,11 +3,12 @@
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
  * 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
  */
 /*
  * 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 3441eb45923733c3987f0bc85115a64d054510b0..5ddd3fb8d8e215696eb0f2bcd56fcc2136005031 100644 (file)
--- a/servers/slapd/slapi/slapi_pblock.c
+++ b/servers/slapd/slapi/slapi_pblock.c
@@ -3,11 +3,12 @@
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
  * 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"
  */
 
 #include "portable.h"

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 2f49c05555653e1f950bac8d618939c21d3304a3..368dc6234e28259014d07264a571e4fa8f79340f 100644 (file)
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -3,11 +3,12 @@
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
  * 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
  */
 /*
  * Portions (C) Copyright PADL Software Pty Ltd. 2003