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

servers/slapd/slapi/Makefile.in

 ## 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
 

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

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"

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>

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

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 */

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"

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

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"

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