Normalize to IBM's OPL notice (with permission).

diff --git a/servers/slapd/slapi/Makefile.in b/servers/slapd/slapi/Makefile.in
index d803f02f80643e75d7e6701f4820bc7fac2b7eaf..a8a2e59fedeaa8553b37efa946cb5ff706f5bd6f 100644 (file)
--- 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 4a4cb2c45b46a1c2939576d859f248f9f9b06cf8..0e6baa0cb5b0340302514020938027b25bc5a276 100644 (file)
--- 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 30521b50bdec6cdd484cc1a7be4b0c47cb58589a..f22c26286ee53c847eecaf7c610c3095ac00ec0c 100644 (file)
--- 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 e053a556d7f998c924423ba522dfcd437d16a6bd..0ecdd17815dc752acc58d015047755e86e48db6c 100644 (file)
--- 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 <portable.h>

diff --git a/servers/slapd/slapi/proto-slapi.h b/servers/slapd/slapi/proto-slapi.h
index 85a53129e4dbdddc06d3b224dd1b2f5607de9c6b..78d5d386cf44d79cfc40c246076759f2b66938fb 100644 (file)
--- 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 be683a0915dfb430248594ed33aeabdc7c50f725..ff5b82af81b0343a29a524788e329165d4453549 100644 (file)
--- 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 19eaf362b8f8561241151bb9dbdf08b7fec70f4b..27f4dfbe1c315a8e31346bcc45bbb83e160c81df 100644 (file)
--- 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 b5f41815a5785c8cc58a203bc1d25a9087943f13..199fc8daf3142d5824d26a017e24edc70d8dc956 100644 (file)
--- 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 dc2c7d0b25446ef23a6fa82d71d94e5c637a6a27..33d1babe4b2e2aca2690b5fe131a650dad9ecafa 100644 (file)
--- 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 cdbb8cb117cb9f10eabf7c00baf4edcf94b04c17..9832636354052c3f9ebeb895c421d4e52c581435 100644 (file)
--- 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