Fixed licensing typo

95 files changed, 291 insertions, 97 deletions

diff --git a/ldap/admin/src/AddPerlHeader.pl b/ldap/admin/src/AddPerlHeader.pl
index c8581b13..1e64c401 100644
--- a/ldap/admin/src/AddPerlHeader.pl
+++ b/ldap/admin/src/AddPerlHeader.pl
@@ -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/admin/src/Base.def b/ldap/admin/src/Base.def
index 37c92ac9..0dd8f263 100644
--- a/ldap/admin/src/Base.def
+++ b/ldap/admin/src/Base.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/admin/src/Base.pm b/ldap/admin/src/Base.pm
index 70ac3091..0edf682d 100644
--- a/ldap/admin/src/Base.pm
+++ b/ldap/admin/src/Base.pm
@@ -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/admin/src/CGI_ENV b/ldap/admin/src/CGI_ENV
index 13fca644..7de4263b 100644
--- a/ldap/admin/src/CGI_ENV
+++ b/ldap/admin/src/CGI_ENV
@@ -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/admin/src/Cgi.pm b/ldap/admin/src/Cgi.pm
index c6f4db69..a01d179b 100644
--- a/ldap/admin/src/Cgi.pm
+++ b/ldap/admin/src/Cgi.pm
@@ -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/admin/src/CreateInstall.pl b/ldap/admin/src/CreateInstall.pl
index c74d920f..de15fdac 100644
--- a/ldap/admin/src/CreateInstall.pl
+++ b/ldap/admin/src/CreateInstall.pl
@@ -28,7 +28,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/admin/src/DSAdmin.def b/ldap/admin/src/DSAdmin.def
index 1cc76053..06b766b8 100644
--- a/ldap/admin/src/DSAdmin.def
+++ b/ldap/admin/src/DSAdmin.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/admin/src/DSAdmin.mk b/ldap/admin/src/DSAdmin.mk
index 715c1bbe..50a27fbe 100644
--- a/ldap/admin/src/DSAdmin.mk
+++ b/ldap/admin/src/DSAdmin.mk
@@ -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/admin/src/DSAdmin.pm b/ldap/admin/src/DSAdmin.pm
index 503134fe..a2c40d6a 100644
--- a/ldap/admin/src/DSAdmin.pm
+++ b/ldap/admin/src/DSAdmin.pm
@@ -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/admin/src/DSAdmin.xs b/ldap/admin/src/DSAdmin.xs
index 9061a854..f25909a6 100644
--- a/ldap/admin/src/DSAdmin.xs
+++ b/ldap/admin/src/DSAdmin.xs
@@ -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/admin/src/Inf.pm b/ldap/admin/src/Inf.pm
index 79a09f02..4eee2ade 100644
--- a/ldap/admin/src/Inf.pm
+++ b/ldap/admin/src/Inf.pm
@@ -28,7 +28,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/admin/src/Makefile b/ldap/admin/src/Makefile
index 2654b55a..fedbd724 100644
--- a/ldap/admin/src/Makefile
+++ b/ldap/admin/src/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/admin/src/addindex.c b/ldap/admin/src/addindex.c
index d5778442..22732dbb 100644
--- a/ldap/admin/src/addindex.c
+++ b/ldap/admin/src/addindex.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/admin/src/cfg_sspt.c b/ldap/admin/src/cfg_sspt.c
index 87e408b3..b378cac6 100644
--- a/ldap/admin/src/cfg_sspt.c
+++ b/ldap/admin/src/cfg_sspt.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/admin/src/cfg_sspt.h b/ldap/admin/src/cfg_sspt.h
index 21c4c1f2..d437080a 100644
--- a/ldap/admin/src/cfg_sspt.h
+++ b/ldap/admin/src/cfg_sspt.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/admin/src/configure_instance.cpp b/ldap/admin/src/configure_instance.cpp
index eab0ac2c..50cced26 100644
--- a/ldap/admin/src/configure_instance.cpp
+++ b/ldap/admin/src/configure_instance.cpp
@@ -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/admin/src/configure_instance.h b/ldap/admin/src/configure_instance.h
index 1105d021..7127af83 100644
--- a/ldap/admin/src/configure_instance.h
+++ b/ldap/admin/src/configure_instance.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/admin/src/create_instance.c b/ldap/admin/src/create_instance.c
index fffcb2d4..771b227b 100644
--- a/ldap/admin/src/create_instance.c
+++ b/ldap/admin/src/create_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/admin/src/create_instance.h b/ldap/admin/src/create_instance.h
index 640919f5..f16e5361 100644
--- a/ldap/admin/src/create_instance.h
+++ b/ldap/admin/src/create_instance.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/admin/src/ds_bak2db.c b/ldap/admin/src/ds_bak2db.c
index a72cc3be..57c17fc4 100644
--- a/ldap/admin/src/ds_bak2db.c
+++ b/ldap/admin/src/ds_bak2db.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/admin/src/ds_db2bak.c b/ldap/admin/src/ds_db2bak.c
index ab813a4a..0a1ceeed 100644
--- a/ldap/admin/src/ds_db2bak.c
+++ b/ldap/admin/src/ds_db2bak.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/admin/src/ds_db2ldif.c b/ldap/admin/src/ds_db2ldif.c
index 8db0d021..a63894d2 100644
--- a/ldap/admin/src/ds_db2ldif.c
+++ b/ldap/admin/src/ds_db2ldif.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/admin/src/ds_ldif2db.c b/ldap/admin/src/ds_ldif2db.c
index bab65826..276a0fe5 100644
--- a/ldap/admin/src/ds_ldif2db.c
+++ b/ldap/admin/src/ds_ldif2db.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/admin/src/ds_listdb.c b/ldap/admin/src/ds_listdb.c
index 05b8729d..197e5696 100644
--- a/ldap/admin/src/ds_listdb.c
+++ b/ldap/admin/src/ds_listdb.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/admin/src/ds_newinst.c b/ldap/admin/src/ds_newinst.c
index 47f81097..37576867 100644
--- a/ldap/admin/src/ds_newinst.c
+++ b/ldap/admin/src/ds_newinst.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/admin/src/ds_newinst.pl b/ldap/admin/src/ds_newinst.pl
index 90d7226c..401d4db0 100644
--- a/ldap/admin/src/ds_newinst.pl
+++ b/ldap/admin/src/ds_newinst.pl
@@ -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/admin/src/ds_remove.c b/ldap/admin/src/ds_remove.c
index f5cb4fc3..ee2491ac 100644
--- a/ldap/admin/src/ds_remove.c
+++ b/ldap/admin/src/ds_remove.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/admin/src/ds_remove_uninst.cpp b/ldap/admin/src/ds_remove_uninst.cpp
index 3dd190a2..672be925 100644
--- a/ldap/admin/src/ds_remove_uninst.cpp
+++ b/ldap/admin/src/ds_remove_uninst.cpp
@@ -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/admin/src/ds_remove_uninst.h b/ldap/admin/src/ds_remove_uninst.h
index f5a40c2c..a1500696 100644
--- a/ldap/admin/src/ds_remove_uninst.h
+++ b/ldap/admin/src/ds_remove_uninst.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/admin/src/ds_rmdb.c b/ldap/admin/src/ds_rmdb.c
index db9e6583..476897f6 100644
--- a/ldap/admin/src/ds_rmdb.c
+++ b/ldap/admin/src/ds_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/admin/src/ds_snmpctrl.c b/ldap/admin/src/ds_snmpctrl.c
index c18dd48c..06c30503 100644
--- a/ldap/admin/src/ds_snmpctrl.c
+++ b/ldap/admin/src/ds_snmpctrl.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/admin/src/ds_viewlog.pl b/ldap/admin/src/ds_viewlog.pl
index e7d6dc65..358d7d7b 100644
--- a/ldap/admin/src/ds_viewlog.pl
+++ b/ldap/admin/src/ds_viewlog.pl
@@ -28,7 +28,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/admin/src/fix_secmod_db_64 b/ldap/admin/src/fix_secmod_db_64
index e6d58359..3588a35f 100755
--- a/ldap/admin/src/fix_secmod_db_64
+++ b/ldap/admin/src/fix_secmod_db_64
@@ -28,7 +28,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/admin/src/getConfigInfo b/ldap/admin/src/getConfigInfo
index c45ed039..f3e4b356 100644
--- a/ldap/admin/src/getConfigInfo
+++ b/ldap/admin/src/getConfigInfo
@@ -28,7 +28,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/admin/src/import2info b/ldap/admin/src/import2info
index 01ca2b14..9c65d914 100755
--- a/ldap/admin/src/import2info
+++ b/ldap/admin/src/import2info
@@ -28,7 +28,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/admin/src/init_ds_env.c b/ldap/admin/src/init_ds_env.c
index e91c8798..f291041c 100644
--- a/ldap/admin/src/init_ds_env.c
+++ b/ldap/admin/src/init_ds_env.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/admin/src/init_ds_env.h b/ldap/admin/src/init_ds_env.h
index ad0d502d..fcb9c8c5 100644
--- a/ldap/admin/src/init_ds_env.h
+++ b/ldap/admin/src/init_ds_env.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/admin/src/install_keywords.h b/ldap/admin/src/install_keywords.h
index 06fbbf1a..56856614 100644
--- a/ldap/admin/src/install_keywords.h
+++ b/ldap/admin/src/install_keywords.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/admin/src/instindex.cpp b/ldap/admin/src/instindex.cpp
index 5557fdbf..16087c8c 100644
--- a/ldap/admin/src/instindex.cpp
+++ b/ldap/admin/src/instindex.cpp
@@ -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/admin/src/java/com/netscape/xmltools/DSML2LDIF.java b/ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.java
index 71ec5a9b..8b6ac443 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.java
@@ -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/admin/src/java/com/netscape/xmltools/DSMLReader.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLReader.java
index f6f7d978..30af93c7 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLReader.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLReader.java
@@ -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/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java
index 96e306b1..5d0f05f0 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java
@@ -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/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java
index 15fa6a79..c8250581 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java
@@ -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/admin/src/java/com/netscape/xmltools/DSMLWriter.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java
index bd57ab96..ecd3e0b9 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java
@@ -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/admin/src/java/com/netscape/xmltools/GetOpt.java b/ldap/admin/src/java/com/netscape/xmltools/GetOpt.java
index 70d96761..aa52cc6f 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/GetOpt.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/GetOpt.java
@@ -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/admin/src/java/com/netscape/xmltools/LDIF2DSML.java b/ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java
index e9c035d0..9db6a058 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java
@@ -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/admin/src/java/com/netscape/xmltools/Makefile b/ldap/admin/src/java/com/netscape/xmltools/Makefile
index b9a610a0..94003092 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/Makefile
+++ b/ldap/admin/src/java/com/netscape/xmltools/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/admin/src/java/install b/ldap/admin/src/java/install
index e71c7ce2..c1ac5faf 100755
--- a/ldap/admin/src/java/install
+++ b/ldap/admin/src/java/install
@@ -28,7 +28,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/admin/src/java/mcc b/ldap/admin/src/java/mcc
index e2a67bf1..61b4ab3b 100755
--- a/ldap/admin/src/java/mcc
+++ b/ldap/admin/src/java/mcc
@@ -28,7 +28,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/admin/src/java/mcc.bat b/ldap/admin/src/java/mcc.bat
index b1a408af..66eeccb7 100644
--- a/ldap/admin/src/java/mcc.bat
+++ b/ldap/admin/src/java/mcc.bat
@@ -27,7 +27,9 @@
 @rem // in conjunction with the Program except the Non-GPL Code covered by this
 @rem // exception. If you modify this file, you may extend this exception to your
 @rem // version of the file, but you are not obligated to do so. If you do not wish to
-@rem // do so, delete this exception statement from your version. 
+@rem // provide this exception without modification, you must delete this exception
+@rem // statement from your version and license this file solely under the GPL without
+@rem // exception. 
 @rem // 
 @rem // 
 @rem // Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/key.rc b/ldap/admin/src/key.rc
index 41696f37..d4e2473a 100644
--- a/ldap/admin/src/key.rc
+++ b/ldap/admin/src/key.rc
@@ -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/admin/src/latest_file.c b/ldap/admin/src/latest_file.c
index d9d8e9d4..df1d6dd2 100644
--- a/ldap/admin/src/latest_file.c
+++ b/ldap/admin/src/latest_file.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/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
index 4553c212..945c8125 100755
--- a/ldap/admin/src/logconv.pl
+++ b/ldap/admin/src/logconv.pl
@@ -29,7 +29,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/admin/src/makemccvlvindexes b/ldap/admin/src/makemccvlvindexes
index 05acabc8..fb63e47d 100644
--- a/ldap/admin/src/makemccvlvindexes
+++ b/ldap/admin/src/makemccvlvindexes
@@ -28,7 +28,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/admin/src/makevlvindex b/ldap/admin/src/makevlvindex
index 5682711f..322ecc24 100644
--- a/ldap/admin/src/makevlvindex
+++ b/ldap/admin/src/makevlvindex
@@ -28,7 +28,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/admin/src/makevlvsearch b/ldap/admin/src/makevlvsearch
index 22399994..0423767d 100644
--- a/ldap/admin/src/makevlvsearch
+++ b/ldap/admin/src/makevlvsearch
@@ -28,7 +28,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/admin/src/migrateInstance b/ldap/admin/src/migrateInstance
index 5f981279..14cd5a54 100644
--- a/ldap/admin/src/migrateInstance
+++ b/ldap/admin/src/migrateInstance
@@ -28,7 +28,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/admin/src/migrateLocalDB b/ldap/admin/src/migrateLocalDB
index 3d272a1e..522532ad 100644
--- a/ldap/admin/src/migrateLocalDB
+++ b/ldap/admin/src/migrateLocalDB
@@ -28,7 +28,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/admin/src/migratePwdFile b/ldap/admin/src/migratePwdFile
index 2ef350c5..7677012e 100644
--- a/ldap/admin/src/migratePwdFile
+++ b/ldap/admin/src/migratePwdFile
@@ -28,7 +28,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/admin/src/migrateTo4 b/ldap/admin/src/migrateTo4
index dcf63eb5..22c17c52 100644
--- a/ldap/admin/src/migrateTo4
+++ b/ldap/admin/src/migrateTo4
@@ -28,7 +28,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/admin/src/migratedsgw b/ldap/admin/src/migratedsgw
index 1d99ab51..a15c580d 100755
--- a/ldap/admin/src/migratedsgw
+++ b/ldap/admin/src/migratedsgw
@@ -28,7 +28,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/admin/src/namegen.c b/ldap/admin/src/namegen.c
index 3a694936..5e36c15b 100644
--- a/ldap/admin/src/namegen.c
+++ b/ldap/admin/src/namegen.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/admin/src/ns-newpwpolicy.pl b/ldap/admin/src/ns-newpwpolicy.pl
index 492ea416..c91aa822 100644
--- a/ldap/admin/src/ns-newpwpolicy.pl
+++ b/ldap/admin/src/ns-newpwpolicy.pl
@@ -28,7 +28,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/admin/src/restart.c b/ldap/admin/src/restart.c
index b05b7d04..fec805fb 100644
--- a/ldap/admin/src/restart.c
+++ b/ldap/admin/src/restart.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/admin/src/script-gen.c b/ldap/admin/src/script-gen.c
index 9d0e7e26..cac07884 100644
--- a/ldap/admin/src/script-gen.c
+++ b/ldap/admin/src/script-gen.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/admin/src/scripts/template-bak2db.pl b/ldap/admin/src/scripts/template-bak2db.pl
index 0c6e872e..a409aeb2 100644
--- a/ldap/admin/src/scripts/template-bak2db.pl
+++ b/ldap/admin/src/scripts/template-bak2db.pl
@@ -28,7 +28,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/admin/src/scripts/template-cl-dump.pl b/ldap/admin/src/scripts/template-cl-dump.pl
index 905d726f..7368aee2 100755
--- a/ldap/admin/src/scripts/template-cl-dump.pl
+++ b/ldap/admin/src/scripts/template-cl-dump.pl
@@ -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.
@@ -64,7 +66,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/admin/src/scripts/template-db2bak.pl b/ldap/admin/src/scripts/template-db2bak.pl
index f9a67fcd..231bf920 100644
--- a/ldap/admin/src/scripts/template-db2bak.pl
+++ b/ldap/admin/src/scripts/template-db2bak.pl
@@ -28,7 +28,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/admin/src/scripts/template-db2index.pl b/ldap/admin/src/scripts/template-db2index.pl
index c4a57459..d86decc9 100644
--- a/ldap/admin/src/scripts/template-db2index.pl
+++ b/ldap/admin/src/scripts/template-db2index.pl
@@ -28,7 +28,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/admin/src/scripts/template-db2ldif.pl b/ldap/admin/src/scripts/template-db2ldif.pl
index 2631a79c..be6efedc 100644
--- a/ldap/admin/src/scripts/template-db2ldif.pl
+++ b/ldap/admin/src/scripts/template-db2ldif.pl
@@ -28,7 +28,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/admin/src/scripts/template-dsml-activate.pl b/ldap/admin/src/scripts/template-dsml-activate.pl
index 019cbb60..ca7d5652 100644
--- a/ldap/admin/src/scripts/template-dsml-activate.pl
+++ b/ldap/admin/src/scripts/template-dsml-activate.pl
@@ -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/admin/src/scripts/template-ldif2db.pl b/ldap/admin/src/scripts/template-ldif2db.pl
index 04ef5fdb..04aa2f22 100644
--- a/ldap/admin/src/scripts/template-ldif2db.pl
+++ b/ldap/admin/src/scripts/template-ldif2db.pl
@@ -28,7 +28,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/admin/src/scripts/template-migrate50to51 b/ldap/admin/src/scripts/template-migrate50to51
index 0feb4aca..518a978b 100644
--- a/ldap/admin/src/scripts/template-migrate50to51
+++ b/ldap/admin/src/scripts/template-migrate50to51
@@ -28,7 +28,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/admin/src/scripts/template-migrate5to6 b/ldap/admin/src/scripts/template-migrate5to6
index 5d0e89f6..63c5774d 100644
--- a/ldap/admin/src/scripts/template-migrate5to6
+++ b/ldap/admin/src/scripts/template-migrate5to6
@@ -28,7 +28,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/admin/src/scripts/template-migrate5to7 b/ldap/admin/src/scripts/template-migrate5to7
index b84a0c32..622b2216 100644
--- a/ldap/admin/src/scripts/template-migrate5to7
+++ b/ldap/admin/src/scripts/template-migrate5to7
@@ -28,7 +28,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/admin/src/scripts/template-migrate6to7 b/ldap/admin/src/scripts/template-migrate6to7
index f125f081..da799610 100644
--- a/ldap/admin/src/scripts/template-migrate6to7
+++ b/ldap/admin/src/scripts/template-migrate6to7
@@ -28,7 +28,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/admin/src/scripts/template-migrateInstance5 b/ldap/admin/src/scripts/template-migrateInstance5
index f7454472..f7224e8a 100644
--- a/ldap/admin/src/scripts/template-migrateInstance5
+++ b/ldap/admin/src/scripts/template-migrateInstance5
@@ -28,7 +28,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/admin/src/scripts/template-migrateInstance6 b/ldap/admin/src/scripts/template-migrateInstance6
index 7dc94a81..422e9450 100644
--- a/ldap/admin/src/scripts/template-migrateInstance6
+++ b/ldap/admin/src/scripts/template-migrateInstance6
@@ -28,7 +28,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/admin/src/scripts/template-migrateInstance7 b/ldap/admin/src/scripts/template-migrateInstance7
index 9e4d16a1..2493a82e 100644
--- a/ldap/admin/src/scripts/template-migrateInstance7
+++ b/ldap/admin/src/scripts/template-migrateInstance7
@@ -28,7 +28,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/admin/src/scripts/template-migrateTo5 b/ldap/admin/src/scripts/template-migrateTo5
index f7bcd5aa..d9849525 100755
--- a/ldap/admin/src/scripts/template-migrateTo5
+++ b/ldap/admin/src/scripts/template-migrateTo5
@@ -28,7 +28,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/admin/src/scripts/template-migrateTo6 b/ldap/admin/src/scripts/template-migrateTo6
index d17b329e..2f1c8c95 100644
--- a/ldap/admin/src/scripts/template-migrateTo6
+++ b/ldap/admin/src/scripts/template-migrateTo6
@@ -28,7 +28,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/admin/src/scripts/template-migrateTo7 b/ldap/admin/src/scripts/template-migrateTo7
index 93805902..4ee514e8 100644
--- a/ldap/admin/src/scripts/template-migrateTo7
+++ b/ldap/admin/src/scripts/template-migrateTo7
@@ -28,7 +28,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/admin/src/scripts/template-ns-accountstatus.pl b/ldap/admin/src/scripts/template-ns-accountstatus.pl
index 7d339b62..0cc5c3ee 100644
--- a/ldap/admin/src/scripts/template-ns-accountstatus.pl
+++ b/ldap/admin/src/scripts/template-ns-accountstatus.pl
@@ -28,7 +28,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/admin/src/scripts/template-ns-activate.pl b/ldap/admin/src/scripts/template-ns-activate.pl
index 7d339b62..0cc5c3ee 100644
--- a/ldap/admin/src/scripts/template-ns-activate.pl
+++ b/ldap/admin/src/scripts/template-ns-activate.pl
@@ -28,7 +28,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/admin/src/scripts/template-ns-inactivate.pl b/ldap/admin/src/scripts/template-ns-inactivate.pl
index 7d339b62..0cc5c3ee 100644
--- a/ldap/admin/src/scripts/template-ns-inactivate.pl
+++ b/ldap/admin/src/scripts/template-ns-inactivate.pl
@@ -28,7 +28,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/admin/src/scripts/template-ns-newpwpolicy.pl b/ldap/admin/src/scripts/template-ns-newpwpolicy.pl
index 6a5d4c3f..55388f33 100755
--- a/ldap/admin/src/scripts/template-ns-newpwpolicy.pl
+++ b/ldap/admin/src/scripts/template-ns-newpwpolicy.pl
@@ -28,7 +28,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/admin/src/scripts/template-repl-monitor-cgi.pl b/ldap/admin/src/scripts/template-repl-monitor-cgi.pl
index 72d4f474..ad88c1e6 100755
--- a/ldap/admin/src/scripts/template-repl-monitor-cgi.pl
+++ b/ldap/admin/src/scripts/template-repl-monitor-cgi.pl
@@ -28,7 +28,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/admin/src/scripts/template-repl-monitor.pl b/ldap/admin/src/scripts/template-repl-monitor.pl
index 748cb4fb..09869baf 100755
--- a/ldap/admin/src/scripts/template-repl-monitor.pl
+++ b/ldap/admin/src/scripts/template-repl-monitor.pl
@@ -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.
@@ -64,7 +66,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/admin/src/scripts/template-verify-db.pl b/ldap/admin/src/scripts/template-verify-db.pl
index ca7f92c2..4004f5ae 100644
--- a/ldap/admin/src/scripts/template-verify-db.pl
+++ b/ldap/admin/src/scripts/template-verify-db.pl
@@ -28,7 +28,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/admin/src/shutdown.c b/ldap/admin/src/shutdown.c
index 9665c076..14e6d86a 100644
--- a/ldap/admin/src/shutdown.c
+++ b/ldap/admin/src/shutdown.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/admin/src/start.c b/ldap/admin/src/start.c
index 3b7e107d..63194fe3 100644
--- a/ldap/admin/src/start.c
+++ b/ldap/admin/src/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/admin/src/uname.lib b/ldap/admin/src/uname.lib
index 8a7c8068..c8124389 100644
--- a/ldap/admin/src/uname.lib
+++ b/ldap/admin/src/uname.lib
@@ -28,7 +28,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/admin/src/updatedsgw b/ldap/admin/src/updatedsgw
index f7c28f1c..a0318d32 100755
--- a/ldap/admin/src/updatedsgw
+++ b/ldap/admin/src/updatedsgw
@@ -28,7 +28,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/admin/src/upgradeServer b/ldap/admin/src/upgradeServer
index 1aeeedf5..319bcdcf 100755
--- a/ldap/admin/src/upgradeServer
+++ b/ldap/admin/src/upgradeServer
@@ -28,7 +28,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/admin/src/vlvindex.c b/ldap/admin/src/vlvindex.c
index 59d7f8a5..426c6925 100644
--- a/ldap/admin/src/vlvindex.c
+++ b/ldap/admin/src/vlvindex.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.