Fixed licensing typo

73 files changed, 219 insertions, 73 deletions

diff --git a/ldap/servers/slapd/back-ldbm/Makefile b/ldap/servers/slapd/back-ldbm/Makefile
index 55076d3f..9066dd30 100644
--- a/ldap/servers/slapd/back-ldbm/Makefile
+++ b/ldap/servers/slapd/back-ldbm/Makefile
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ancestorid.c b/ldap/servers/slapd/back-ldbm/ancestorid.c
index b4e00cb8..e40388e1 100644
--- a/ldap/servers/slapd/back-ldbm/ancestorid.c
+++ b/ldap/servers/slapd/back-ldbm/ancestorid.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/archive.c b/ldap/servers/slapd/back-ldbm/archive.c
index 6d486334..b047c0d3 100644
--- a/ldap/servers/slapd/back-ldbm/archive.c
+++ b/ldap/servers/slapd/back-ldbm/archive.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/attrcrypt.h b/ldap/servers/slapd/back-ldbm/attrcrypt.h
index ad13b326..f7df35ab 100644
--- a/ldap/servers/slapd/back-ldbm/attrcrypt.h
+++ b/ldap/servers/slapd/back-ldbm/attrcrypt.h
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h
index 3d2bb8d0..1b7e48bb 100644
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/backentry.c b/ldap/servers/slapd/back-ldbm/backentry.c
index aa7ad12d..362c3ec9 100644
--- a/ldap/servers/slapd/back-ldbm/backentry.c
+++ b/ldap/servers/slapd/back-ldbm/backentry.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/cache.c b/ldap/servers/slapd/back-ldbm/cache.c
index 908eae71..1f099897 100644
--- a/ldap/servers/slapd/back-ldbm/cache.c
+++ b/ldap/servers/slapd/back-ldbm/cache.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/cleanup.c b/ldap/servers/slapd/back-ldbm/cleanup.c
index c0c28e21..c729397c 100644
--- a/ldap/servers/slapd/back-ldbm/cleanup.c
+++ b/ldap/servers/slapd/back-ldbm/cleanup.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/close.c b/ldap/servers/slapd/back-ldbm/close.c
index 4f05c888..e01cc3c3 100644
--- a/ldap/servers/slapd/back-ldbm/close.c
+++ b/ldap/servers/slapd/back-ldbm/close.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dbhelp.c b/ldap/servers/slapd/back-ldbm/dbhelp.c
index 2f0ed578..5ad59e84 100644
--- a/ldap/servers/slapd/back-ldbm/dbhelp.c
+++ b/ldap/servers/slapd/back-ldbm/dbhelp.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
index f9a2b8b2..d633849b 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.h b/ldap/servers/slapd/back-ldbm/dblayer.h
index 4b0c2460..4c4e1aaa 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.h
+++ b/ldap/servers/slapd/back-ldbm/dblayer.h
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dbsize.c b/ldap/servers/slapd/back-ldbm/dbsize.c
index 3a2db502..01af727d 100644
--- a/ldap/servers/slapd/back-ldbm/dbsize.c
+++ b/ldap/servers/slapd/back-ldbm/dbsize.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dbtest.c b/ldap/servers/slapd/back-ldbm/dbtest.c
index 1cac566d..5ec13173 100644
--- a/ldap/servers/slapd/back-ldbm/dbtest.c
+++ b/ldap/servers/slapd/back-ldbm/dbtest.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dbversion.c b/ldap/servers/slapd/back-ldbm/dbversion.c
index cfccc108..017e5e88 100644
--- a/ldap/servers/slapd/back-ldbm/dbversion.c
+++ b/ldap/servers/slapd/back-ldbm/dbversion.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dllmain.c b/ldap/servers/slapd/back-ldbm/dllmain.c
index 75893c0b..187f78b8 100644
--- a/ldap/servers/slapd/back-ldbm/dllmain.c
+++ b/ldap/servers/slapd/back-ldbm/dllmain.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dn2entry.c b/ldap/servers/slapd/back-ldbm/dn2entry.c
index 5bd44dbe..92bf30db 100644
--- a/ldap/servers/slapd/back-ldbm/dn2entry.c
+++ b/ldap/servers/slapd/back-ldbm/dn2entry.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/entrystore.c b/ldap/servers/slapd/back-ldbm/entrystore.c
index fd96c0aa..6d71a38f 100644
--- a/ldap/servers/slapd/back-ldbm/entrystore.c
+++ b/ldap/servers/slapd/back-ldbm/entrystore.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/filterindex.c b/ldap/servers/slapd/back-ldbm/filterindex.c
index 78388f93..203f732d 100644
--- a/ldap/servers/slapd/back-ldbm/filterindex.c
+++ b/ldap/servers/slapd/back-ldbm/filterindex.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/findentry.c b/ldap/servers/slapd/back-ldbm/findentry.c
index 0d748d6f..b676c098 100644
--- a/ldap/servers/slapd/back-ldbm/findentry.c
+++ b/ldap/servers/slapd/back-ldbm/findentry.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/haschildren.c b/ldap/servers/slapd/back-ldbm/haschildren.c
index 085c94f9..2cee1eb3 100644
--- a/ldap/servers/slapd/back-ldbm/haschildren.c
+++ b/ldap/servers/slapd/back-ldbm/haschildren.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/id2entry.c b/ldap/servers/slapd/back-ldbm/id2entry.c
index f55c22ca..f4b89c55 100644
--- a/ldap/servers/slapd/back-ldbm/id2entry.c
+++ b/ldap/servers/slapd/back-ldbm/id2entry.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/idl.c b/ldap/servers/slapd/back-ldbm/idl.c
index d7927efd..e2c86d86 100644
--- a/ldap/servers/slapd/back-ldbm/idl.c
+++ b/ldap/servers/slapd/back-ldbm/idl.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/idl_common.c b/ldap/servers/slapd/back-ldbm/idl_common.c
index b84d4dac..4dd54589 100644
--- a/ldap/servers/slapd/back-ldbm/idl_common.c
+++ b/ldap/servers/slapd/back-ldbm/idl_common.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/idl_new.c b/ldap/servers/slapd/back-ldbm/idl_new.c
index 07b365b6..cb391498 100644
--- a/ldap/servers/slapd/back-ldbm/idl_new.c
+++ b/ldap/servers/slapd/back-ldbm/idl_new.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/idl_shim.c b/ldap/servers/slapd/back-ldbm/idl_shim.c
index e7911567..9f258e1d 100644
--- a/ldap/servers/slapd/back-ldbm/idl_shim.c
+++ b/ldap/servers/slapd/back-ldbm/idl_shim.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/idlapi.h b/ldap/servers/slapd/back-ldbm/idlapi.h
index eca97bd8..129aec94 100644
--- a/ldap/servers/slapd/back-ldbm/idlapi.h
+++ b/ldap/servers/slapd/back-ldbm/idlapi.h
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/import-merge.c b/ldap/servers/slapd/back-ldbm/import-merge.c
index 09e9fbb7..e5f817e7 100644
--- a/ldap/servers/slapd/back-ldbm/import-merge.c
+++ b/ldap/servers/slapd/back-ldbm/import-merge.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c
index 1887cece..6add539d 100644
--- a/ldap/servers/slapd/back-ldbm/import-threads.c
+++ b/ldap/servers/slapd/back-ldbm/import-threads.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/import.c b/ldap/servers/slapd/back-ldbm/import.c
index e1135864..0889d894 100644
--- a/ldap/servers/slapd/back-ldbm/import.c
+++ b/ldap/servers/slapd/back-ldbm/import.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/import.h b/ldap/servers/slapd/back-ldbm/import.h
index d21f8003..f9af304c 100644
--- a/ldap/servers/slapd/back-ldbm/import.h
+++ b/ldap/servers/slapd/back-ldbm/import.h
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c
index 3af8084f..e9fac76d 100644
--- a/ldap/servers/slapd/back-ldbm/index.c
+++ b/ldap/servers/slapd/back-ldbm/index.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/init.c b/ldap/servers/slapd/back-ldbm/init.c
index d723516a..689dca72 100644
--- a/ldap/servers/slapd/back-ldbm/init.c
+++ b/ldap/servers/slapd/back-ldbm/init.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/instance.c b/ldap/servers/slapd/back-ldbm/instance.c
index fdd1afea..f2986808 100644
--- a/ldap/servers/slapd/back-ldbm/instance.c
+++ b/ldap/servers/slapd/back-ldbm/instance.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_abandon.c b/ldap/servers/slapd/back-ldbm/ldbm_abandon.c
index 27ac79fb..28669e3a 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_abandon.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_abandon.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c
index 66dfb795..b0fb93d6 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_add.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attr.c b/ldap/servers/slapd/back-ldbm/ldbm_attr.c
index 97b200d3..af53e796 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attr.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attr.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
index c7cff4fc..fa94025b 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
index aeaf4b8f..1a30cbb4 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_bind.c b/ldap/servers/slapd/back-ldbm/ldbm_bind.c
index 08c7be81..ab62ffee 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_bind.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_bind.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_compare.c b/ldap/servers/slapd/back-ldbm/ldbm_compare.c
index 0f1c1045..354c008e 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_compare.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_compare.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index a3d8bab0..7f27b47a 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.h b/ldap/servers/slapd/back-ldbm/ldbm_config.h
index 824865f8..1eb56a49 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.h
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.h
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
index 7b54a5b5..d76491a8 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_index_config.c b/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
index 83e08100..ac168701 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
index 85fc8325..f71ca1d2 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
index 88de1295..bd8f8f98 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
index dabccc9c..eda6b091 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c
index 5c9d44d5..e5ac07c8 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_search.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_unbind.c b/ldap/servers/slapd/back-ldbm/ldbm_unbind.c
index 854f38c2..e5f72ae2 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_unbind.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_unbind.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
index 97cb6cf9..42c7c06b 100644
--- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
+++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/libback-ldbm.def b/ldap/servers/slapd/back-ldbm/libback-ldbm.def
index 55981cbe..661973d5 100644
--- a/ldap/servers/slapd/back-ldbm/libback-ldbm.def
+++ b/ldap/servers/slapd/back-ldbm/libback-ldbm.def
@@ -26,7 +26,9 @@
 ; in conjunction with the Program except the Non-GPL Code covered by this
 ; exception. If you modify this file, you may extend this exception to your
 ; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version. 
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception. 
 ; 
 ; 
 ; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/matchrule.c b/ldap/servers/slapd/back-ldbm/matchrule.c
index 7d82164c..8e7c9401 100644
--- a/ldap/servers/slapd/back-ldbm/matchrule.c
+++ b/ldap/servers/slapd/back-ldbm/matchrule.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/misc.c b/ldap/servers/slapd/back-ldbm/misc.c
index adb70983..64e7a82d 100644
--- a/ldap/servers/slapd/back-ldbm/misc.c
+++ b/ldap/servers/slapd/back-ldbm/misc.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/monitor.c b/ldap/servers/slapd/back-ldbm/monitor.c
index afbae0ce..0e96d333 100644
--- a/ldap/servers/slapd/back-ldbm/monitor.c
+++ b/ldap/servers/slapd/back-ldbm/monitor.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/nextid.c b/ldap/servers/slapd/back-ldbm/nextid.c
index ca4600aa..4671db96 100644
--- a/ldap/servers/slapd/back-ldbm/nextid.c
+++ b/ldap/servers/slapd/back-ldbm/nextid.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/parents.c b/ldap/servers/slapd/back-ldbm/parents.c
index 748b9902..81980bbe 100644
--- a/ldap/servers/slapd/back-ldbm/parents.c
+++ b/ldap/servers/slapd/back-ldbm/parents.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/perfctrs.c b/ldap/servers/slapd/back-ldbm/perfctrs.c
index 57231193..6471b58a 100644
--- a/ldap/servers/slapd/back-ldbm/perfctrs.c
+++ b/ldap/servers/slapd/back-ldbm/perfctrs.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/perfctrs.h b/ldap/servers/slapd/back-ldbm/perfctrs.h
index 07e45634..99e58463 100644
--- a/ldap/servers/slapd/back-ldbm/perfctrs.h
+++ b/ldap/servers/slapd/back-ldbm/perfctrs.h
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
index 5531102f..d2c28372 100644
--- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/rmdb.c b/ldap/servers/slapd/back-ldbm/rmdb.c
index 495a2cba..36ee6b3a 100644
--- a/ldap/servers/slapd/back-ldbm/rmdb.c
+++ b/ldap/servers/slapd/back-ldbm/rmdb.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/seq.c b/ldap/servers/slapd/back-ldbm/seq.c
index 086e958a..9fb667f2 100644
--- a/ldap/servers/slapd/back-ldbm/seq.c
+++ b/ldap/servers/slapd/back-ldbm/seq.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/sort.c b/ldap/servers/slapd/back-ldbm/sort.c
index 6218b791..07de9e14 100644
--- a/ldap/servers/slapd/back-ldbm/sort.c
+++ b/ldap/servers/slapd/back-ldbm/sort.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/start.c b/ldap/servers/slapd/back-ldbm/start.c
index 538fc543..51a7b061 100644
--- a/ldap/servers/slapd/back-ldbm/start.c
+++ b/ldap/servers/slapd/back-ldbm/start.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile b/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
index e379e37e..20d3e245 100644
--- a/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
+++ b/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/tools/index_dump/index_dump.c b/ldap/servers/slapd/back-ldbm/tools/index_dump/index_dump.c
index a7899dc2..7cf5b76f 100644
--- a/ldap/servers/slapd/back-ldbm/tools/index_dump/index_dump.c
+++ b/ldap/servers/slapd/back-ldbm/tools/index_dump/index_dump.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/uniqueid2entry.c b/ldap/servers/slapd/back-ldbm/uniqueid2entry.c
index 74a063dd..e37b0dd0 100644
--- a/ldap/servers/slapd/back-ldbm/uniqueid2entry.c
+++ b/ldap/servers/slapd/back-ldbm/uniqueid2entry.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/upgrade.c b/ldap/servers/slapd/back-ldbm/upgrade.c
index fec714b2..7c932ee5 100644
--- a/ldap/servers/slapd/back-ldbm/upgrade.c
+++ b/ldap/servers/slapd/back-ldbm/upgrade.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/vlv.c b/ldap/servers/slapd/back-ldbm/vlv.c
index c1554f69..7185a351 100644
--- a/ldap/servers/slapd/back-ldbm/vlv.c
+++ b/ldap/servers/slapd/back-ldbm/vlv.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/vlv_key.c b/ldap/servers/slapd/back-ldbm/vlv_key.c
index ef519dbc..80524867 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_key.c
+++ b/ldap/servers/slapd/back-ldbm/vlv_key.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/vlv_key.h b/ldap/servers/slapd/back-ldbm/vlv_key.h
index 2f06899c..f9892403 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_key.h
+++ b/ldap/servers/slapd/back-ldbm/vlv_key.h
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/vlv_srch.c b/ldap/servers/slapd/back-ldbm/vlv_srch.c
index 2219d9ec..892b9125 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_srch.c
+++ b/ldap/servers/slapd/back-ldbm/vlv_srch.c
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/vlv_srch.h b/ldap/servers/slapd/back-ldbm/vlv_srch.h
index 0205abec..87f1b0b7 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_srch.h
+++ b/ldap/servers/slapd/back-ldbm/vlv_srch.h
@@ -26,7 +26,9 @@
  * in conjunction with the Program except the Non-GPL Code covered by this
  * exception. If you modify this file, you may extend this exception to your
  * version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version. 
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception. 
  * 
  * 
  * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.