Fixed licensing typo

156 files changed, 468 insertions, 156 deletions

diff --git a/lib/base/Makefile b/lib/base/Makefile
index a1dbb984..3a65021b 100644
--- a/lib/base/Makefile
+++ b/lib/base/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/lib/base/crit.cpp b/lib/base/crit.cpp
index a377c8a9..b4495106 100644
--- a/lib/base/crit.cpp
+++ b/lib/base/crit.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/lib/base/dns.cpp b/lib/base/dns.cpp
index 9df9ed44..834dcd7f 100644
--- a/lib/base/dns.cpp
+++ b/lib/base/dns.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/lib/base/dnsdmain.cpp b/lib/base/dnsdmain.cpp
index 443afc6f..c974c2da 100644
--- a/lib/base/dnsdmain.cpp
+++ b/lib/base/dnsdmain.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/lib/base/ereport.cpp b/lib/base/ereport.cpp
index caf6b270..d05a1b7e 100644
--- a/lib/base/ereport.cpp
+++ b/lib/base/ereport.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/lib/base/eventlog.cpp b/lib/base/eventlog.cpp
index 5ff62312..b0be1ad0 100644
--- a/lib/base/eventlog.cpp
+++ b/lib/base/eventlog.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/lib/base/file.cpp b/lib/base/file.cpp
index b5ebde80..7c6028c7 100644
--- a/lib/base/file.cpp
+++ b/lib/base/file.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/lib/base/fsmutex.cpp b/lib/base/fsmutex.cpp
index 7176ee85..bd4f4357 100644
--- a/lib/base/fsmutex.cpp
+++ b/lib/base/fsmutex.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/lib/base/lexer.cpp b/lib/base/lexer.cpp
index 767a0483..d5292f0b 100644
--- a/lib/base/lexer.cpp
+++ b/lib/base/lexer.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/lib/base/lexer_pvt.h b/lib/base/lexer_pvt.h
index 8c303180..528144fd 100644
--- a/lib/base/lexer_pvt.h
+++ b/lib/base/lexer_pvt.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/lib/base/net.cpp b/lib/base/net.cpp
index 9279f3d3..5c31032b 100644
--- a/lib/base/net.cpp
+++ b/lib/base/net.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/lib/base/nscperror.c b/lib/base/nscperror.c
index d1e88b9e..8c30a4e0 100644
--- a/lib/base/nscperror.c
+++ b/lib/base/nscperror.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/lib/base/nterrors.cpp b/lib/base/nterrors.cpp
index 1ffb3fbc..1104515a 100644
--- a/lib/base/nterrors.cpp
+++ b/lib/base/nterrors.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/lib/base/plist.cpp b/lib/base/plist.cpp
index ca847d62..c2062767 100644
--- a/lib/base/plist.cpp
+++ b/lib/base/plist.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/lib/base/plist_pvt.h b/lib/base/plist_pvt.h
index 180babaa..e007a7ce 100644
--- a/lib/base/plist_pvt.h
+++ b/lib/base/plist_pvt.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/lib/base/pool.cpp b/lib/base/pool.cpp
index 126ee3f9..915199c7 100644
--- a/lib/base/pool.cpp
+++ b/lib/base/pool.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/lib/base/rwlock.cpp b/lib/base/rwlock.cpp
index 67278794..af504a87 100644
--- a/lib/base/rwlock.cpp
+++ b/lib/base/rwlock.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/lib/base/shexp.cpp b/lib/base/shexp.cpp
index a9b69e05..7b0b2652 100644
--- a/lib/base/shexp.cpp
+++ b/lib/base/shexp.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/lib/base/system.cpp b/lib/base/system.cpp
index f54e268b..5dde18d8 100644
--- a/lib/base/system.cpp
+++ b/lib/base/system.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/lib/base/systhr.cpp b/lib/base/systhr.cpp
index 134ae2b4..8bbfc55f 100644
--- a/lib/base/systhr.cpp
+++ b/lib/base/systhr.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/lib/base/util.cpp b/lib/base/util.cpp
index 50f76577..3f4aa766 100644
--- a/lib/base/util.cpp
+++ b/lib/base/util.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/lib/ldaputil/Makefile b/lib/ldaputil/Makefile
index bc029d41..0102d029 100644
--- a/lib/ldaputil/Makefile
+++ b/lib/ldaputil/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/lib/ldaputil/cert.c b/lib/ldaputil/cert.c
index 5dbb9d23..b85f2eb7 100644
--- a/lib/ldaputil/cert.c
+++ b/lib/ldaputil/cert.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/lib/ldaputil/certmap.c b/lib/ldaputil/certmap.c
index e77168c8..952d2116 100644
--- a/lib/ldaputil/certmap.c
+++ b/lib/ldaputil/certmap.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/lib/ldaputil/certmap.conf b/lib/ldaputil/certmap.conf
index 222c87d8..00942071 100644
--- a/lib/ldaputil/certmap.conf
+++ b/lib/ldaputil/certmap.conf
@@ -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/lib/ldaputil/dbconf.c b/lib/ldaputil/dbconf.c
index 24db71c1..f507251a 100644
--- a/lib/ldaputil/dbconf.c
+++ b/lib/ldaputil/dbconf.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/lib/ldaputil/encode.c b/lib/ldaputil/encode.c
index 36e52a20..dfc80450 100644
--- a/lib/ldaputil/encode.c
+++ b/lib/ldaputil/encode.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/lib/ldaputil/errors.c b/lib/ldaputil/errors.c
index 820437a0..ef9ae840 100644
--- a/lib/ldaputil/errors.c
+++ b/lib/ldaputil/errors.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/lib/ldaputil/examples/Certmap.mak b/lib/ldaputil/examples/Certmap.mak
index 3418ab9d..bde0f1b3 100644
--- a/lib/ldaputil/examples/Certmap.mak
+++ b/lib/ldaputil/examples/Certmap.mak
@@ -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/lib/ldaputil/examples/Makefile b/lib/ldaputil/examples/Makefile
index ee6c5699..7cb7d215 100644
--- a/lib/ldaputil/examples/Makefile
+++ b/lib/ldaputil/examples/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/lib/ldaputil/examples/README b/lib/ldaputil/examples/README
index ca118fbb..ff485810 100644
--- a/lib/ldaputil/examples/README
+++ b/lib/ldaputil/examples/README
@@ -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/lib/ldaputil/examples/init.c b/lib/ldaputil/examples/init.c
index e505d7fb..4474d3dd 100644
--- a/lib/ldaputil/examples/init.c
+++ b/lib/ldaputil/examples/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/lib/ldaputil/examples/plugin.c b/lib/ldaputil/examples/plugin.c
index fa5f10db..8384d34b 100644
--- a/lib/ldaputil/examples/plugin.c
+++ b/lib/ldaputil/examples/plugin.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/lib/ldaputil/examples/plugin.h b/lib/ldaputil/examples/plugin.h
index fe45cce1..ca71595c 100644
--- a/lib/ldaputil/examples/plugin.h
+++ b/lib/ldaputil/examples/plugin.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/lib/ldaputil/init.c b/lib/ldaputil/init.c
index 371d6972..15ed1b20 100644
--- a/lib/ldaputil/init.c
+++ b/lib/ldaputil/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/lib/ldaputil/ldapauth.c b/lib/ldaputil/ldapauth.c
index d03f1548..40ee9e77 100644
--- a/lib/ldaputil/ldapauth.c
+++ b/lib/ldaputil/ldapauth.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/lib/ldaputil/ldapdb.c b/lib/ldaputil/ldapdb.c
index 9f75a3b1..4b046418 100644
--- a/lib/ldaputil/ldapdb.c
+++ b/lib/ldaputil/ldapdb.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/lib/ldaputil/ldapu-changes.html b/lib/ldaputil/ldapu-changes.html
index 21637046..6bf12590 100644
--- a/lib/ldaputil/ldapu-changes.html
+++ b/lib/ldaputil/ldapu-changes.html
@@ -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/lib/ldaputil/ldaputili.h b/lib/ldaputil/ldaputili.h
index 99bc74b7..937d13c3 100644
--- a/lib/ldaputil/ldaputili.h
+++ b/lib/ldaputil/ldaputili.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/lib/ldaputil/utest/Makefile b/lib/ldaputil/utest/Makefile
index 78a9739f..2f976af8 100644
--- a/lib/ldaputil/utest/Makefile
+++ b/lib/ldaputil/utest/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/lib/ldaputil/utest/auth.cpp b/lib/ldaputil/utest/auth.cpp
index 60b45bc8..64972aa8 100644
--- a/lib/ldaputil/utest/auth.cpp
+++ b/lib/ldaputil/utest/auth.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/lib/ldaputil/utest/authtest b/lib/ldaputil/utest/authtest
index 98773356..055a4713 100755
--- a/lib/ldaputil/utest/authtest
+++ b/lib/ldaputil/utest/authtest
@@ -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/lib/ldaputil/utest/certmap.conf b/lib/ldaputil/utest/certmap.conf
index de7d5e53..248b6099 100644
--- a/lib/ldaputil/utest/certmap.conf
+++ b/lib/ldaputil/utest/certmap.conf
@@ -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/lib/ldaputil/utest/dblist.conf b/lib/ldaputil/utest/dblist.conf
index 345788a6..a7ed9858 100644
--- a/lib/ldaputil/utest/dblist.conf
+++ b/lib/ldaputil/utest/dblist.conf
@@ -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/lib/ldaputil/utest/example.c b/lib/ldaputil/utest/example.c
index 355eff5b..c1d5d6db 100644
--- a/lib/ldaputil/utest/example.c
+++ b/lib/ldaputil/utest/example.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/lib/ldaputil/utest/plugin.c b/lib/ldaputil/utest/plugin.c
index f1be6e82..d46d8118 100644
--- a/lib/ldaputil/utest/plugin.c
+++ b/lib/ldaputil/utest/plugin.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/lib/ldaputil/utest/plugin.h b/lib/ldaputil/utest/plugin.h
index 61e1cfa7..f2cf714e 100644
--- a/lib/ldaputil/utest/plugin.h
+++ b/lib/ldaputil/utest/plugin.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/lib/ldaputil/utest/stubs.c b/lib/ldaputil/utest/stubs.c
index 141841ea..a612c865 100644
--- a/lib/ldaputil/utest/stubs.c
+++ b/lib/ldaputil/utest/stubs.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/lib/ldaputil/utest/stubs.cpp b/lib/ldaputil/utest/stubs.cpp
index 9f367a3a..69dc2300 100644
--- a/lib/ldaputil/utest/stubs.cpp
+++ b/lib/ldaputil/utest/stubs.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/lib/ldaputil/utest/test.ref b/lib/ldaputil/utest/test.ref
index 9db0732b..8f621df6 100644
--- a/lib/ldaputil/utest/test.ref
+++ b/lib/ldaputil/utest/test.ref
@@ -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/lib/ldaputil/vtable.c b/lib/ldaputil/vtable.c
index 0d66cccd..3aaa7ec0 100644
--- a/lib/ldaputil/vtable.c
+++ b/lib/ldaputil/vtable.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/lib/libaccess/Makefile b/lib/libaccess/Makefile
index 6f423cc7..37a7578a 100644
--- a/lib/libaccess/Makefile
+++ b/lib/libaccess/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/lib/libaccess/access_plhash.cpp b/lib/libaccess/access_plhash.cpp
index 4d78336b..d767bf92 100644
--- a/lib/libaccess/access_plhash.cpp
+++ b/lib/libaccess/access_plhash.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/lib/libaccess/access_plhash.h b/lib/libaccess/access_plhash.h
index 772f5a2b..9712db78 100644
--- a/lib/libaccess/access_plhash.h
+++ b/lib/libaccess/access_plhash.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/lib/libaccess/acl.tab.cpp b/lib/libaccess/acl.tab.cpp
index 2c8f42c7..9f66edcf 100644
--- a/lib/libaccess/acl.tab.cpp
+++ b/lib/libaccess/acl.tab.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/lib/libaccess/acl.tab.h b/lib/libaccess/acl.tab.h
index d114d78d..ba277c38 100644
--- a/lib/libaccess/acl.tab.h
+++ b/lib/libaccess/acl.tab.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/lib/libaccess/acl.yy.cpp b/lib/libaccess/acl.yy.cpp
index abcd2a9a..9ea95ac5 100644
--- a/lib/libaccess/acl.yy.cpp
+++ b/lib/libaccess/acl.yy.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/lib/libaccess/aclcache.cpp b/lib/libaccess/aclcache.cpp
index 460c7e83..da467cc7 100644
--- a/lib/libaccess/aclcache.cpp
+++ b/lib/libaccess/aclcache.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/lib/libaccess/aclcache.h b/lib/libaccess/aclcache.h
index 49618f22..d4f73d24 100644
--- a/lib/libaccess/aclcache.h
+++ b/lib/libaccess/aclcache.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/lib/libaccess/aclerror.cpp b/lib/libaccess/aclerror.cpp
index 615728b4..813dbbfe 100644
--- a/lib/libaccess/aclerror.cpp
+++ b/lib/libaccess/aclerror.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/lib/libaccess/acleval.cpp b/lib/libaccess/acleval.cpp
index 86b92746..bc5ae71c 100644
--- a/lib/libaccess/acleval.cpp
+++ b/lib/libaccess/acleval.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/lib/libaccess/aclflush.cpp b/lib/libaccess/aclflush.cpp
index 80d3a9f7..7f34a307 100644
--- a/lib/libaccess/aclflush.cpp
+++ b/lib/libaccess/aclflush.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/lib/libaccess/aclpriv.h b/lib/libaccess/aclpriv.h
index ba001321..f4e9b78a 100644
--- a/lib/libaccess/aclpriv.h
+++ b/lib/libaccess/aclpriv.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/lib/libaccess/aclscan.h b/lib/libaccess/aclscan.h
index 6e6b2ab5..e453a1a9 100644
--- a/lib/libaccess/aclscan.h
+++ b/lib/libaccess/aclscan.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/lib/libaccess/aclscan.l b/lib/libaccess/aclscan.l
index 5bd4e3f7..671e760a 100644
--- a/lib/libaccess/aclscan.l
+++ b/lib/libaccess/aclscan.l
@@ -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/lib/libaccess/aclspace.cpp b/lib/libaccess/aclspace.cpp
index c3aa05c9..b7f05972 100644
--- a/lib/libaccess/aclspace.cpp
+++ b/lib/libaccess/aclspace.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/lib/libaccess/acltext.y b/lib/libaccess/acltext.y
index 96d31911..368e7ad5 100644
--- a/lib/libaccess/acltext.y
+++ b/lib/libaccess/acltext.y
@@ -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/lib/libaccess/acltools.cpp b/lib/libaccess/acltools.cpp
index 1ad359ae..7f96bedf 100644
--- a/lib/libaccess/acltools.cpp
+++ b/lib/libaccess/acltools.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/lib/libaccess/aclutil.cpp b/lib/libaccess/aclutil.cpp
index 58fdba9c..0d14f96e 100644
--- a/lib/libaccess/aclutil.cpp
+++ b/lib/libaccess/aclutil.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/lib/libaccess/aclutil.h b/lib/libaccess/aclutil.h
index fd389a0a..4dd0124b 100644
--- a/lib/libaccess/aclutil.h
+++ b/lib/libaccess/aclutil.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/lib/libaccess/authdb.cpp b/lib/libaccess/authdb.cpp
index 12368330..d87703f2 100644
--- a/lib/libaccess/authdb.cpp
+++ b/lib/libaccess/authdb.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/lib/libaccess/las.h b/lib/libaccess/las.h
index be2b06b6..94ceddfc 100644
--- a/lib/libaccess/las.h
+++ b/lib/libaccess/las.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/lib/libaccess/lasdns.cpp b/lib/libaccess/lasdns.cpp
index a4ad5933..6b2c4a12 100644
--- a/lib/libaccess/lasdns.cpp
+++ b/lib/libaccess/lasdns.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/lib/libaccess/lasdns.h b/lib/libaccess/lasdns.h
index 74f38ce0..83967b75 100644
--- a/lib/libaccess/lasdns.h
+++ b/lib/libaccess/lasdns.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/lib/libaccess/lasgroup.cpp b/lib/libaccess/lasgroup.cpp
index 0349b9e3..f5d7288f 100644
--- a/lib/libaccess/lasgroup.cpp
+++ b/lib/libaccess/lasgroup.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/lib/libaccess/lasip.cpp b/lib/libaccess/lasip.cpp
index 574d2f0e..3e2ae56a 100644
--- a/lib/libaccess/lasip.cpp
+++ b/lib/libaccess/lasip.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/lib/libaccess/lasip.h b/lib/libaccess/lasip.h
index 4d1103b5..c3815794 100644
--- a/lib/libaccess/lasip.h
+++ b/lib/libaccess/lasip.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/lib/libaccess/lastod.cpp b/lib/libaccess/lastod.cpp
index 226b201a..4236b2cc 100644
--- a/lib/libaccess/lastod.cpp
+++ b/lib/libaccess/lastod.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/lib/libaccess/lasuser.cpp b/lib/libaccess/lasuser.cpp
index 5b20e2b8..eaff4810 100644
--- a/lib/libaccess/lasuser.cpp
+++ b/lib/libaccess/lasuser.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/lib/libaccess/ldapacl.cpp b/lib/libaccess/ldapacl.cpp
index d4176a96..bbff3f98 100644
--- a/lib/libaccess/ldapacl.cpp
+++ b/lib/libaccess/ldapacl.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/lib/libaccess/ldapauth.h b/lib/libaccess/ldapauth.h
index 62933cb6..62db6f73 100644
--- a/lib/libaccess/ldapauth.h
+++ b/lib/libaccess/ldapauth.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/lib/libaccess/method.cpp b/lib/libaccess/method.cpp
index 37a62673..64924847 100644
--- a/lib/libaccess/method.cpp
+++ b/lib/libaccess/method.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/lib/libaccess/nsautherr.cpp b/lib/libaccess/nsautherr.cpp
index b5c9be18..1f491fdd 100644
--- a/lib/libaccess/nsautherr.cpp
+++ b/lib/libaccess/nsautherr.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/lib/libaccess/nseframe.cpp b/lib/libaccess/nseframe.cpp
index 1e1e26d0..ee918b5c 100644
--- a/lib/libaccess/nseframe.cpp
+++ b/lib/libaccess/nseframe.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/lib/libaccess/oneeval.cpp b/lib/libaccess/oneeval.cpp
index 023fc606..9f8cdaaa 100644
--- a/lib/libaccess/oneeval.cpp
+++ b/lib/libaccess/oneeval.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/lib/libaccess/oneeval.h b/lib/libaccess/oneeval.h
index 4142e4d0..9b433e20 100644
--- a/lib/libaccess/oneeval.h
+++ b/lib/libaccess/oneeval.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/lib/libaccess/parse.h b/lib/libaccess/parse.h
index b85c041a..e5b92b8f 100644
--- a/lib/libaccess/parse.h
+++ b/lib/libaccess/parse.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/lib/libaccess/permhash.h b/lib/libaccess/permhash.h
index 85fc5da4..0fa31885 100644
--- a/lib/libaccess/permhash.h
+++ b/lib/libaccess/permhash.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/lib/libaccess/register.cpp b/lib/libaccess/register.cpp
index 129b1b35..aae5597c 100644
--- a/lib/libaccess/register.cpp
+++ b/lib/libaccess/register.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/lib/libaccess/symbols.cpp b/lib/libaccess/symbols.cpp
index ac03f4ca..09a3c6d8 100644
--- a/lib/libaccess/symbols.cpp
+++ b/lib/libaccess/symbols.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/lib/libaccess/usi.cpp b/lib/libaccess/usi.cpp
index 7a97a34c..361f20d3 100644
--- a/lib/libaccess/usi.cpp
+++ b/lib/libaccess/usi.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/lib/libaccess/usrcache.cpp b/lib/libaccess/usrcache.cpp
index 46eff750..f6f337b8 100644
--- a/lib/libaccess/usrcache.cpp
+++ b/lib/libaccess/usrcache.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/lib/libaccess/utest/Makefile b/lib/libaccess/utest/Makefile
index 0f63fe1d..81a0eb70 100644
--- a/lib/libaccess/utest/Makefile
+++ b/lib/libaccess/utest/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/lib/libaccess/utest/acl.dat b/lib/libaccess/utest/acl.dat
index f0338534..00f612d7 100644
--- a/lib/libaccess/utest/acl.dat
+++ b/lib/libaccess/utest/acl.dat
@@ -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/lib/libaccess/utest/aclfile0 b/lib/libaccess/utest/aclfile0
index 932052a1..248e245b 100644
--- a/lib/libaccess/utest/aclfile0
+++ b/lib/libaccess/utest/aclfile0
@@ -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/lib/libaccess/utest/aclfile1 b/lib/libaccess/utest/aclfile1
index fc14e53f..314ae094 100644
--- a/lib/libaccess/utest/aclfile1
+++ b/lib/libaccess/utest/aclfile1
@@ -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/lib/libaccess/utest/aclfile10 b/lib/libaccess/utest/aclfile10
index 84477850..4d78bbc1 100644
--- a/lib/libaccess/utest/aclfile10
+++ b/lib/libaccess/utest/aclfile10
@@ -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/lib/libaccess/utest/aclfile11 b/lib/libaccess/utest/aclfile11
index 78881781..16376bb3 100644
--- a/lib/libaccess/utest/aclfile11
+++ b/lib/libaccess/utest/aclfile11
@@ -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/lib/libaccess/utest/aclfile12 b/lib/libaccess/utest/aclfile12
index acd40aeb..0a4c2adb 100644
--- a/lib/libaccess/utest/aclfile12
+++ b/lib/libaccess/utest/aclfile12
@@ -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/lib/libaccess/utest/aclfile13 b/lib/libaccess/utest/aclfile13
index 028063e4..0fbce619 100644
--- a/lib/libaccess/utest/aclfile13
+++ b/lib/libaccess/utest/aclfile13
@@ -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/lib/libaccess/utest/aclfile14 b/lib/libaccess/utest/aclfile14
index ee7964d7..7ed043d2 100644
--- a/lib/libaccess/utest/aclfile14
+++ b/lib/libaccess/utest/aclfile14
@@ -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/lib/libaccess/utest/aclfile15 b/lib/libaccess/utest/aclfile15
index f633f721..b2dd641b 100644
--- a/lib/libaccess/utest/aclfile15
+++ b/lib/libaccess/utest/aclfile15
@@ -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/lib/libaccess/utest/aclfile16 b/lib/libaccess/utest/aclfile16
index d1dea3bb..1f837b12 100644
--- a/lib/libaccess/utest/aclfile16
+++ b/lib/libaccess/utest/aclfile16
@@ -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/lib/libaccess/utest/aclfile17 b/lib/libaccess/utest/aclfile17
index 8d085855..42901016 100644
--- a/lib/libaccess/utest/aclfile17
+++ b/lib/libaccess/utest/aclfile17
@@ -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/lib/libaccess/utest/aclfile18 b/lib/libaccess/utest/aclfile18
index 1d83aa0b..1d0445d2 100644
--- a/lib/libaccess/utest/aclfile18
+++ b/lib/libaccess/utest/aclfile18
@@ -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/lib/libaccess/utest/aclfile19 b/lib/libaccess/utest/aclfile19
index 559ceafc..f637c17f 100644
--- a/lib/libaccess/utest/aclfile19
+++ b/lib/libaccess/utest/aclfile19
@@ -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/lib/libaccess/utest/aclfile2 b/lib/libaccess/utest/aclfile2
index 46b4d3b8..a4424310 100644
--- a/lib/libaccess/utest/aclfile2
+++ b/lib/libaccess/utest/aclfile2
@@ -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/lib/libaccess/utest/aclfile3 b/lib/libaccess/utest/aclfile3
index 6eb3c6fa..957072e5 100644
--- a/lib/libaccess/utest/aclfile3
+++ b/lib/libaccess/utest/aclfile3
@@ -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/lib/libaccess/utest/aclfile4 b/lib/libaccess/utest/aclfile4
index 2ee7c58e..aa373b34 100644
--- a/lib/libaccess/utest/aclfile4
+++ b/lib/libaccess/utest/aclfile4
@@ -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/lib/libaccess/utest/aclfile5 b/lib/libaccess/utest/aclfile5
index 8fab381e..10de6a52 100644
--- a/lib/libaccess/utest/aclfile5
+++ b/lib/libaccess/utest/aclfile5
@@ -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/lib/libaccess/utest/aclfile6 b/lib/libaccess/utest/aclfile6
index f8fefcfe..cc3cb7aa 100644
--- a/lib/libaccess/utest/aclfile6
+++ b/lib/libaccess/utest/aclfile6
@@ -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/lib/libaccess/utest/aclfile7 b/lib/libaccess/utest/aclfile7
index 0b809504..1c89664c 100644
--- a/lib/libaccess/utest/aclfile7
+++ b/lib/libaccess/utest/aclfile7
@@ -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/lib/libaccess/utest/aclfile8 b/lib/libaccess/utest/aclfile8
index c67689f7..e44ff8fc 100644
--- a/lib/libaccess/utest/aclfile8
+++ b/lib/libaccess/utest/aclfile8
@@ -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/lib/libaccess/utest/aclfile9 b/lib/libaccess/utest/aclfile9
index 1aa4ff84..753fdee0 100644
--- a/lib/libaccess/utest/aclfile9
+++ b/lib/libaccess/utest/aclfile9
@@ -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/lib/libaccess/utest/aclgrp0 b/lib/libaccess/utest/aclgrp0
index 86ecb985..da6012c4 100644
--- a/lib/libaccess/utest/aclgrp0
+++ b/lib/libaccess/utest/aclgrp0
@@ -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/lib/libaccess/utest/aclgrp1 b/lib/libaccess/utest/aclgrp1
index 109f1978..e877794f 100644
--- a/lib/libaccess/utest/aclgrp1
+++ b/lib/libaccess/utest/aclgrp1
@@ -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/lib/libaccess/utest/aclgrp2 b/lib/libaccess/utest/aclgrp2
index eb2765dc..f799ef0b 100644
--- a/lib/libaccess/utest/aclgrp2
+++ b/lib/libaccess/utest/aclgrp2
@@ -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/lib/libaccess/utest/aclgrp3 b/lib/libaccess/utest/aclgrp3
index 4da77f59..7ad63041 100644
--- a/lib/libaccess/utest/aclgrp3
+++ b/lib/libaccess/utest/aclgrp3
@@ -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/lib/libaccess/utest/aclgrp4 b/lib/libaccess/utest/aclgrp4
index 75e20828..e726f3bd 100644
--- a/lib/libaccess/utest/aclgrp4
+++ b/lib/libaccess/utest/aclgrp4
@@ -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/lib/libaccess/utest/acltest.cpp b/lib/libaccess/utest/acltest.cpp
index 713be4c5..6aafd87a 100644
--- a/lib/libaccess/utest/acltest.cpp
+++ b/lib/libaccess/utest/acltest.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/lib/libaccess/utest/lasemail.cpp b/lib/libaccess/utest/lasemail.cpp
index e741ce0b..2fdde176 100644
--- a/lib/libaccess/utest/lasemail.cpp
+++ b/lib/libaccess/utest/lasemail.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/lib/libaccess/utest/onetest.cpp b/lib/libaccess/utest/onetest.cpp
index 82eccdd5..e052f3be 100644
--- a/lib/libaccess/utest/onetest.cpp
+++ b/lib/libaccess/utest/onetest.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/lib/libaccess/utest/shexp.cpp b/lib/libaccess/utest/shexp.cpp
index 79d2e6f2..601ce41c 100644
--- a/lib/libaccess/utest/shexp.cpp
+++ b/lib/libaccess/utest/shexp.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/lib/libaccess/utest/shexp.h b/lib/libaccess/utest/shexp.h
index 5397d3dd..2cad1ca5 100644
--- a/lib/libaccess/utest/shexp.h
+++ b/lib/libaccess/utest/shexp.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/lib/libaccess/utest/testmain.cpp b/lib/libaccess/utest/testmain.cpp
index 641eff84..e13efd9b 100644
--- a/lib/libaccess/utest/testmain.cpp
+++ b/lib/libaccess/utest/testmain.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/lib/libaccess/utest/twotest.cpp b/lib/libaccess/utest/twotest.cpp
index a94277f5..3247856f 100644
--- a/lib/libaccess/utest/twotest.cpp
+++ b/lib/libaccess/utest/twotest.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/lib/libaccess/utest/ustubs.cpp b/lib/libaccess/utest/ustubs.cpp
index 65214585..5e6ab4f7 100644
--- a/lib/libaccess/utest/ustubs.cpp
+++ b/lib/libaccess/utest/ustubs.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/lib/libaccess/yy-sed b/lib/libaccess/yy-sed
index 902cd6f1..e33445d1 100644
--- a/lib/libaccess/yy-sed
+++ b/lib/libaccess/yy-sed
@@ -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/lib/libadmin/Makefile b/lib/libadmin/Makefile
index b0a8ea06..83f2471b 100644
--- a/lib/libadmin/Makefile
+++ b/lib/libadmin/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/lib/libadmin/authdb.c b/lib/libadmin/authdb.c
index 2b9fb78c..2256b25d 100644
--- a/lib/libadmin/authdb.c
+++ b/lib/libadmin/authdb.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/lib/libadmin/error.c b/lib/libadmin/error.c
index 90065aab..f6e0a3cd 100644
--- a/lib/libadmin/error.c
+++ b/lib/libadmin/error.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/lib/libadmin/template.c b/lib/libadmin/template.c
index 0df28226..630e41a9 100644
--- a/lib/libadmin/template.c
+++ b/lib/libadmin/template.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/lib/libadmin/util.c b/lib/libadmin/util.c
index ffd813af..28327d2d 100644
--- a/lib/libadmin/util.c
+++ b/lib/libadmin/util.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/lib/libnt/Makefile b/lib/libnt/Makefile
index b9bc650a..b43797be 100644
--- a/lib/libnt/Makefile
+++ b/lib/libnt/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/lib/libnt/info.c b/lib/libnt/info.c
index 7da1b4ab..a2fcfeb7 100644
--- a/lib/libnt/info.c
+++ b/lib/libnt/info.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/lib/libnt/path.c b/lib/libnt/path.c
index 153f3704..b2ba34c4 100644
--- a/lib/libnt/path.c
+++ b/lib/libnt/path.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/lib/libnt/pmddeml.c b/lib/libnt/pmddeml.c
index eb3a3dee..aac29528 100644
--- a/lib/libnt/pmddeml.c
+++ b/lib/libnt/pmddeml.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/lib/libnt/registry.c b/lib/libnt/registry.c
index d5aa2b6a..04b4ab6e 100644
--- a/lib/libnt/registry.c
+++ b/lib/libnt/registry.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/lib/libnt/service.c b/lib/libnt/service.c
index 3768e14d..f193c543 100644
--- a/lib/libnt/service.c
+++ b/lib/libnt/service.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/lib/libnt/tcpip.c b/lib/libnt/tcpip.c
index 23e061cb..70cb8dd4 100644
--- a/lib/libnt/tcpip.c
+++ b/lib/libnt/tcpip.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/lib/libsi18n/Makefile b/lib/libsi18n/Makefile
index 59883efd..d9432314 100644
--- a/lib/libsi18n/Makefile
+++ b/lib/libsi18n/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/lib/libsi18n/acclanglist.c b/lib/libsi18n/acclanglist.c
index fec4980e..1fd4f15f 100644
--- a/lib/libsi18n/acclanglist.c
+++ b/lib/libsi18n/acclanglist.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/lib/libsi18n/coreres.c b/lib/libsi18n/coreres.c
index 1e4f7e76..4a05c5f9 100644
--- a/lib/libsi18n/coreres.c
+++ b/lib/libsi18n/coreres.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/lib/libsi18n/coreres.h b/lib/libsi18n/coreres.h
index 9d793f2d..1dbc02c2 100644
--- a/lib/libsi18n/coreres.h
+++ b/lib/libsi18n/coreres.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/lib/libsi18n/getlang.c b/lib/libsi18n/getlang.c
index ac544524..ff9ab5b1 100644
--- a/lib/libsi18n/getlang.c
+++ b/lib/libsi18n/getlang.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/lib/libsi18n/getstrmem.c b/lib/libsi18n/getstrmem.c
index ae27fd5b..f1d52dd5 100644
--- a/lib/libsi18n/getstrmem.c
+++ b/lib/libsi18n/getstrmem.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/lib/libsi18n/getstrmem.h b/lib/libsi18n/getstrmem.h
index f7e2c99d..5cfe9671 100644
--- a/lib/libsi18n/getstrmem.h
+++ b/lib/libsi18n/getstrmem.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/lib/libsi18n/getstrprop.c b/lib/libsi18n/getstrprop.c
index ca99bb28..45870652 100644
--- a/lib/libsi18n/getstrprop.c
+++ b/lib/libsi18n/getstrprop.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/lib/libsi18n/gsslapd.h b/lib/libsi18n/gsslapd.h
index 7631becb..d6a0afbb 100644
--- a/lib/libsi18n/gsslapd.h
+++ b/lib/libsi18n/gsslapd.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/lib/libsi18n/makstrdb.c b/lib/libsi18n/makstrdb.c
index 58308423..4669a79c 100644
--- a/lib/libsi18n/makstrdb.c
+++ b/lib/libsi18n/makstrdb.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/lib/libsi18n/propset.c b/lib/libsi18n/propset.c
index ca75176f..c8589d1e 100644
--- a/lib/libsi18n/propset.c
+++ b/lib/libsi18n/propset.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/lib/libsi18n/propset.h b/lib/libsi18n/propset.h
index bbbbd5fc..97421ec3 100644
--- a/lib/libsi18n/propset.h
+++ b/lib/libsi18n/propset.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/lib/libsi18n/reshash.c b/lib/libsi18n/reshash.c
index 8a331b41..eefb87b6 100644
--- a/lib/libsi18n/reshash.c
+++ b/lib/libsi18n/reshash.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/lib/libsi18n/reshash.h b/lib/libsi18n/reshash.h
index 672ec32f..1edf4163 100644
--- a/lib/libsi18n/reshash.h
+++ b/lib/libsi18n/reshash.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/lib/libsi18n/txtfile.c b/lib/libsi18n/txtfile.c
index 6daf5998..79549a6e 100644
--- a/lib/libsi18n/txtfile.c
+++ b/lib/libsi18n/txtfile.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/lib/libsi18n/txtfile.h b/lib/libsi18n/txtfile.h
index 0afc1c0a..eac4f41f 100644
--- a/lib/libsi18n/txtfile.h
+++ b/lib/libsi18n/txtfile.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.