summaryrefslogtreecommitdiffstats
path: root/ldap/servers
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2005-04-19 22:07:54 +0000
committerNathan Kinder <nkinder@redhat.com>2005-04-19 22:07:54 +0000
commit5a8395d602f17c52bcbd14269317ee301d17be3c (patch)
tree2fd77a1500c03866d19f5c7bb982faf252b18301 /ldap/servers
parent65eeb67366c1a38260db5703e67f6a8b74f3aa00 (diff)
downloadds-5a8395d602f17c52bcbd14269317ee301d17be3c.tar.gz
ds-5a8395d602f17c52bcbd14269317ee301d17be3c.tar.xz
ds-5a8395d602f17c52bcbd14269317ee301d17be3c.zip
Fixed licensing typo
Diffstat (limited to 'ldap/servers')
-rw-r--r--ldap/servers/Makefile4
-rw-r--r--ldap/servers/plugins/Makefile4
-rw-r--r--ldap/servers/plugins/acl/ACL-Notes4
-rw-r--r--ldap/servers/plugins/acl/Makefile4
-rw-r--r--ldap/servers/plugins/acl/acl.c4
-rw-r--r--ldap/servers/plugins/acl/acl.h4
-rw-r--r--ldap/servers/plugins/acl/acl_ext.c4
-rw-r--r--ldap/servers/plugins/acl/aclanom.c4
-rw-r--r--ldap/servers/plugins/acl/acldllmain.c4
-rw-r--r--ldap/servers/plugins/acl/acleffectiverights.c4
-rw-r--r--ldap/servers/plugins/acl/aclgroup.c4
-rw-r--r--ldap/servers/plugins/acl/aclinit.c4
-rw-r--r--ldap/servers/plugins/acl/acllas.c4
-rw-r--r--ldap/servers/plugins/acl/acllist.c4
-rw-r--r--ldap/servers/plugins/acl/aclparse.c4
-rw-r--r--ldap/servers/plugins/acl/aclplugin.c4
-rw-r--r--ldap/servers/plugins/acl/aclproxy.c4
-rw-r--r--ldap/servers/plugins/acl/aclutil.c4
-rw-r--r--ldap/servers/plugins/acl/libacl.def4
-rw-r--r--ldap/servers/plugins/chainingdb/Makefile4
-rw-r--r--ldap/servers/plugins/chainingdb/cb.h4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_abandon.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_acl.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_add.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_bind.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_cleanup.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_close.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_compare.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_config.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_conn_stateless.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_controls.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_debug.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_delete.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_init.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_instance.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_modify.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_modrdn.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_monitor.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_schema.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_search.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_size.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_start.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_temp.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_test.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_unbind.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_utils.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cbdllmain.c4
-rw-r--r--ldap/servers/plugins/chainingdb/libcb.def4
-rw-r--r--ldap/servers/plugins/collation/Makefile4
-rw-r--r--ldap/servers/plugins/collation/collate.c4
-rw-r--r--ldap/servers/plugins/collation/collate.h4
-rw-r--r--ldap/servers/plugins/collation/collation.def4
-rw-r--r--ldap/servers/plugins/collation/config.c4
-rw-r--r--ldap/servers/plugins/collation/config.h4
-rw-r--r--ldap/servers/plugins/collation/debug.c4
-rw-r--r--ldap/servers/plugins/collation/dllmain.c4
-rw-r--r--ldap/servers/plugins/collation/orfilter.c4
-rw-r--r--ldap/servers/plugins/collation/orfilter.h4
-rw-r--r--ldap/servers/plugins/cos/Makefile4
-rw-r--r--ldap/servers/plugins/cos/cos.c4
-rw-r--r--ldap/servers/plugins/cos/cos.def4
-rw-r--r--ldap/servers/plugins/cos/cos_cache.c4
-rw-r--r--ldap/servers/plugins/cos/cos_cache.h4
-rw-r--r--ldap/servers/plugins/cos/dllmain.c4
-rw-r--r--ldap/servers/plugins/distrib/Makefile4
-rw-r--r--ldap/servers/plugins/distrib/Makefile.AIX4
-rw-r--r--ldap/servers/plugins/distrib/Makefile.BSDI4
-rw-r--r--ldap/servers/plugins/distrib/Makefile.HPUX4
-rw-r--r--ldap/servers/plugins/distrib/Makefile.HPUX644
-rw-r--r--ldap/servers/plugins/distrib/Makefile.IRIX4
-rw-r--r--ldap/servers/plugins/distrib/Makefile.Linux4
-rw-r--r--ldap/servers/plugins/distrib/Makefile.OSF14
-rw-r--r--ldap/servers/plugins/distrib/Makefile.ReliantUNIX4
-rw-r--r--ldap/servers/plugins/distrib/Makefile.SOLARIS4
-rw-r--r--ldap/servers/plugins/distrib/Makefile.SOLARIS644
-rw-r--r--ldap/servers/plugins/distrib/Makefile.SOLARISx864
-rw-r--r--ldap/servers/plugins/distrib/Makefile.UnixWare4
-rw-r--r--ldap/servers/plugins/distrib/Makefile.UnixWareUDK4
-rw-r--r--ldap/servers/plugins/distrib/Makefile.WINNT4
-rw-r--r--ldap/servers/plugins/distrib/README4
-rw-r--r--ldap/servers/plugins/distrib/distrib.c4
-rw-r--r--ldap/servers/plugins/distrib/distrib.dsp4
-rw-r--r--ldap/servers/plugins/distrib/dllmain.c4
-rw-r--r--ldap/servers/plugins/distrib/libdistrib.def4
-rw-r--r--ldap/servers/plugins/http/Makefile4
-rw-r--r--ldap/servers/plugins/http/dllmain.c4
-rw-r--r--ldap/servers/plugins/http/http.def4
-rw-r--r--ldap/servers/plugins/http/http_client.c4
-rw-r--r--ldap/servers/plugins/http/http_client.h4
-rw-r--r--ldap/servers/plugins/http/http_impl.c4
-rw-r--r--ldap/servers/plugins/http/http_impl.h4
-rw-r--r--ldap/servers/plugins/pam_passthru/Makefile4
-rw-r--r--ldap/servers/plugins/pam_passthru/README4
-rw-r--r--ldap/servers/plugins/pam_passthru/config.ldif4
-rw-r--r--ldap/servers/plugins/pam_passthru/libpam_passthru.def4
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_passthru.h4
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_ptconfig.c4
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_ptdebug.c4
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_ptdllmain.c4
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_ptimpl.c4
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_ptpreop.c4
-rw-r--r--ldap/servers/plugins/passthru/Makefile4
-rw-r--r--ldap/servers/plugins/passthru/PT-Notes4
-rw-r--r--ldap/servers/plugins/passthru/libpassthru.def4
-rw-r--r--ldap/servers/plugins/passthru/passthru.h4
-rw-r--r--ldap/servers/plugins/passthru/ptbind.c4
-rw-r--r--ldap/servers/plugins/passthru/ptconfig.c4
-rw-r--r--ldap/servers/plugins/passthru/ptconn.c4
-rw-r--r--ldap/servers/plugins/passthru/ptdebug.c4
-rw-r--r--ldap/servers/plugins/passthru/ptdllmain.c4
-rw-r--r--ldap/servers/plugins/passthru/ptpreop.c4
-rw-r--r--ldap/servers/plugins/passthru/ptutil.c4
-rw-r--r--ldap/servers/plugins/presence/Makefile4
-rw-r--r--ldap/servers/plugins/presence/dllmain.c4
-rw-r--r--ldap/servers/plugins/presence/presence.c4
-rw-r--r--ldap/servers/plugins/presence/presence.def4
-rw-r--r--ldap/servers/plugins/presence/presence.ldif4
-rw-r--r--ldap/servers/plugins/pwdstorage/Makefile4
-rw-r--r--ldap/servers/plugins/pwdstorage/clear_pwd.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/crypt_pwd.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/dllmain.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/libpwdstorage.def4
-rw-r--r--ldap/servers/plugins/pwdstorage/md5.h4
-rw-r--r--ldap/servers/plugins/pwdstorage/md5c.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.bu4
-rw-r--r--ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/pwd_init.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/pwdstorage.h4
-rw-r--r--ldap/servers/plugins/pwdstorage/sha_pwd.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/ssha_pwd.c4
-rw-r--r--ldap/servers/plugins/referint/Makefile4
-rw-r--r--ldap/servers/plugins/referint/dllmain.c4
-rw-r--r--ldap/servers/plugins/referint/referint.c4
-rw-r--r--ldap/servers/plugins/referint/referint.def4
-rw-r--r--ldap/servers/plugins/replication/Makefile4
-rw-r--r--ldap/servers/plugins/replication/cl4.h4
-rw-r--r--ldap/servers/plugins/replication/cl4_api.c4
-rw-r--r--ldap/servers/plugins/replication/cl4_api.h4
-rw-r--r--ldap/servers/plugins/replication/cl4_init.c4
-rw-r--r--ldap/servers/plugins/replication/cl5.h4
-rw-r--r--ldap/servers/plugins/replication/cl5_api.c4
-rw-r--r--ldap/servers/plugins/replication/cl5_api.h4
-rw-r--r--ldap/servers/plugins/replication/cl5_clcache.c4
-rw-r--r--ldap/servers/plugins/replication/cl5_clcache.h4
-rw-r--r--ldap/servers/plugins/replication/cl5_config.c4
-rw-r--r--ldap/servers/plugins/replication/cl5_init.c4
-rw-r--r--ldap/servers/plugins/replication/cl5_test.c4
-rw-r--r--ldap/servers/plugins/replication/cl5_test.h4
-rw-r--r--ldap/servers/plugins/replication/csnpl.c4
-rw-r--r--ldap/servers/plugins/replication/csnpl.h4
-rw-r--r--ldap/servers/plugins/replication/dllmain.c4
-rw-r--r--ldap/servers/plugins/replication/legacy_consumer.c4
-rw-r--r--ldap/servers/plugins/replication/llist.c4
-rw-r--r--ldap/servers/plugins/replication/llist.h4
-rw-r--r--ldap/servers/plugins/replication/profile.c4
-rw-r--r--ldap/servers/plugins/replication/repl.h4
-rw-r--r--ldap/servers/plugins/replication/repl5.h4
-rw-r--r--ldap/servers/plugins/replication/repl5_agmt.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_agmtlist.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_backoff.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_connection.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_inc_protocol.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_init.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_mtnode_ext.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_plugins.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_prot_private.h4
-rw-r--r--ldap/servers/plugins/replication/repl5_protocol.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_protocol_util.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_replica.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_replica_config.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_replica_dnhash.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_replica_hash.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_replsupplier.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_ruv.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_ruv.h4
-rw-r--r--ldap/servers/plugins/replication/repl5_schedule.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_tot_protocol.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_total.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_updatedn_list.c4
-rw-r--r--ldap/servers/plugins/replication/repl_add.c4
-rw-r--r--ldap/servers/plugins/replication/repl_bind.c4
-rw-r--r--ldap/servers/plugins/replication/repl_compare.c4
-rw-r--r--ldap/servers/plugins/replication/repl_connext.c4
-rw-r--r--ldap/servers/plugins/replication/repl_controls.c4
-rw-r--r--ldap/servers/plugins/replication/repl_delete.c4
-rw-r--r--ldap/servers/plugins/replication/repl_entry.c4
-rw-r--r--ldap/servers/plugins/replication/repl_ext.c4
-rw-r--r--ldap/servers/plugins/replication/repl_extop.c4
-rw-r--r--ldap/servers/plugins/replication/repl_globals.c4
-rw-r--r--ldap/servers/plugins/replication/repl_helper.c4
-rw-r--r--ldap/servers/plugins/replication/repl_helper.h4
-rw-r--r--ldap/servers/plugins/replication/repl_init.c4
-rw-r--r--ldap/servers/plugins/replication/repl_modify.c4
-rw-r--r--ldap/servers/plugins/replication/repl_modrdn.c4
-rw-r--r--ldap/servers/plugins/replication/repl_monitor.c4
-rw-r--r--ldap/servers/plugins/replication/repl_objset.c4
-rw-r--r--ldap/servers/plugins/replication/repl_objset.h4
-rw-r--r--ldap/servers/plugins/replication/repl_opext.c4
-rw-r--r--ldap/servers/plugins/replication/repl_ops.c4
-rw-r--r--ldap/servers/plugins/replication/repl_rootdse.c4
-rw-r--r--ldap/servers/plugins/replication/repl_search.c4
-rw-r--r--ldap/servers/plugins/replication/repl_shared.h4
-rw-r--r--ldap/servers/plugins/replication/replication.def4
-rw-r--r--ldap/servers/plugins/replication/replutil.c4
-rw-r--r--ldap/servers/plugins/replication/tests/dnp_sim.c4
-rw-r--r--ldap/servers/plugins/replication/tests/dnp_sim2.c4
-rw-r--r--ldap/servers/plugins/replication/tests/dnp_sim3.c4
-rwxr-xr-xldap/servers/plugins/replication/tests/makesim4
-rw-r--r--ldap/servers/plugins/replication/urp.c4
-rw-r--r--ldap/servers/plugins/replication/urp.h4
-rw-r--r--ldap/servers/plugins/replication/urp_glue.c4
-rw-r--r--ldap/servers/plugins/replication/urp_tombstone.c4
-rw-r--r--ldap/servers/plugins/replication/windows_connection.c4
-rw-r--r--ldap/servers/plugins/replication/windows_inc_protocol.c4
-rw-r--r--ldap/servers/plugins/replication/windows_private.c4
-rw-r--r--ldap/servers/plugins/replication/windows_prot_private.h4
-rw-r--r--ldap/servers/plugins/replication/windows_protocol_util.c4
-rw-r--r--ldap/servers/plugins/replication/windows_tot_protocol.c4
-rw-r--r--ldap/servers/plugins/replication/windowsrepl.h4
-rw-r--r--ldap/servers/plugins/retrocl/Makefile4
-rw-r--r--ldap/servers/plugins/retrocl/dllmain.c4
-rw-r--r--ldap/servers/plugins/retrocl/linktest.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl.def4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl.h4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl.txt4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl_cn.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl_create.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl_po.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl_rootdse.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl_trim.c4
-rw-r--r--ldap/servers/plugins/rever/Makefile4
-rw-r--r--ldap/servers/plugins/rever/des.c4
-rw-r--r--ldap/servers/plugins/rever/dllmain.c4
-rw-r--r--ldap/servers/plugins/rever/libdes.def4
-rw-r--r--ldap/servers/plugins/rever/rever.c4
-rw-r--r--ldap/servers/plugins/rever/rever.h4
-rw-r--r--ldap/servers/plugins/roles/Makefile4
-rw-r--r--ldap/servers/plugins/roles/dllmain.c4
-rw-r--r--ldap/servers/plugins/roles/roles.def4
-rw-r--r--ldap/servers/plugins/roles/roles_cache.c4
-rw-r--r--ldap/servers/plugins/roles/roles_cache.h4
-rw-r--r--ldap/servers/plugins/roles/roles_plugin.c4
-rw-r--r--ldap/servers/plugins/shared/Makefile4
-rw-r--r--ldap/servers/plugins/shared/plugin-utils.h4
-rw-r--r--ldap/servers/plugins/shared/utils.c4
-rw-r--r--ldap/servers/plugins/statechange/Makefile4
-rw-r--r--ldap/servers/plugins/statechange/dllmain.c4
-rw-r--r--ldap/servers/plugins/statechange/statechange.c4
-rw-r--r--ldap/servers/plugins/statechange/statechange.def4
-rw-r--r--ldap/servers/plugins/syntaxes/Makefile4
-rw-r--r--ldap/servers/plugins/syntaxes/bin.c4
-rw-r--r--ldap/servers/plugins/syntaxes/ces.c4
-rw-r--r--ldap/servers/plugins/syntaxes/cis.c4
-rw-r--r--ldap/servers/plugins/syntaxes/debug.c4
-rw-r--r--ldap/servers/plugins/syntaxes/dllmain.c4
-rw-r--r--ldap/servers/plugins/syntaxes/dn.c4
-rw-r--r--ldap/servers/plugins/syntaxes/int.c4
-rw-r--r--ldap/servers/plugins/syntaxes/libsyntax.def4
-rw-r--r--ldap/servers/plugins/syntaxes/phonetic.c4
-rw-r--r--ldap/servers/plugins/syntaxes/sicis.c4
-rw-r--r--ldap/servers/plugins/syntaxes/string.c4
-rw-r--r--ldap/servers/plugins/syntaxes/syntax.h4
-rw-r--r--ldap/servers/plugins/syntaxes/tel.c4
-rw-r--r--ldap/servers/plugins/syntaxes/value.c4
-rw-r--r--ldap/servers/plugins/uiduniq/7bit.c4
-rw-r--r--ldap/servers/plugins/uiduniq/Makefile4
-rw-r--r--ldap/servers/plugins/uiduniq/UID-Notes4
-rw-r--r--ldap/servers/plugins/uiduniq/libuiduniq.def4
-rw-r--r--ldap/servers/plugins/uiduniq/uid.c4
-rw-r--r--ldap/servers/plugins/vattrsp_template/Makefile4
-rw-r--r--ldap/servers/plugins/vattrsp_template/dllmain.c4
-rw-r--r--ldap/servers/plugins/vattrsp_template/vattrsp.c4
-rw-r--r--ldap/servers/plugins/vattrsp_template/vattrsp.def4
-rw-r--r--ldap/servers/plugins/views/Makefile4
-rw-r--r--ldap/servers/plugins/views/dllmain.c4
-rw-r--r--ldap/servers/plugins/views/views.c4
-rw-r--r--ldap/servers/plugins/views/views.def4
-rw-r--r--ldap/servers/slapd/Makefile4
-rw-r--r--ldap/servers/slapd/abandon.c4
-rw-r--r--ldap/servers/slapd/add.c4
-rw-r--r--ldap/servers/slapd/agtmmap.c4
-rw-r--r--ldap/servers/slapd/agtmmap.h4
-rw-r--r--ldap/servers/slapd/apibroker.c4
-rw-r--r--ldap/servers/slapd/attr.c4
-rw-r--r--ldap/servers/slapd/attrlist.c4
-rw-r--r--ldap/servers/slapd/attrsyntax.c4
-rw-r--r--ldap/servers/slapd/auditlog.c4
-rw-r--r--ldap/servers/slapd/auth.c4
-rw-r--r--ldap/servers/slapd/auth.h4
-rw-r--r--ldap/servers/slapd/ava.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/Makefile4
-rw-r--r--ldap/servers/slapd/back-ldbm/ancestorid.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/archive.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/attrcrypt.h4
-rw-r--r--ldap/servers/slapd/back-ldbm/back-ldbm.h4
-rw-r--r--ldap/servers/slapd/back-ldbm/backentry.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/cache.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/cleanup.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/close.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/dbhelp.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/dblayer.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/dblayer.h4
-rw-r--r--ldap/servers/slapd/back-ldbm/dbsize.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/dbtest.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/dbversion.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/dllmain.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/dn2entry.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/entrystore.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/filterindex.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/findentry.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/haschildren.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/id2entry.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/idl.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/idl_common.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/idl_new.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/idl_shim.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/idlapi.h4
-rw-r--r--ldap/servers/slapd/back-ldbm/import-merge.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/import-threads.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/import.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/import.h4
-rw-r--r--ldap/servers/slapd/back-ldbm/index.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/init.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/instance.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_abandon.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_add.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_attr.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_bind.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_compare.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_config.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_config.h4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_delete.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_index_config.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_instance_config.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_modify.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_modrdn.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_search.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_unbind.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/ldif2ldbm.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/libback-ldbm.def4
-rw-r--r--ldap/servers/slapd/back-ldbm/matchrule.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/misc.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/monitor.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/nextid.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/parents.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/perfctrs.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/perfctrs.h4
-rw-r--r--ldap/servers/slapd/back-ldbm/proto-back-ldbm.h4
-rw-r--r--ldap/servers/slapd/back-ldbm/rmdb.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/seq.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/sort.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/start.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile4
-rw-r--r--ldap/servers/slapd/back-ldbm/tools/index_dump/index_dump.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/uniqueid2entry.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/upgrade.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/vlv.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/vlv_key.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/vlv_key.h4
-rw-r--r--ldap/servers/slapd/back-ldbm/vlv_srch.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/vlv_srch.h4
-rw-r--r--ldap/servers/slapd/back-ldif/Makefile4
-rw-r--r--ldap/servers/slapd/back-ldif/add.c4
-rw-r--r--ldap/servers/slapd/back-ldif/back-ldif.h4
-rw-r--r--ldap/servers/slapd/back-ldif/bind.c4
-rw-r--r--ldap/servers/slapd/back-ldif/close.c4
-rw-r--r--ldap/servers/slapd/back-ldif/compare.c4
-rw-r--r--ldap/servers/slapd/back-ldif/config.c4
-rw-r--r--ldap/servers/slapd/back-ldif/delete.c4
-rw-r--r--ldap/servers/slapd/back-ldif/dllmain.c4
-rw-r--r--ldap/servers/slapd/back-ldif/init.c4
-rw-r--r--ldap/servers/slapd/back-ldif/libback-ldif.def4
-rw-r--r--ldap/servers/slapd/back-ldif/modify.c4
-rw-r--r--ldap/servers/slapd/back-ldif/modrdn.c4
-rw-r--r--ldap/servers/slapd/back-ldif/monitor.c4
-rw-r--r--ldap/servers/slapd/back-ldif/search.c4
-rw-r--r--ldap/servers/slapd/back-ldif/start.c4
-rw-r--r--ldap/servers/slapd/back-ldif/unbind.c4
-rw-r--r--ldap/servers/slapd/backend.c4
-rw-r--r--ldap/servers/slapd/backend_manager.c4
-rw-r--r--ldap/servers/slapd/bind.c4
-rw-r--r--ldap/servers/slapd/bitset.c4
-rw-r--r--ldap/servers/slapd/bulk_import.c4
-rw-r--r--ldap/servers/slapd/ch_malloc.c4
-rw-r--r--ldap/servers/slapd/charray.c4
-rw-r--r--ldap/servers/slapd/compare.c4
-rw-r--r--ldap/servers/slapd/computed.c4
-rw-r--r--ldap/servers/slapd/config.c4
-rw-r--r--ldap/servers/slapd/configdse.c4
-rw-r--r--ldap/servers/slapd/connection.c4
-rw-r--r--ldap/servers/slapd/conntable.c4
-rw-r--r--ldap/servers/slapd/control.c4
-rw-r--r--ldap/servers/slapd/counters.c4
-rw-r--r--ldap/servers/slapd/csn.c4
-rw-r--r--ldap/servers/slapd/csngen.c4
-rw-r--r--ldap/servers/slapd/csngen.h4
-rw-r--r--ldap/servers/slapd/csnset.c4
-rw-r--r--ldap/servers/slapd/daemon.c4
-rw-r--r--ldap/servers/slapd/defbackend.c4
-rw-r--r--ldap/servers/slapd/delete.c4
-rw-r--r--ldap/servers/slapd/detach.c4
-rw-r--r--ldap/servers/slapd/disconnect_error_strings.h4
-rw-r--r--ldap/servers/slapd/disconnect_errors.h4
-rw-r--r--ldap/servers/slapd/dl.c4
-rw-r--r--ldap/servers/slapd/dn.c4
-rw-r--r--ldap/servers/slapd/dse.c4
-rw-r--r--ldap/servers/slapd/dynalib.c4
-rw-r--r--ldap/servers/slapd/entry.c4
-rw-r--r--ldap/servers/slapd/entrywsi.c4
-rw-r--r--ldap/servers/slapd/errormap.c4
-rw-r--r--ldap/servers/slapd/eventq.c4
-rw-r--r--ldap/servers/slapd/extendop.c4
-rw-r--r--ldap/servers/slapd/factory.c4
-rw-r--r--ldap/servers/slapd/fe.h4
-rw-r--r--ldap/servers/slapd/fedse.c4
-rw-r--r--ldap/servers/slapd/fileio.c4
-rw-r--r--ldap/servers/slapd/filter.c4
-rw-r--r--ldap/servers/slapd/filter.h4
-rw-r--r--ldap/servers/slapd/filtercmp.c4
-rw-r--r--ldap/servers/slapd/filterentry.c4
-rw-r--r--ldap/servers/slapd/generation.c4
-rw-r--r--ldap/servers/slapd/getfilelist.c4
-rw-r--r--ldap/servers/slapd/getopt_ext.c4
-rw-r--r--ldap/servers/slapd/getopt_ext.h4
-rw-r--r--ldap/servers/slapd/globals.c4
-rw-r--r--ldap/servers/slapd/house.c4
-rw-r--r--ldap/servers/slapd/http.h4
-rw-r--r--ldap/servers/slapd/index_subsys.h4
-rw-r--r--ldap/servers/slapd/index_subsystem.c4
-rw-r--r--ldap/servers/slapd/init.c4
-rw-r--r--ldap/servers/slapd/intrinsics.h4
-rw-r--r--ldap/servers/slapd/ldbmlinktest.c4
-rw-r--r--ldap/servers/slapd/lenstr.c4
-rw-r--r--ldap/servers/slapd/libglobs.c4
-rw-r--r--ldap/servers/slapd/libmakefile4
-rw-r--r--ldap/servers/slapd/libsh_stub/Makefile4
-rw-r--r--ldap/servers/slapd/libsh_stub/libsh_stub.c4
-rw-r--r--ldap/servers/slapd/libslapd.def4
-rw-r--r--ldap/servers/slapd/listConfigAttrs.pl4
-rw-r--r--ldap/servers/slapd/lite_entries.c4
-rw-r--r--ldap/servers/slapd/localhost.c4
-rw-r--r--ldap/servers/slapd/lock.c4
-rw-r--r--ldap/servers/slapd/log.c4
-rw-r--r--ldap/servers/slapd/log.h4
-rw-r--r--ldap/servers/slapd/main.c4
-rw-r--r--ldap/servers/slapd/mapping_tree.c4
-rw-r--r--ldap/servers/slapd/match.c4
-rwxr-xr-xldap/servers/slapd/mkDBErrStrs.pl4
-rw-r--r--ldap/servers/slapd/modify.c4
-rw-r--r--ldap/servers/slapd/modrdn.c4
-rw-r--r--ldap/servers/slapd/modutil.c4
-rw-r--r--ldap/servers/slapd/monitor.c4
-rw-r--r--ldap/servers/slapd/ntmsgdll/Makefile4
-rw-r--r--ldap/servers/slapd/ntmsgdll/ntslapdmessages.c4
-rw-r--r--ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc4
-rw-r--r--ldap/servers/slapd/ntperfdll/Makefile4
-rw-r--r--ldap/servers/slapd/ntperfdll/exports.def4
-rw-r--r--ldap/servers/slapd/ntperfdll/nsldapctr.cpp4
-rw-r--r--ldap/servers/slapd/ntperfdll/nsldapctrdef.h4
-rw-r--r--ldap/servers/slapd/ntperfdll/nsldapctrmc.h4
-rw-r--r--ldap/servers/slapd/ntperfdll/nsldapctrmc.mc4
-rw-r--r--ldap/servers/slapd/ntperfdll/nsldapctrmsg.h4
-rw-r--r--ldap/servers/slapd/ntperfdll/nsldapctrs.h4
-rw-r--r--ldap/servers/slapd/ntperfdll/nsldapctrs.ini4
-rw-r--r--ldap/servers/slapd/ntperfdll/nsldapctrutil.cpp4
-rw-r--r--ldap/servers/slapd/ntperfdll/nsldapctrutil.h4
-rw-r--r--ldap/servers/slapd/ntperfdll/nsldapreg.ini4
-rw-r--r--ldap/servers/slapd/ntuserpin.c4
-rw-r--r--ldap/servers/slapd/ntwdog/Makefile4
-rw-r--r--ldap/servers/slapd/ntwdog/cron_conf.c4
-rw-r--r--ldap/servers/slapd/ntwdog/cron_conf.h6
-rw-r--r--ldap/servers/slapd/ntwdog/ntcron.c4
-rw-r--r--ldap/servers/slapd/ntwdog/ntwatchdog.c4
-rw-r--r--ldap/servers/slapd/object.c4
-rw-r--r--ldap/servers/slapd/objset.c4
-rw-r--r--ldap/servers/slapd/operation.c4
-rw-r--r--ldap/servers/slapd/opshared.c4
-rw-r--r--ldap/servers/slapd/passwd_extop.c4
-rw-r--r--ldap/servers/slapd/pblock.c4
-rw-r--r--ldap/servers/slapd/plugin.c4
-rw-r--r--ldap/servers/slapd/plugin_acl.c4
-rw-r--r--ldap/servers/slapd/plugin_internal_op.c4
-rw-r--r--ldap/servers/slapd/plugin_mr.c4
-rw-r--r--ldap/servers/slapd/plugin_role.c4
-rw-r--r--ldap/servers/slapd/plugin_syntax.c4
-rw-r--r--ldap/servers/slapd/poll_using_select.c4
-rw-r--r--ldap/servers/slapd/poll_using_select.h4
-rw-r--r--ldap/servers/slapd/prerrstrs.h4
-rw-r--r--ldap/servers/slapd/protect_db.c4
-rw-r--r--ldap/servers/slapd/protect_db.h4
-rw-r--r--ldap/servers/slapd/proto-slap.h4
-rw-r--r--ldap/servers/slapd/psearch.c4
-rw-r--r--ldap/servers/slapd/pw.c4
-rw-r--r--ldap/servers/slapd/pw.h4
-rw-r--r--ldap/servers/slapd/pw_mgmt.c4
-rw-r--r--ldap/servers/slapd/pw_retry.c4
-rw-r--r--ldap/servers/slapd/rdn.c4
-rw-r--r--ldap/servers/slapd/referral.c4
-rw-r--r--ldap/servers/slapd/regex.c7
-rw-r--r--ldap/servers/slapd/resourcelimit.c4
-rw-r--r--ldap/servers/slapd/result.c4
-rw-r--r--ldap/servers/slapd/rootdse.c4
-rw-r--r--ldap/servers/slapd/rwlock.c4
-rw-r--r--ldap/servers/slapd/rwlock.h4
-rw-r--r--ldap/servers/slapd/sasl_io.c4
-rw-r--r--ldap/servers/slapd/sasl_map.c4
-rw-r--r--ldap/servers/slapd/saslbind.c4
-rw-r--r--ldap/servers/slapd/schema.c4
-rw-r--r--ldap/servers/slapd/schemaparse.c4
-rw-r--r--ldap/servers/slapd/search.c4
-rw-r--r--ldap/servers/slapd/secerrstrs.h4
-rw-r--r--ldap/servers/slapd/security_wrappers.c4
-rw-r--r--ldap/servers/slapd/slap.h4
-rw-r--r--ldap/servers/slapd/slapd.lite.key4
-rw-r--r--ldap/servers/slapd/slapd.normal.key4
-rw-r--r--ldap/servers/slapd/slapd_plhash.c4
-rw-r--r--ldap/servers/slapd/slapi-plugin-compat4.h4
-rw-r--r--ldap/servers/slapd/slapi-plugin.h4
-rw-r--r--ldap/servers/slapd/slapi-private.h4
-rw-r--r--ldap/servers/slapd/slapi2nspr.c4
-rw-r--r--ldap/servers/slapd/snmp_collator.c4
-rw-r--r--ldap/servers/slapd/snmp_collator.h4
-rw-r--r--ldap/servers/slapd/snoop.c4
-rw-r--r--ldap/servers/slapd/ssl.c4
-rw-r--r--ldap/servers/slapd/sslerrstrs.h4
-rw-r--r--ldap/servers/slapd/start_tls_extop.c4
-rw-r--r--ldap/servers/slapd/statechange.h4
-rw-r--r--ldap/servers/slapd/str2filter.c4
-rw-r--r--ldap/servers/slapd/strdup.c4
-rw-r--r--ldap/servers/slapd/stubrepl.c4
-rw-r--r--ldap/servers/slapd/stubs.c4
-rw-r--r--ldap/servers/slapd/subentry.c4
-rw-r--r--ldap/servers/slapd/task.c4
-rw-r--r--ldap/servers/slapd/tempnam.c4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.AIX4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.BSDI4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.HPUX4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.HPUX644
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.IRIX4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.Linux4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.OSF14
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.ReliantUNIX4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.SOLARIS4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.SOLARIS644
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.SOLARISx864
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.UnixWare4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.UnixWareUDK4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.WINNT4
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.server4
-rw-r--r--ldap/servers/slapd/test-plugins/README4
-rw-r--r--ldap/servers/slapd/test-plugins/clients/README4
-rw-r--r--ldap/servers/slapd/test-plugins/clients/ReqExtOp.java4
-rw-r--r--ldap/servers/slapd/test-plugins/clients/reqextop.c4
-rw-r--r--ldap/servers/slapd/test-plugins/dllmain.c4
-rwxr-xr-xldap/servers/slapd/test-plugins/installDse.pl4
-rw-r--r--ldap/servers/slapd/test-plugins/nicknames4
-rw-r--r--ldap/servers/slapd/test-plugins/testbind.c4
-rw-r--r--ldap/servers/slapd/test-plugins/testdatainterop.c4
-rw-r--r--ldap/servers/slapd/test-plugins/testdbinterop.c4
-rw-r--r--ldap/servers/slapd/test-plugins/testdbinterop.h4
-rw-r--r--ldap/servers/slapd/test-plugins/testentry.c4
-rw-r--r--ldap/servers/slapd/test-plugins/testextendedop.c4
-rw-r--r--ldap/servers/slapd/test-plugins/testgetip.c4
-rw-r--r--ldap/servers/slapd/test-plugins/testplugin.def4
-rw-r--r--ldap/servers/slapd/test-plugins/testplugin.dsp4
-rw-r--r--ldap/servers/slapd/test-plugins/testplugin.mak4
-rw-r--r--ldap/servers/slapd/test-plugins/testpostop.c4
-rw-r--r--ldap/servers/slapd/test-plugins/testpreop.c4
-rw-r--r--ldap/servers/slapd/test-plugins/testsaslbind.c4
-rw-r--r--ldap/servers/slapd/time.c4
-rw-r--r--ldap/servers/slapd/tools/Makefile4
-rw-r--r--ldap/servers/slapd/tools/dbscan.c4
-rw-r--r--ldap/servers/slapd/tools/eggencode.c4
-rw-r--r--ldap/servers/slapd/tools/keyupg.c4
-rw-r--r--ldap/servers/slapd/tools/ldif.c4
-rw-r--r--ldap/servers/slapd/tools/migratecred.c4
-rw-r--r--ldap/servers/slapd/tools/mkdep.c4
-rw-r--r--ldap/servers/slapd/tools/mmldif.c4
-rw-r--r--ldap/servers/slapd/tools/pwenc.c4
-rw-r--r--ldap/servers/slapd/unbind.c4
-rw-r--r--ldap/servers/slapd/uniqueid.c4
-rw-r--r--ldap/servers/slapd/uniqueidgen.c4
-rw-r--r--ldap/servers/slapd/utf8compare.c4
-rw-r--r--ldap/servers/slapd/util.c4
-rw-r--r--ldap/servers/slapd/uuid.c4
-rw-r--r--ldap/servers/slapd/uuid.h4
-rw-r--r--ldap/servers/slapd/value.c4
-rw-r--r--ldap/servers/slapd/valueset.c4
-rw-r--r--ldap/servers/slapd/vattr.c4
-rw-r--r--ldap/servers/slapd/vattr_spi.h4
-rw-r--r--ldap/servers/slapd/views.h4
-rw-r--r--ldap/servers/snmp/Makefile4
-rw-r--r--ldap/servers/snmp/ldap-agent.c4
-rw-r--r--ldap/servers/snmp/ldap-agent.h4
-rw-r--r--ldap/servers/snmp/main.c4
-rw-r--r--ldap/servers/snmp/netscape-ldap.mib4
-rw-r--r--ldap/servers/snmp/ntagt/Makefile4
-rw-r--r--ldap/servers/snmp/ntagt/msrvdefs.mak4
-rw-r--r--ldap/servers/snmp/ntagt/nslagtcom_nt.h4
-rw-r--r--ldap/servers/snmp/ntagt/nsldapagt_nt.c4
-rw-r--r--ldap/servers/snmp/ntagt/nsldapagt_nt.def4
-rw-r--r--ldap/servers/snmp/ntagt/nsldapagt_nt.h4
-rw-r--r--ldap/servers/snmp/ntagt/nsldapmib_nt.c4
-rw-r--r--ldap/servers/snmp/ntagt/nsldapmib_nt.h4
-rw-r--r--ldap/servers/snmp/redhat-directory.mib4
609 files changed, 1831 insertions, 610 deletions
diff --git a/ldap/servers/Makefile b/ldap/servers/Makefile
index 21890cf8..fbd86f92 100644
--- a/ldap/servers/Makefile
+++ b/ldap/servers/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/Makefile b/ldap/servers/plugins/Makefile
index 15354321..48e3c925 100644
--- a/ldap/servers/plugins/Makefile
+++ b/ldap/servers/plugins/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/ACL-Notes b/ldap/servers/plugins/acl/ACL-Notes
index 1dd362dd..585bb543 100644
--- a/ldap/servers/plugins/acl/ACL-Notes
+++ b/ldap/servers/plugins/acl/ACL-Notes
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/Makefile b/ldap/servers/plugins/acl/Makefile
index 944c7ead..087019b2 100644
--- a/ldap/servers/plugins/acl/Makefile
+++ b/ldap/servers/plugins/acl/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/acl.c b/ldap/servers/plugins/acl/acl.c
index e9a15bde..77371737 100644
--- a/ldap/servers/plugins/acl/acl.c
+++ b/ldap/servers/plugins/acl/acl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/acl.h b/ldap/servers/plugins/acl/acl.h
index 2a8eea89..0c6990bc 100644
--- a/ldap/servers/plugins/acl/acl.h
+++ b/ldap/servers/plugins/acl/acl.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/acl_ext.c b/ldap/servers/plugins/acl/acl_ext.c
index 015e3833..06c269b2 100644
--- a/ldap/servers/plugins/acl/acl_ext.c
+++ b/ldap/servers/plugins/acl/acl_ext.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/aclanom.c b/ldap/servers/plugins/acl/aclanom.c
index de0b02b1..0e4c5306 100644
--- a/ldap/servers/plugins/acl/aclanom.c
+++ b/ldap/servers/plugins/acl/aclanom.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/acldllmain.c b/ldap/servers/plugins/acl/acldllmain.c
index 9aabe26a..e1e3d6b6 100644
--- a/ldap/servers/plugins/acl/acldllmain.c
+++ b/ldap/servers/plugins/acl/acldllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/acleffectiverights.c b/ldap/servers/plugins/acl/acleffectiverights.c
index f7fa699c..7ef6d3fc 100644
--- a/ldap/servers/plugins/acl/acleffectiverights.c
+++ b/ldap/servers/plugins/acl/acleffectiverights.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/acl/aclgroup.c b/ldap/servers/plugins/acl/aclgroup.c
index a1c03025..33baa59b 100644
--- a/ldap/servers/plugins/acl/aclgroup.c
+++ b/ldap/servers/plugins/acl/aclgroup.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/aclinit.c b/ldap/servers/plugins/acl/aclinit.c
index 769c20da..06fdf916 100644
--- a/ldap/servers/plugins/acl/aclinit.c
+++ b/ldap/servers/plugins/acl/aclinit.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/acllas.c b/ldap/servers/plugins/acl/acllas.c
index a60286cf..3cf99fd6 100644
--- a/ldap/servers/plugins/acl/acllas.c
+++ b/ldap/servers/plugins/acl/acllas.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/acllist.c b/ldap/servers/plugins/acl/acllist.c
index 51a524e0..8da71a40 100644
--- a/ldap/servers/plugins/acl/acllist.c
+++ b/ldap/servers/plugins/acl/acllist.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/aclparse.c b/ldap/servers/plugins/acl/aclparse.c
index 33d2c388..baf871a6 100644
--- a/ldap/servers/plugins/acl/aclparse.c
+++ b/ldap/servers/plugins/acl/aclparse.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/aclplugin.c b/ldap/servers/plugins/acl/aclplugin.c
index 0b88ca63..84e3e42e 100644
--- a/ldap/servers/plugins/acl/aclplugin.c
+++ b/ldap/servers/plugins/acl/aclplugin.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/aclproxy.c b/ldap/servers/plugins/acl/aclproxy.c
index 5540d06b..b23091ef 100644
--- a/ldap/servers/plugins/acl/aclproxy.c
+++ b/ldap/servers/plugins/acl/aclproxy.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/aclutil.c b/ldap/servers/plugins/acl/aclutil.c
index 71ab2fe2..619f02d2 100644
--- a/ldap/servers/plugins/acl/aclutil.c
+++ b/ldap/servers/plugins/acl/aclutil.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/acl/libacl.def b/ldap/servers/plugins/acl/libacl.def
index a90dc177..10d36a76 100644
--- a/ldap/servers/plugins/acl/libacl.def
+++ b/ldap/servers/plugins/acl/libacl.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/Makefile b/ldap/servers/plugins/chainingdb/Makefile
index 46439e92..da04d422 100644
--- a/ldap/servers/plugins/chainingdb/Makefile
+++ b/ldap/servers/plugins/chainingdb/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb.h b/ldap/servers/plugins/chainingdb/cb.h
index da23a4da..129fe87f 100644
--- a/ldap/servers/plugins/chainingdb/cb.h
+++ b/ldap/servers/plugins/chainingdb/cb.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_abandon.c b/ldap/servers/plugins/chainingdb/cb_abandon.c
index 1e6bd58c..c1a85d1f 100644
--- a/ldap/servers/plugins/chainingdb/cb_abandon.c
+++ b/ldap/servers/plugins/chainingdb/cb_abandon.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_acl.c b/ldap/servers/plugins/chainingdb/cb_acl.c
index da4b5ac4..35db2cae 100644
--- a/ldap/servers/plugins/chainingdb/cb_acl.c
+++ b/ldap/servers/plugins/chainingdb/cb_acl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_add.c b/ldap/servers/plugins/chainingdb/cb_add.c
index 89f91e14..79e776bc 100644
--- a/ldap/servers/plugins/chainingdb/cb_add.c
+++ b/ldap/servers/plugins/chainingdb/cb_add.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_bind.c b/ldap/servers/plugins/chainingdb/cb_bind.c
index dee83b3b..329a132a 100644
--- a/ldap/servers/plugins/chainingdb/cb_bind.c
+++ b/ldap/servers/plugins/chainingdb/cb_bind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_cleanup.c b/ldap/servers/plugins/chainingdb/cb_cleanup.c
index 3039e7ce..ced5a0c2 100644
--- a/ldap/servers/plugins/chainingdb/cb_cleanup.c
+++ b/ldap/servers/plugins/chainingdb/cb_cleanup.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_close.c b/ldap/servers/plugins/chainingdb/cb_close.c
index 77e2fee3..9a61bd76 100644
--- a/ldap/servers/plugins/chainingdb/cb_close.c
+++ b/ldap/servers/plugins/chainingdb/cb_close.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_compare.c b/ldap/servers/plugins/chainingdb/cb_compare.c
index b20efa79..5920cc45 100644
--- a/ldap/servers/plugins/chainingdb/cb_compare.c
+++ b/ldap/servers/plugins/chainingdb/cb_compare.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_config.c b/ldap/servers/plugins/chainingdb/cb_config.c
index d2ed9be8..f7f6d684 100644
--- a/ldap/servers/plugins/chainingdb/cb_config.c
+++ b/ldap/servers/plugins/chainingdb/cb_config.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_conn_stateless.c b/ldap/servers/plugins/chainingdb/cb_conn_stateless.c
index b6d9c76a..314c061a 100644
--- a/ldap/servers/plugins/chainingdb/cb_conn_stateless.c
+++ b/ldap/servers/plugins/chainingdb/cb_conn_stateless.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_controls.c b/ldap/servers/plugins/chainingdb/cb_controls.c
index 99e36617..41cf5ed2 100644
--- a/ldap/servers/plugins/chainingdb/cb_controls.c
+++ b/ldap/servers/plugins/chainingdb/cb_controls.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_debug.c b/ldap/servers/plugins/chainingdb/cb_debug.c
index 78129bbf..d6a7c409 100644
--- a/ldap/servers/plugins/chainingdb/cb_debug.c
+++ b/ldap/servers/plugins/chainingdb/cb_debug.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_delete.c b/ldap/servers/plugins/chainingdb/cb_delete.c
index 90e5fac3..bfec7c31 100644
--- a/ldap/servers/plugins/chainingdb/cb_delete.c
+++ b/ldap/servers/plugins/chainingdb/cb_delete.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_init.c b/ldap/servers/plugins/chainingdb/cb_init.c
index cd0efe36..4017320e 100644
--- a/ldap/servers/plugins/chainingdb/cb_init.c
+++ b/ldap/servers/plugins/chainingdb/cb_init.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_instance.c b/ldap/servers/plugins/chainingdb/cb_instance.c
index a70f293d..7c315b00 100644
--- a/ldap/servers/plugins/chainingdb/cb_instance.c
+++ b/ldap/servers/plugins/chainingdb/cb_instance.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_modify.c b/ldap/servers/plugins/chainingdb/cb_modify.c
index dd7058af..c0f3b0a9 100644
--- a/ldap/servers/plugins/chainingdb/cb_modify.c
+++ b/ldap/servers/plugins/chainingdb/cb_modify.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_modrdn.c b/ldap/servers/plugins/chainingdb/cb_modrdn.c
index 29006b4d..348d0722 100644
--- a/ldap/servers/plugins/chainingdb/cb_modrdn.c
+++ b/ldap/servers/plugins/chainingdb/cb_modrdn.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_monitor.c b/ldap/servers/plugins/chainingdb/cb_monitor.c
index 2518343b..573d1407 100644
--- a/ldap/servers/plugins/chainingdb/cb_monitor.c
+++ b/ldap/servers/plugins/chainingdb/cb_monitor.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_schema.c b/ldap/servers/plugins/chainingdb/cb_schema.c
index 7524c449..319b319e 100644
--- a/ldap/servers/plugins/chainingdb/cb_schema.c
+++ b/ldap/servers/plugins/chainingdb/cb_schema.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_search.c b/ldap/servers/plugins/chainingdb/cb_search.c
index 5038b346..0d898a39 100644
--- a/ldap/servers/plugins/chainingdb/cb_search.c
+++ b/ldap/servers/plugins/chainingdb/cb_search.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_size.c b/ldap/servers/plugins/chainingdb/cb_size.c
index f140babf..965cbfea 100644
--- a/ldap/servers/plugins/chainingdb/cb_size.c
+++ b/ldap/servers/plugins/chainingdb/cb_size.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_start.c b/ldap/servers/plugins/chainingdb/cb_start.c
index 2ef56aeb..980f0c13 100644
--- a/ldap/servers/plugins/chainingdb/cb_start.c
+++ b/ldap/servers/plugins/chainingdb/cb_start.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_temp.c b/ldap/servers/plugins/chainingdb/cb_temp.c
index 1ed4fad8..6007e6f3 100644
--- a/ldap/servers/plugins/chainingdb/cb_temp.c
+++ b/ldap/servers/plugins/chainingdb/cb_temp.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_test.c b/ldap/servers/plugins/chainingdb/cb_test.c
index 3c74d5bd..13edd55a 100644
--- a/ldap/servers/plugins/chainingdb/cb_test.c
+++ b/ldap/servers/plugins/chainingdb/cb_test.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_unbind.c b/ldap/servers/plugins/chainingdb/cb_unbind.c
index 4a4322c7..5c14c86e 100644
--- a/ldap/servers/plugins/chainingdb/cb_unbind.c
+++ b/ldap/servers/plugins/chainingdb/cb_unbind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cb_utils.c b/ldap/servers/plugins/chainingdb/cb_utils.c
index 9c794647..056622d5 100644
--- a/ldap/servers/plugins/chainingdb/cb_utils.c
+++ b/ldap/servers/plugins/chainingdb/cb_utils.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/cbdllmain.c b/ldap/servers/plugins/chainingdb/cbdllmain.c
index 06e9f822..d38e7175 100644
--- a/ldap/servers/plugins/chainingdb/cbdllmain.c
+++ b/ldap/servers/plugins/chainingdb/cbdllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/chainingdb/libcb.def b/ldap/servers/plugins/chainingdb/libcb.def
index 5126d532..b09ae61b 100644
--- a/ldap/servers/plugins/chainingdb/libcb.def
+++ b/ldap/servers/plugins/chainingdb/libcb.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/collation/Makefile b/ldap/servers/plugins/collation/Makefile
index 1c876276..cb091a95 100644
--- a/ldap/servers/plugins/collation/Makefile
+++ b/ldap/servers/plugins/collation/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/collation/collate.c b/ldap/servers/plugins/collation/collate.c
index 05e7df68..fb647368 100644
--- a/ldap/servers/plugins/collation/collate.c
+++ b/ldap/servers/plugins/collation/collate.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/collation/collate.h b/ldap/servers/plugins/collation/collate.h
index f89f28d9..fd66eee9 100644
--- a/ldap/servers/plugins/collation/collate.h
+++ b/ldap/servers/plugins/collation/collate.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/collation/collation.def b/ldap/servers/plugins/collation/collation.def
index 423690b1..89ed7366 100644
--- a/ldap/servers/plugins/collation/collation.def
+++ b/ldap/servers/plugins/collation/collation.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/collation/config.c b/ldap/servers/plugins/collation/config.c
index 6f1c7cef..4eb96f31 100644
--- a/ldap/servers/plugins/collation/config.c
+++ b/ldap/servers/plugins/collation/config.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/collation/config.h b/ldap/servers/plugins/collation/config.h
index 12b06e57..8189355d 100644
--- a/ldap/servers/plugins/collation/config.h
+++ b/ldap/servers/plugins/collation/config.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/collation/debug.c b/ldap/servers/plugins/collation/debug.c
index 6b4960c9..2ef9a984 100644
--- a/ldap/servers/plugins/collation/debug.c
+++ b/ldap/servers/plugins/collation/debug.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/collation/dllmain.c b/ldap/servers/plugins/collation/dllmain.c
index c198227d..d4811fa7 100644
--- a/ldap/servers/plugins/collation/dllmain.c
+++ b/ldap/servers/plugins/collation/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/collation/orfilter.c b/ldap/servers/plugins/collation/orfilter.c
index 90aa34d2..b70974cd 100644
--- a/ldap/servers/plugins/collation/orfilter.c
+++ b/ldap/servers/plugins/collation/orfilter.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/collation/orfilter.h b/ldap/servers/plugins/collation/orfilter.h
index 9913a327..8a7d0f49 100644
--- a/ldap/servers/plugins/collation/orfilter.h
+++ b/ldap/servers/plugins/collation/orfilter.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/cos/Makefile b/ldap/servers/plugins/cos/Makefile
index 8fe478bb..724e8c7b 100644
--- a/ldap/servers/plugins/cos/Makefile
+++ b/ldap/servers/plugins/cos/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/cos/cos.c b/ldap/servers/plugins/cos/cos.c
index 6621a283..cebb5acf 100644
--- a/ldap/servers/plugins/cos/cos.c
+++ b/ldap/servers/plugins/cos/cos.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/cos/cos.def b/ldap/servers/plugins/cos/cos.def
index ad71fac4..d22503ed 100644
--- a/ldap/servers/plugins/cos/cos.def
+++ b/ldap/servers/plugins/cos/cos.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/cos/cos_cache.c b/ldap/servers/plugins/cos/cos_cache.c
index 28b395ec..7ec98443 100644
--- a/ldap/servers/plugins/cos/cos_cache.c
+++ b/ldap/servers/plugins/cos/cos_cache.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/cos/cos_cache.h b/ldap/servers/plugins/cos/cos_cache.h
index 35f90f65..4c29f409 100644
--- a/ldap/servers/plugins/cos/cos_cache.h
+++ b/ldap/servers/plugins/cos/cos_cache.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/cos/dllmain.c b/ldap/servers/plugins/cos/dllmain.c
index 852ee2f2..78d47523 100644
--- a/ldap/servers/plugins/cos/dllmain.c
+++ b/ldap/servers/plugins/cos/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile b/ldap/servers/plugins/distrib/Makefile
index 84f6d4ba..4b076603 100644
--- a/ldap/servers/plugins/distrib/Makefile
+++ b/ldap/servers/plugins/distrib/Makefile
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.AIX b/ldap/servers/plugins/distrib/Makefile.AIX
index a80e32c2..4803d06f 100644
--- a/ldap/servers/plugins/distrib/Makefile.AIX
+++ b/ldap/servers/plugins/distrib/Makefile.AIX
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.BSDI b/ldap/servers/plugins/distrib/Makefile.BSDI
index a0f7ef98..50ffa8c9 100644
--- a/ldap/servers/plugins/distrib/Makefile.BSDI
+++ b/ldap/servers/plugins/distrib/Makefile.BSDI
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.HPUX b/ldap/servers/plugins/distrib/Makefile.HPUX
index 45256773..35c7cf68 100644
--- a/ldap/servers/plugins/distrib/Makefile.HPUX
+++ b/ldap/servers/plugins/distrib/Makefile.HPUX
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.HPUX64 b/ldap/servers/plugins/distrib/Makefile.HPUX64
index 6c08bf6b..d586c5bd 100644
--- a/ldap/servers/plugins/distrib/Makefile.HPUX64
+++ b/ldap/servers/plugins/distrib/Makefile.HPUX64
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.IRIX b/ldap/servers/plugins/distrib/Makefile.IRIX
index 167f21d9..55cd3ce7 100644
--- a/ldap/servers/plugins/distrib/Makefile.IRIX
+++ b/ldap/servers/plugins/distrib/Makefile.IRIX
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.Linux b/ldap/servers/plugins/distrib/Makefile.Linux
index dc382d9f..0fcf9be5 100644
--- a/ldap/servers/plugins/distrib/Makefile.Linux
+++ b/ldap/servers/plugins/distrib/Makefile.Linux
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.OSF1 b/ldap/servers/plugins/distrib/Makefile.OSF1
index f36045c6..3f61b6bd 100644
--- a/ldap/servers/plugins/distrib/Makefile.OSF1
+++ b/ldap/servers/plugins/distrib/Makefile.OSF1
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.ReliantUNIX b/ldap/servers/plugins/distrib/Makefile.ReliantUNIX
index a0f7ef98..50ffa8c9 100644
--- a/ldap/servers/plugins/distrib/Makefile.ReliantUNIX
+++ b/ldap/servers/plugins/distrib/Makefile.ReliantUNIX
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.SOLARIS b/ldap/servers/plugins/distrib/Makefile.SOLARIS
index a0f7ef98..50ffa8c9 100644
--- a/ldap/servers/plugins/distrib/Makefile.SOLARIS
+++ b/ldap/servers/plugins/distrib/Makefile.SOLARIS
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.SOLARIS64 b/ldap/servers/plugins/distrib/Makefile.SOLARIS64
index a3a9a370..39b93e61 100644
--- a/ldap/servers/plugins/distrib/Makefile.SOLARIS64
+++ b/ldap/servers/plugins/distrib/Makefile.SOLARIS64
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.SOLARISx86 b/ldap/servers/plugins/distrib/Makefile.SOLARISx86
index a0f7ef98..50ffa8c9 100644
--- a/ldap/servers/plugins/distrib/Makefile.SOLARISx86
+++ b/ldap/servers/plugins/distrib/Makefile.SOLARISx86
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.UnixWare b/ldap/servers/plugins/distrib/Makefile.UnixWare
index a0f7ef98..50ffa8c9 100644
--- a/ldap/servers/plugins/distrib/Makefile.UnixWare
+++ b/ldap/servers/plugins/distrib/Makefile.UnixWare
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.UnixWareUDK b/ldap/servers/plugins/distrib/Makefile.UnixWareUDK
index a0f7ef98..50ffa8c9 100644
--- a/ldap/servers/plugins/distrib/Makefile.UnixWareUDK
+++ b/ldap/servers/plugins/distrib/Makefile.UnixWareUDK
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/Makefile.WINNT b/ldap/servers/plugins/distrib/Makefile.WINNT
index cd4f6600..4b873dd5 100644
--- a/ldap/servers/plugins/distrib/Makefile.WINNT
+++ b/ldap/servers/plugins/distrib/Makefile.WINNT
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/README b/ldap/servers/plugins/distrib/README
index e671d9aa..319dab18 100644
--- a/ldap/servers/plugins/distrib/README
+++ b/ldap/servers/plugins/distrib/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/ldap/servers/plugins/distrib/distrib.c b/ldap/servers/plugins/distrib/distrib.c
index da7d36b6..f62dbe18 100644
--- a/ldap/servers/plugins/distrib/distrib.c
+++ b/ldap/servers/plugins/distrib/distrib.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/distrib.dsp b/ldap/servers/plugins/distrib/distrib.dsp
index 8c2c46bf..e2ffa396 100644
--- a/ldap/servers/plugins/distrib/distrib.dsp
+++ b/ldap/servers/plugins/distrib/distrib.dsp
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/dllmain.c b/ldap/servers/plugins/distrib/dllmain.c
index 79cc566c..59d9a33a 100644
--- a/ldap/servers/plugins/distrib/dllmain.c
+++ b/ldap/servers/plugins/distrib/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/distrib/libdistrib.def b/ldap/servers/plugins/distrib/libdistrib.def
index 40f5fbb9..09ce7c39 100644
--- a/ldap/servers/plugins/distrib/libdistrib.def
+++ b/ldap/servers/plugins/distrib/libdistrib.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/http/Makefile b/ldap/servers/plugins/http/Makefile
index eb48b536..17767fa9 100644
--- a/ldap/servers/plugins/http/Makefile
+++ b/ldap/servers/plugins/http/Makefile
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/http/dllmain.c b/ldap/servers/plugins/http/dllmain.c
index 36799fe4..3eb6ff94 100644
--- a/ldap/servers/plugins/http/dllmain.c
+++ b/ldap/servers/plugins/http/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/http/http.def b/ldap/servers/plugins/http/http.def
index d36bf421..c586cf7d 100644
--- a/ldap/servers/plugins/http/http.def
+++ b/ldap/servers/plugins/http/http.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/http/http_client.c b/ldap/servers/plugins/http/http_client.c
index 6b9cfe8e..7a5afd54 100644
--- a/ldap/servers/plugins/http/http_client.c
+++ b/ldap/servers/plugins/http/http_client.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/http/http_client.h b/ldap/servers/plugins/http/http_client.h
index 8a24fbe5..a717003f 100644
--- a/ldap/servers/plugins/http/http_client.h
+++ b/ldap/servers/plugins/http/http_client.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/http/http_impl.c b/ldap/servers/plugins/http/http_impl.c
index 73d2e5ff..ee8ff043 100644
--- a/ldap/servers/plugins/http/http_impl.c
+++ b/ldap/servers/plugins/http/http_impl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/http/http_impl.h b/ldap/servers/plugins/http/http_impl.h
index 1d3befb2..10bb86cb 100644
--- a/ldap/servers/plugins/http/http_impl.h
+++ b/ldap/servers/plugins/http/http_impl.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pam_passthru/Makefile b/ldap/servers/plugins/pam_passthru/Makefile
index 968c4b56..7bc8fc80 100644
--- a/ldap/servers/plugins/pam_passthru/Makefile
+++ b/ldap/servers/plugins/pam_passthru/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) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/pam_passthru/README b/ldap/servers/plugins/pam_passthru/README
index b9cd6109..65c79666 100644
--- a/ldap/servers/plugins/pam_passthru/README
+++ b/ldap/servers/plugins/pam_passthru/README
@@ -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) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/pam_passthru/config.ldif b/ldap/servers/plugins/pam_passthru/config.ldif
index 8f7d659b..fe9f9c70 100644
--- a/ldap/servers/plugins/pam_passthru/config.ldif
+++ b/ldap/servers/plugins/pam_passthru/config.ldif
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pam_passthru/libpam_passthru.def b/ldap/servers/plugins/pam_passthru/libpam_passthru.def
index 521ed980..e78e1e2a 100644
--- a/ldap/servers/plugins/pam_passthru/libpam_passthru.def
+++ b/ldap/servers/plugins/pam_passthru/libpam_passthru.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/pam_passthru/pam_passthru.h b/ldap/servers/plugins/pam_passthru/pam_passthru.h
index 26887525..e0de9960 100644
--- a/ldap/servers/plugins/pam_passthru/pam_passthru.h
+++ b/ldap/servers/plugins/pam_passthru/pam_passthru.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/pam_passthru/pam_ptconfig.c b/ldap/servers/plugins/pam_passthru/pam_ptconfig.c
index d2abfb3d..ed2d0e1c 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptconfig.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptconfig.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/pam_passthru/pam_ptdebug.c b/ldap/servers/plugins/pam_passthru/pam_ptdebug.c
index 2d79c22a..832dcc8e 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptdebug.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptdebug.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/pam_passthru/pam_ptdllmain.c b/ldap/servers/plugins/pam_passthru/pam_ptdllmain.c
index 05e8654e..efbbe03d 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptdllmain.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptdllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/pam_passthru/pam_ptimpl.c b/ldap/servers/plugins/pam_passthru/pam_ptimpl.c
index 82c61fb3..eb2c42ee 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptimpl.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptimpl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/pam_passthru/pam_ptpreop.c b/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
index 0ac57bd6..ed1a5bde 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/passthru/Makefile b/ldap/servers/plugins/passthru/Makefile
index 8fc1851e..c07a3753 100644
--- a/ldap/servers/plugins/passthru/Makefile
+++ b/ldap/servers/plugins/passthru/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/passthru/PT-Notes b/ldap/servers/plugins/passthru/PT-Notes
index f8663fcf..4463cfc6 100644
--- a/ldap/servers/plugins/passthru/PT-Notes
+++ b/ldap/servers/plugins/passthru/PT-Notes
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/passthru/libpassthru.def b/ldap/servers/plugins/passthru/libpassthru.def
index d10b23a4..3cdeefe6 100644
--- a/ldap/servers/plugins/passthru/libpassthru.def
+++ b/ldap/servers/plugins/passthru/libpassthru.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/passthru/passthru.h b/ldap/servers/plugins/passthru/passthru.h
index ab36db63..7ff32bdc 100644
--- a/ldap/servers/plugins/passthru/passthru.h
+++ b/ldap/servers/plugins/passthru/passthru.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/passthru/ptbind.c b/ldap/servers/plugins/passthru/ptbind.c
index a3cb2e72..f3841c05 100644
--- a/ldap/servers/plugins/passthru/ptbind.c
+++ b/ldap/servers/plugins/passthru/ptbind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/passthru/ptconfig.c b/ldap/servers/plugins/passthru/ptconfig.c
index 04feac14..3d7b3727 100644
--- a/ldap/servers/plugins/passthru/ptconfig.c
+++ b/ldap/servers/plugins/passthru/ptconfig.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/passthru/ptconn.c b/ldap/servers/plugins/passthru/ptconn.c
index 5e375d8b..6d5cb979 100644
--- a/ldap/servers/plugins/passthru/ptconn.c
+++ b/ldap/servers/plugins/passthru/ptconn.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/passthru/ptdebug.c b/ldap/servers/plugins/passthru/ptdebug.c
index 19c6901b..e603cf4c 100644
--- a/ldap/servers/plugins/passthru/ptdebug.c
+++ b/ldap/servers/plugins/passthru/ptdebug.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/passthru/ptdllmain.c b/ldap/servers/plugins/passthru/ptdllmain.c
index 3ecebf3f..9d8fbeeb 100644
--- a/ldap/servers/plugins/passthru/ptdllmain.c
+++ b/ldap/servers/plugins/passthru/ptdllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/passthru/ptpreop.c b/ldap/servers/plugins/passthru/ptpreop.c
index cff154b3..5ab2ae84 100644
--- a/ldap/servers/plugins/passthru/ptpreop.c
+++ b/ldap/servers/plugins/passthru/ptpreop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/passthru/ptutil.c b/ldap/servers/plugins/passthru/ptutil.c
index 939d8308..82708dde 100644
--- a/ldap/servers/plugins/passthru/ptutil.c
+++ b/ldap/servers/plugins/passthru/ptutil.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/presence/Makefile b/ldap/servers/plugins/presence/Makefile
index 62f55962..3fdab6be 100644
--- a/ldap/servers/plugins/presence/Makefile
+++ b/ldap/servers/plugins/presence/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/presence/dllmain.c b/ldap/servers/plugins/presence/dllmain.c
index 852ee2f2..78d47523 100644
--- a/ldap/servers/plugins/presence/dllmain.c
+++ b/ldap/servers/plugins/presence/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/presence/presence.c b/ldap/servers/plugins/presence/presence.c
index b3b5f76f..c5b1371e 100644
--- a/ldap/servers/plugins/presence/presence.c
+++ b/ldap/servers/plugins/presence/presence.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/presence/presence.def b/ldap/servers/plugins/presence/presence.def
index db138b47..d0c407c1 100644
--- a/ldap/servers/plugins/presence/presence.def
+++ b/ldap/servers/plugins/presence/presence.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/presence/presence.ldif b/ldap/servers/plugins/presence/presence.ldif
index 875c7dd8..5ca596f4 100644
--- a/ldap/servers/plugins/presence/presence.ldif
+++ b/ldap/servers/plugins/presence/presence.ldif
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/Makefile b/ldap/servers/plugins/pwdstorage/Makefile
index 0f5a5c25..22fa6367 100644
--- a/ldap/servers/plugins/pwdstorage/Makefile
+++ b/ldap/servers/plugins/pwdstorage/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/clear_pwd.c b/ldap/servers/plugins/pwdstorage/clear_pwd.c
index 25574ae1..e12adc33 100644
--- a/ldap/servers/plugins/pwdstorage/clear_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/clear_pwd.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/crypt_pwd.c b/ldap/servers/plugins/pwdstorage/crypt_pwd.c
index 154b34fd..36d49d99 100644
--- a/ldap/servers/plugins/pwdstorage/crypt_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/crypt_pwd.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/dllmain.c b/ldap/servers/plugins/pwdstorage/dllmain.c
index c785652d..d09ab45f 100644
--- a/ldap/servers/plugins/pwdstorage/dllmain.c
+++ b/ldap/servers/plugins/pwdstorage/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/libpwdstorage.def b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
index e32c5fea..54f05449 100644
--- a/ldap/servers/plugins/pwdstorage/libpwdstorage.def
+++ b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/md5.h b/ldap/servers/plugins/pwdstorage/md5.h
index 3a525c53..e34525ef 100644
--- a/ldap/servers/plugins/pwdstorage/md5.h
+++ b/ldap/servers/plugins/pwdstorage/md5.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/md5c.c b/ldap/servers/plugins/pwdstorage/md5c.c
index d46dbb41..5d7c7ef2 100644
--- a/ldap/servers/plugins/pwdstorage/md5c.c
+++ b/ldap/servers/plugins/pwdstorage/md5c.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.bu b/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.bu
index 618ffee8..7ca2e521 100644
--- a/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.bu
+++ b/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.bu
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.c b/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.c
index ce945bf6..cf3b8b90 100644
--- a/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/pwd_init.c b/ldap/servers/plugins/pwdstorage/pwd_init.c
index 44e7b9d2..10b54760 100644
--- a/ldap/servers/plugins/pwdstorage/pwd_init.c
+++ b/ldap/servers/plugins/pwdstorage/pwd_init.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/pwdstorage.h b/ldap/servers/plugins/pwdstorage/pwdstorage.h
index 8ae1208b..74e6a63e 100644
--- a/ldap/servers/plugins/pwdstorage/pwdstorage.h
+++ b/ldap/servers/plugins/pwdstorage/pwdstorage.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/sha_pwd.c b/ldap/servers/plugins/pwdstorage/sha_pwd.c
index 263b3139..a40f40f4 100644
--- a/ldap/servers/plugins/pwdstorage/sha_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/sha_pwd.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/pwdstorage/ssha_pwd.c b/ldap/servers/plugins/pwdstorage/ssha_pwd.c
index cdfdb8ec..0384c33f 100644
--- a/ldap/servers/plugins/pwdstorage/ssha_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/ssha_pwd.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/referint/Makefile b/ldap/servers/plugins/referint/Makefile
index 4e8402d1..0e53182f 100644
--- a/ldap/servers/plugins/referint/Makefile
+++ b/ldap/servers/plugins/referint/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/referint/dllmain.c b/ldap/servers/plugins/referint/dllmain.c
index ee7665b1..957a8032 100644
--- a/ldap/servers/plugins/referint/dllmain.c
+++ b/ldap/servers/plugins/referint/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/referint/referint.c b/ldap/servers/plugins/referint/referint.c
index 26c1a426..ba7f2712 100644
--- a/ldap/servers/plugins/referint/referint.c
+++ b/ldap/servers/plugins/referint/referint.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/referint/referint.def b/ldap/servers/plugins/referint/referint.def
index 8f71df4c..b10ca812 100644
--- a/ldap/servers/plugins/referint/referint.def
+++ b/ldap/servers/plugins/referint/referint.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/Makefile b/ldap/servers/plugins/replication/Makefile
index b2eb9208..b9e7376b 100644
--- a/ldap/servers/plugins/replication/Makefile
+++ b/ldap/servers/plugins/replication/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl4.h b/ldap/servers/plugins/replication/cl4.h
index 920fd161..8f985730 100644
--- a/ldap/servers/plugins/replication/cl4.h
+++ b/ldap/servers/plugins/replication/cl4.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl4_api.c b/ldap/servers/plugins/replication/cl4_api.c
index 7271902c..029d2612 100644
--- a/ldap/servers/plugins/replication/cl4_api.c
+++ b/ldap/servers/plugins/replication/cl4_api.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl4_api.h b/ldap/servers/plugins/replication/cl4_api.h
index 244c56f5..4796e8c8 100644
--- a/ldap/servers/plugins/replication/cl4_api.h
+++ b/ldap/servers/plugins/replication/cl4_api.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl4_init.c b/ldap/servers/plugins/replication/cl4_init.c
index 83501469..4b686efb 100644
--- a/ldap/servers/plugins/replication/cl4_init.c
+++ b/ldap/servers/plugins/replication/cl4_init.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl5.h b/ldap/servers/plugins/replication/cl5.h
index 2c574cc8..0eeb5dbb 100644
--- a/ldap/servers/plugins/replication/cl5.h
+++ b/ldap/servers/plugins/replication/cl5.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index 4b02299c..0f1f38be 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl5_api.h b/ldap/servers/plugins/replication/cl5_api.h
index 9869376a..edda3a05 100644
--- a/ldap/servers/plugins/replication/cl5_api.h
+++ b/ldap/servers/plugins/replication/cl5_api.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl5_clcache.c b/ldap/servers/plugins/replication/cl5_clcache.c
index 96143704..1f646ce7 100644
--- a/ldap/servers/plugins/replication/cl5_clcache.c
+++ b/ldap/servers/plugins/replication/cl5_clcache.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/replication/cl5_clcache.h b/ldap/servers/plugins/replication/cl5_clcache.h
index c3679bfa..7aebcb9e 100644
--- a/ldap/servers/plugins/replication/cl5_clcache.h
+++ b/ldap/servers/plugins/replication/cl5_clcache.h
@@ -29,7 +29,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl5_config.c b/ldap/servers/plugins/replication/cl5_config.c
index ae444c4a..6f4282a5 100644
--- a/ldap/servers/plugins/replication/cl5_config.c
+++ b/ldap/servers/plugins/replication/cl5_config.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl5_init.c b/ldap/servers/plugins/replication/cl5_init.c
index 665f6bc2..058406ab 100644
--- a/ldap/servers/plugins/replication/cl5_init.c
+++ b/ldap/servers/plugins/replication/cl5_init.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl5_test.c b/ldap/servers/plugins/replication/cl5_test.c
index a3870d40..30fe16ea 100644
--- a/ldap/servers/plugins/replication/cl5_test.c
+++ b/ldap/servers/plugins/replication/cl5_test.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/cl5_test.h b/ldap/servers/plugins/replication/cl5_test.h
index 2fed0d71..d6e31503 100644
--- a/ldap/servers/plugins/replication/cl5_test.h
+++ b/ldap/servers/plugins/replication/cl5_test.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/csnpl.c b/ldap/servers/plugins/replication/csnpl.c
index 53cc8eb1..362618a7 100644
--- a/ldap/servers/plugins/replication/csnpl.c
+++ b/ldap/servers/plugins/replication/csnpl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/csnpl.h b/ldap/servers/plugins/replication/csnpl.h
index a78fc386..fd3c08fd 100644
--- a/ldap/servers/plugins/replication/csnpl.h
+++ b/ldap/servers/plugins/replication/csnpl.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/dllmain.c b/ldap/servers/plugins/replication/dllmain.c
index aced1921..1e39219b 100644
--- a/ldap/servers/plugins/replication/dllmain.c
+++ b/ldap/servers/plugins/replication/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/legacy_consumer.c b/ldap/servers/plugins/replication/legacy_consumer.c
index 7b2f88bc..0530e2e3 100644
--- a/ldap/servers/plugins/replication/legacy_consumer.c
+++ b/ldap/servers/plugins/replication/legacy_consumer.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/llist.c b/ldap/servers/plugins/replication/llist.c
index 5dfeee44..d7206c33 100644
--- a/ldap/servers/plugins/replication/llist.c
+++ b/ldap/servers/plugins/replication/llist.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/llist.h b/ldap/servers/plugins/replication/llist.h
index 6b63b8f5..7896ceaa 100644
--- a/ldap/servers/plugins/replication/llist.h
+++ b/ldap/servers/plugins/replication/llist.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/profile.c b/ldap/servers/plugins/replication/profile.c
index 00d53a4c..615540cf 100644
--- a/ldap/servers/plugins/replication/profile.c
+++ b/ldap/servers/plugins/replication/profile.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl.h b/ldap/servers/plugins/replication/repl.h
index fbf32376..c964fb2e 100644
--- a/ldap/servers/plugins/replication/repl.h
+++ b/ldap/servers/plugins/replication/repl.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h
index 80007b74..69d8da75 100644
--- a/ldap/servers/plugins/replication/repl5.h
+++ b/ldap/servers/plugins/replication/repl5.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index e7b748d0..63d14662 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_agmtlist.c b/ldap/servers/plugins/replication/repl5_agmtlist.c
index b32be626..f1d6d5ce 100644
--- a/ldap/servers/plugins/replication/repl5_agmtlist.c
+++ b/ldap/servers/plugins/replication/repl5_agmtlist.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_backoff.c b/ldap/servers/plugins/replication/repl5_backoff.c
index 08d7bf6d..dd7a22e6 100644
--- a/ldap/servers/plugins/replication/repl5_backoff.c
+++ b/ldap/servers/plugins/replication/repl5_backoff.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_connection.c b/ldap/servers/plugins/replication/repl5_connection.c
index cb260e22..cdcb038c 100644
--- a/ldap/servers/plugins/replication/repl5_connection.c
+++ b/ldap/servers/plugins/replication/repl5_connection.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_inc_protocol.c b/ldap/servers/plugins/replication/repl5_inc_protocol.c
index 8fbda9c0..0157309a 100644
--- a/ldap/servers/plugins/replication/repl5_inc_protocol.c
+++ b/ldap/servers/plugins/replication/repl5_inc_protocol.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c
index 30cfea0b..35312292 100644
--- a/ldap/servers/plugins/replication/repl5_init.c
+++ b/ldap/servers/plugins/replication/repl5_init.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_mtnode_ext.c b/ldap/servers/plugins/replication/repl5_mtnode_ext.c
index 0e8e5b9c..262e39b5 100644
--- a/ldap/servers/plugins/replication/repl5_mtnode_ext.c
+++ b/ldap/servers/plugins/replication/repl5_mtnode_ext.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_plugins.c b/ldap/servers/plugins/replication/repl5_plugins.c
index b97db269..8bedeedc 100644
--- a/ldap/servers/plugins/replication/repl5_plugins.c
+++ b/ldap/servers/plugins/replication/repl5_plugins.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_prot_private.h b/ldap/servers/plugins/replication/repl5_prot_private.h
index 32019387..dc02ab28 100644
--- a/ldap/servers/plugins/replication/repl5_prot_private.h
+++ b/ldap/servers/plugins/replication/repl5_prot_private.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_protocol.c b/ldap/servers/plugins/replication/repl5_protocol.c
index 867af479..0a52ffd7 100644
--- a/ldap/servers/plugins/replication/repl5_protocol.c
+++ b/ldap/servers/plugins/replication/repl5_protocol.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_protocol_util.c b/ldap/servers/plugins/replication/repl5_protocol_util.c
index ab4e744c..2756b77c 100644
--- a/ldap/servers/plugins/replication/repl5_protocol_util.c
+++ b/ldap/servers/plugins/replication/repl5_protocol_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/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index 6f51fb8a..0ea94e6c 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 1054ac33..34ce7313 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_config.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_replica_dnhash.c b/ldap/servers/plugins/replication/repl5_replica_dnhash.c
index c5cff59b..cb0bfbc8 100644
--- a/ldap/servers/plugins/replication/repl5_replica_dnhash.c
+++ b/ldap/servers/plugins/replication/repl5_replica_dnhash.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_replica_hash.c b/ldap/servers/plugins/replication/repl5_replica_hash.c
index f95ff03e..159d1671 100644
--- a/ldap/servers/plugins/replication/repl5_replica_hash.c
+++ b/ldap/servers/plugins/replication/repl5_replica_hash.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_replsupplier.c b/ldap/servers/plugins/replication/repl5_replsupplier.c
index 9f734fa5..438f2455 100644
--- a/ldap/servers/plugins/replication/repl5_replsupplier.c
+++ b/ldap/servers/plugins/replication/repl5_replsupplier.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_ruv.c b/ldap/servers/plugins/replication/repl5_ruv.c
index be8ac406..effc4af2 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.c
+++ b/ldap/servers/plugins/replication/repl5_ruv.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_ruv.h b/ldap/servers/plugins/replication/repl5_ruv.h
index 00078083..a85318b4 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.h
+++ b/ldap/servers/plugins/replication/repl5_ruv.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_schedule.c b/ldap/servers/plugins/replication/repl5_schedule.c
index d1da8fe8..318fabc5 100644
--- a/ldap/servers/plugins/replication/repl5_schedule.c
+++ b/ldap/servers/plugins/replication/repl5_schedule.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_tot_protocol.c b/ldap/servers/plugins/replication/repl5_tot_protocol.c
index 243663ef..fada1057 100644
--- a/ldap/servers/plugins/replication/repl5_tot_protocol.c
+++ b/ldap/servers/plugins/replication/repl5_tot_protocol.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_total.c b/ldap/servers/plugins/replication/repl5_total.c
index 7b2cda96..65d719e4 100644
--- a/ldap/servers/plugins/replication/repl5_total.c
+++ b/ldap/servers/plugins/replication/repl5_total.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl5_updatedn_list.c b/ldap/servers/plugins/replication/repl5_updatedn_list.c
index 0f151e62..08731ce2 100644
--- a/ldap/servers/plugins/replication/repl5_updatedn_list.c
+++ b/ldap/servers/plugins/replication/repl5_updatedn_list.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_add.c b/ldap/servers/plugins/replication/repl_add.c
index 19c5b2e0..240711fb 100644
--- a/ldap/servers/plugins/replication/repl_add.c
+++ b/ldap/servers/plugins/replication/repl_add.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_bind.c b/ldap/servers/plugins/replication/repl_bind.c
index 2080fa31..5e1ec717 100644
--- a/ldap/servers/plugins/replication/repl_bind.c
+++ b/ldap/servers/plugins/replication/repl_bind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_compare.c b/ldap/servers/plugins/replication/repl_compare.c
index 656a49ff..6cc71b8f 100644
--- a/ldap/servers/plugins/replication/repl_compare.c
+++ b/ldap/servers/plugins/replication/repl_compare.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_connext.c b/ldap/servers/plugins/replication/repl_connext.c
index 163c2a1e..736c51d1 100644
--- a/ldap/servers/plugins/replication/repl_connext.c
+++ b/ldap/servers/plugins/replication/repl_connext.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_controls.c b/ldap/servers/plugins/replication/repl_controls.c
index de1e1621..51e9900c 100644
--- a/ldap/servers/plugins/replication/repl_controls.c
+++ b/ldap/servers/plugins/replication/repl_controls.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_delete.c b/ldap/servers/plugins/replication/repl_delete.c
index 6df4abc7..c5ae737a 100644
--- a/ldap/servers/plugins/replication/repl_delete.c
+++ b/ldap/servers/plugins/replication/repl_delete.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_entry.c b/ldap/servers/plugins/replication/repl_entry.c
index 76267a6d..55b934ff 100644
--- a/ldap/servers/plugins/replication/repl_entry.c
+++ b/ldap/servers/plugins/replication/repl_entry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_ext.c b/ldap/servers/plugins/replication/repl_ext.c
index 1b2fe870..5b2ceec5 100644
--- a/ldap/servers/plugins/replication/repl_ext.c
+++ b/ldap/servers/plugins/replication/repl_ext.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index 2f7997c4..22b829f7 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_extop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_globals.c b/ldap/servers/plugins/replication/repl_globals.c
index ab65e6f5..dffd37df 100644
--- a/ldap/servers/plugins/replication/repl_globals.c
+++ b/ldap/servers/plugins/replication/repl_globals.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_helper.c b/ldap/servers/plugins/replication/repl_helper.c
index 6924308b..8edbccbd 100644
--- a/ldap/servers/plugins/replication/repl_helper.c
+++ b/ldap/servers/plugins/replication/repl_helper.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_helper.h b/ldap/servers/plugins/replication/repl_helper.h
index bdde3814..0c50c0ac 100644
--- a/ldap/servers/plugins/replication/repl_helper.h
+++ b/ldap/servers/plugins/replication/repl_helper.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_init.c b/ldap/servers/plugins/replication/repl_init.c
index c77e45e4..11bc270d 100644
--- a/ldap/servers/plugins/replication/repl_init.c
+++ b/ldap/servers/plugins/replication/repl_init.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_modify.c b/ldap/servers/plugins/replication/repl_modify.c
index 63a4d6ff..8caccb78 100644
--- a/ldap/servers/plugins/replication/repl_modify.c
+++ b/ldap/servers/plugins/replication/repl_modify.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_modrdn.c b/ldap/servers/plugins/replication/repl_modrdn.c
index 107b2481..d5fb116e 100644
--- a/ldap/servers/plugins/replication/repl_modrdn.c
+++ b/ldap/servers/plugins/replication/repl_modrdn.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_monitor.c b/ldap/servers/plugins/replication/repl_monitor.c
index 9004a8e1..af8f5a08 100644
--- a/ldap/servers/plugins/replication/repl_monitor.c
+++ b/ldap/servers/plugins/replication/repl_monitor.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_objset.c b/ldap/servers/plugins/replication/repl_objset.c
index fb94ceda..519cb69a 100644
--- a/ldap/servers/plugins/replication/repl_objset.c
+++ b/ldap/servers/plugins/replication/repl_objset.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_objset.h b/ldap/servers/plugins/replication/repl_objset.h
index 993029bb..530a450a 100644
--- a/ldap/servers/plugins/replication/repl_objset.h
+++ b/ldap/servers/plugins/replication/repl_objset.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_opext.c b/ldap/servers/plugins/replication/repl_opext.c
index e543ac46..27385a86 100644
--- a/ldap/servers/plugins/replication/repl_opext.c
+++ b/ldap/servers/plugins/replication/repl_opext.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_ops.c b/ldap/servers/plugins/replication/repl_ops.c
index 7bd69b50..1e2ebf7b 100644
--- a/ldap/servers/plugins/replication/repl_ops.c
+++ b/ldap/servers/plugins/replication/repl_ops.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_rootdse.c b/ldap/servers/plugins/replication/repl_rootdse.c
index eaffac8a..6d185b07 100644
--- a/ldap/servers/plugins/replication/repl_rootdse.c
+++ b/ldap/servers/plugins/replication/repl_rootdse.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_search.c b/ldap/servers/plugins/replication/repl_search.c
index 41665a58..6c55f3ad 100644
--- a/ldap/servers/plugins/replication/repl_search.c
+++ b/ldap/servers/plugins/replication/repl_search.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/repl_shared.h b/ldap/servers/plugins/replication/repl_shared.h
index 5c406573..5cc5dfc2 100644
--- a/ldap/servers/plugins/replication/repl_shared.h
+++ b/ldap/servers/plugins/replication/repl_shared.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/replication.def b/ldap/servers/plugins/replication/replication.def
index bb9b1593..e1fe647c 100644
--- a/ldap/servers/plugins/replication/replication.def
+++ b/ldap/servers/plugins/replication/replication.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/replutil.c b/ldap/servers/plugins/replication/replutil.c
index 39fcf943..55e6e0ef 100644
--- a/ldap/servers/plugins/replication/replutil.c
+++ b/ldap/servers/plugins/replication/replutil.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/tests/dnp_sim.c b/ldap/servers/plugins/replication/tests/dnp_sim.c
index 59fd0c6c..b1c85dba 100644
--- a/ldap/servers/plugins/replication/tests/dnp_sim.c
+++ b/ldap/servers/plugins/replication/tests/dnp_sim.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/tests/dnp_sim2.c b/ldap/servers/plugins/replication/tests/dnp_sim2.c
index 9c891b64..042aae5e 100644
--- a/ldap/servers/plugins/replication/tests/dnp_sim2.c
+++ b/ldap/servers/plugins/replication/tests/dnp_sim2.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/tests/dnp_sim3.c b/ldap/servers/plugins/replication/tests/dnp_sim3.c
index e4c08d74..c26953fe 100644
--- a/ldap/servers/plugins/replication/tests/dnp_sim3.c
+++ b/ldap/servers/plugins/replication/tests/dnp_sim3.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/tests/makesim b/ldap/servers/plugins/replication/tests/makesim
index be7111b0..235a3503 100755
--- a/ldap/servers/plugins/replication/tests/makesim
+++ b/ldap/servers/plugins/replication/tests/makesim
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/urp.c b/ldap/servers/plugins/replication/urp.c
index 587b1aa1..08100b31 100644
--- a/ldap/servers/plugins/replication/urp.c
+++ b/ldap/servers/plugins/replication/urp.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/urp.h b/ldap/servers/plugins/replication/urp.h
index b27e4d9f..06b89129 100644
--- a/ldap/servers/plugins/replication/urp.h
+++ b/ldap/servers/plugins/replication/urp.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/urp_glue.c b/ldap/servers/plugins/replication/urp_glue.c
index 4c48e22f..a8fac3fa 100644
--- a/ldap/servers/plugins/replication/urp_glue.c
+++ b/ldap/servers/plugins/replication/urp_glue.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/urp_tombstone.c b/ldap/servers/plugins/replication/urp_tombstone.c
index 8fa47503..f33e863d 100644
--- a/ldap/servers/plugins/replication/urp_tombstone.c
+++ b/ldap/servers/plugins/replication/urp_tombstone.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/windows_connection.c b/ldap/servers/plugins/replication/windows_connection.c
index 71d2ae04..0d37197f 100644
--- a/ldap/servers/plugins/replication/windows_connection.c
+++ b/ldap/servers/plugins/replication/windows_connection.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/windows_inc_protocol.c b/ldap/servers/plugins/replication/windows_inc_protocol.c
index 4623b780..fcf9eb44 100644
--- a/ldap/servers/plugins/replication/windows_inc_protocol.c
+++ b/ldap/servers/plugins/replication/windows_inc_protocol.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/windows_private.c b/ldap/servers/plugins/replication/windows_private.c
index 8e274555..358f7797 100644
--- a/ldap/servers/plugins/replication/windows_private.c
+++ b/ldap/servers/plugins/replication/windows_private.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/windows_prot_private.h b/ldap/servers/plugins/replication/windows_prot_private.h
index c69d68ea..772aa792 100644
--- a/ldap/servers/plugins/replication/windows_prot_private.h
+++ b/ldap/servers/plugins/replication/windows_prot_private.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/windows_protocol_util.c b/ldap/servers/plugins/replication/windows_protocol_util.c
index 68fa6506..0bf13d54 100644
--- a/ldap/servers/plugins/replication/windows_protocol_util.c
+++ b/ldap/servers/plugins/replication/windows_protocol_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/ldap/servers/plugins/replication/windows_tot_protocol.c b/ldap/servers/plugins/replication/windows_tot_protocol.c
index c8ba2825..deea9608 100644
--- a/ldap/servers/plugins/replication/windows_tot_protocol.c
+++ b/ldap/servers/plugins/replication/windows_tot_protocol.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/replication/windowsrepl.h b/ldap/servers/plugins/replication/windowsrepl.h
index adefcefd..161180e7 100644
--- a/ldap/servers/plugins/replication/windowsrepl.h
+++ b/ldap/servers/plugins/replication/windowsrepl.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/Makefile b/ldap/servers/plugins/retrocl/Makefile
index 63635d0e..ff42455d 100644
--- a/ldap/servers/plugins/retrocl/Makefile
+++ b/ldap/servers/plugins/retrocl/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/dllmain.c b/ldap/servers/plugins/retrocl/dllmain.c
index 96696c2d..4de09ab2 100644
--- a/ldap/servers/plugins/retrocl/dllmain.c
+++ b/ldap/servers/plugins/retrocl/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/linktest.c b/ldap/servers/plugins/retrocl/linktest.c
index fbb2483e..e0e14595 100644
--- a/ldap/servers/plugins/retrocl/linktest.c
+++ b/ldap/servers/plugins/retrocl/linktest.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/retrocl.c b/ldap/servers/plugins/retrocl/retrocl.c
index 714964dd..77040f5d 100644
--- a/ldap/servers/plugins/retrocl/retrocl.c
+++ b/ldap/servers/plugins/retrocl/retrocl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/retrocl.def b/ldap/servers/plugins/retrocl/retrocl.def
index 08477734..63acf441 100644
--- a/ldap/servers/plugins/retrocl/retrocl.def
+++ b/ldap/servers/plugins/retrocl/retrocl.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/retrocl.h b/ldap/servers/plugins/retrocl/retrocl.h
index 63f0d4ba..dfa71f59 100644
--- a/ldap/servers/plugins/retrocl/retrocl.h
+++ b/ldap/servers/plugins/retrocl/retrocl.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/retrocl.txt b/ldap/servers/plugins/retrocl/retrocl.txt
index db62a7ef..5df022c7 100644
--- a/ldap/servers/plugins/retrocl/retrocl.txt
+++ b/ldap/servers/plugins/retrocl/retrocl.txt
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/retrocl_cn.c b/ldap/servers/plugins/retrocl/retrocl_cn.c
index e1ebba3e..6978073a 100644
--- a/ldap/servers/plugins/retrocl/retrocl_cn.c
+++ b/ldap/servers/plugins/retrocl/retrocl_cn.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/retrocl_create.c b/ldap/servers/plugins/retrocl/retrocl_create.c
index f8d31593..5f70e6a6 100644
--- a/ldap/servers/plugins/retrocl/retrocl_create.c
+++ b/ldap/servers/plugins/retrocl/retrocl_create.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/retrocl_po.c b/ldap/servers/plugins/retrocl/retrocl_po.c
index 338a2217..d8cce37f 100644
--- a/ldap/servers/plugins/retrocl/retrocl_po.c
+++ b/ldap/servers/plugins/retrocl/retrocl_po.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/retrocl_rootdse.c b/ldap/servers/plugins/retrocl/retrocl_rootdse.c
index b27f6af6..d7d23e14 100644
--- a/ldap/servers/plugins/retrocl/retrocl_rootdse.c
+++ b/ldap/servers/plugins/retrocl/retrocl_rootdse.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/retrocl/retrocl_trim.c b/ldap/servers/plugins/retrocl/retrocl_trim.c
index f420e238..a57d53aa 100644
--- a/ldap/servers/plugins/retrocl/retrocl_trim.c
+++ b/ldap/servers/plugins/retrocl/retrocl_trim.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/rever/Makefile b/ldap/servers/plugins/rever/Makefile
index 54e77420..5215cd8a 100644
--- a/ldap/servers/plugins/rever/Makefile
+++ b/ldap/servers/plugins/rever/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/rever/des.c b/ldap/servers/plugins/rever/des.c
index 295771fa..3207789b 100644
--- a/ldap/servers/plugins/rever/des.c
+++ b/ldap/servers/plugins/rever/des.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/rever/dllmain.c b/ldap/servers/plugins/rever/dllmain.c
index 0cddd8e9..7b029408 100644
--- a/ldap/servers/plugins/rever/dllmain.c
+++ b/ldap/servers/plugins/rever/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/rever/libdes.def b/ldap/servers/plugins/rever/libdes.def
index 25ba163c..081eac0d 100644
--- a/ldap/servers/plugins/rever/libdes.def
+++ b/ldap/servers/plugins/rever/libdes.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/rever/rever.c b/ldap/servers/plugins/rever/rever.c
index 4960f933..89d9b16f 100644
--- a/ldap/servers/plugins/rever/rever.c
+++ b/ldap/servers/plugins/rever/rever.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/rever/rever.h b/ldap/servers/plugins/rever/rever.h
index 7397b84b..e4204b36 100644
--- a/ldap/servers/plugins/rever/rever.h
+++ b/ldap/servers/plugins/rever/rever.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/roles/Makefile b/ldap/servers/plugins/roles/Makefile
index 3111cc28..6e83c083 100644
--- a/ldap/servers/plugins/roles/Makefile
+++ b/ldap/servers/plugins/roles/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/roles/dllmain.c b/ldap/servers/plugins/roles/dllmain.c
index 852ee2f2..78d47523 100644
--- a/ldap/servers/plugins/roles/dllmain.c
+++ b/ldap/servers/plugins/roles/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/roles/roles.def b/ldap/servers/plugins/roles/roles.def
index 277b09dd..5c4b5c0c 100644
--- a/ldap/servers/plugins/roles/roles.def
+++ b/ldap/servers/plugins/roles/roles.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/roles/roles_cache.c b/ldap/servers/plugins/roles/roles_cache.c
index aa0cdeb1..3b5e82cf 100644
--- a/ldap/servers/plugins/roles/roles_cache.c
+++ b/ldap/servers/plugins/roles/roles_cache.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/roles/roles_cache.h b/ldap/servers/plugins/roles/roles_cache.h
index 0fe8d707..f3f6dd87 100644
--- a/ldap/servers/plugins/roles/roles_cache.h
+++ b/ldap/servers/plugins/roles/roles_cache.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/roles/roles_plugin.c b/ldap/servers/plugins/roles/roles_plugin.c
index 7eabc0d6..5a04c6c1 100644
--- a/ldap/servers/plugins/roles/roles_plugin.c
+++ b/ldap/servers/plugins/roles/roles_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/ldap/servers/plugins/shared/Makefile b/ldap/servers/plugins/shared/Makefile
index ac26ae8d..dbb5f03b 100644
--- a/ldap/servers/plugins/shared/Makefile
+++ b/ldap/servers/plugins/shared/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/shared/plugin-utils.h b/ldap/servers/plugins/shared/plugin-utils.h
index fe9921c2..af36b33d 100644
--- a/ldap/servers/plugins/shared/plugin-utils.h
+++ b/ldap/servers/plugins/shared/plugin-utils.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/shared/utils.c b/ldap/servers/plugins/shared/utils.c
index 92c7eb70..ec1f7c1d 100644
--- a/ldap/servers/plugins/shared/utils.c
+++ b/ldap/servers/plugins/shared/utils.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/statechange/Makefile b/ldap/servers/plugins/statechange/Makefile
index f4de0f98..c5d4e7e6 100644
--- a/ldap/servers/plugins/statechange/Makefile
+++ b/ldap/servers/plugins/statechange/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/statechange/dllmain.c b/ldap/servers/plugins/statechange/dllmain.c
index 852ee2f2..78d47523 100644
--- a/ldap/servers/plugins/statechange/dllmain.c
+++ b/ldap/servers/plugins/statechange/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/statechange/statechange.c b/ldap/servers/plugins/statechange/statechange.c
index e524ced9..755f66e7 100644
--- a/ldap/servers/plugins/statechange/statechange.c
+++ b/ldap/servers/plugins/statechange/statechange.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/statechange/statechange.def b/ldap/servers/plugins/statechange/statechange.def
index be64accf..ad8fd5f5 100644
--- a/ldap/servers/plugins/statechange/statechange.def
+++ b/ldap/servers/plugins/statechange/statechange.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/Makefile b/ldap/servers/plugins/syntaxes/Makefile
index 894cdeec..359ba48d 100644
--- a/ldap/servers/plugins/syntaxes/Makefile
+++ b/ldap/servers/plugins/syntaxes/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/bin.c b/ldap/servers/plugins/syntaxes/bin.c
index f5d3d060..911f1cfa 100644
--- a/ldap/servers/plugins/syntaxes/bin.c
+++ b/ldap/servers/plugins/syntaxes/bin.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/ces.c b/ldap/servers/plugins/syntaxes/ces.c
index 78374325..16f3987a 100644
--- a/ldap/servers/plugins/syntaxes/ces.c
+++ b/ldap/servers/plugins/syntaxes/ces.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/cis.c b/ldap/servers/plugins/syntaxes/cis.c
index 1aaa3b18..db34cd00 100644
--- a/ldap/servers/plugins/syntaxes/cis.c
+++ b/ldap/servers/plugins/syntaxes/cis.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/debug.c b/ldap/servers/plugins/syntaxes/debug.c
index 6df33ee3..0902654b 100644
--- a/ldap/servers/plugins/syntaxes/debug.c
+++ b/ldap/servers/plugins/syntaxes/debug.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/dllmain.c b/ldap/servers/plugins/syntaxes/dllmain.c
index a1ac55e1..19538144 100644
--- a/ldap/servers/plugins/syntaxes/dllmain.c
+++ b/ldap/servers/plugins/syntaxes/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/dn.c b/ldap/servers/plugins/syntaxes/dn.c
index 8e1864fd..13a27267 100644
--- a/ldap/servers/plugins/syntaxes/dn.c
+++ b/ldap/servers/plugins/syntaxes/dn.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/int.c b/ldap/servers/plugins/syntaxes/int.c
index b22c1687..a01143a4 100644
--- a/ldap/servers/plugins/syntaxes/int.c
+++ b/ldap/servers/plugins/syntaxes/int.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/libsyntax.def b/ldap/servers/plugins/syntaxes/libsyntax.def
index 297996d3..9ab16505 100644
--- a/ldap/servers/plugins/syntaxes/libsyntax.def
+++ b/ldap/servers/plugins/syntaxes/libsyntax.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/phonetic.c b/ldap/servers/plugins/syntaxes/phonetic.c
index bebb1399..027dd9f0 100644
--- a/ldap/servers/plugins/syntaxes/phonetic.c
+++ b/ldap/servers/plugins/syntaxes/phonetic.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/sicis.c b/ldap/servers/plugins/syntaxes/sicis.c
index 9104cca3..91f477bf 100644
--- a/ldap/servers/plugins/syntaxes/sicis.c
+++ b/ldap/servers/plugins/syntaxes/sicis.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/plugins/syntaxes/string.c b/ldap/servers/plugins/syntaxes/string.c
index 09f64ab7..3701a6aa 100644
--- a/ldap/servers/plugins/syntaxes/string.c
+++ b/ldap/servers/plugins/syntaxes/string.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/syntax.h b/ldap/servers/plugins/syntaxes/syntax.h
index 57c0e7e9..d0ab4224 100644
--- a/ldap/servers/plugins/syntaxes/syntax.h
+++ b/ldap/servers/plugins/syntaxes/syntax.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/tel.c b/ldap/servers/plugins/syntaxes/tel.c
index 39dd9cb3..c229fc30 100644
--- a/ldap/servers/plugins/syntaxes/tel.c
+++ b/ldap/servers/plugins/syntaxes/tel.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/syntaxes/value.c b/ldap/servers/plugins/syntaxes/value.c
index 3d396877..317ebb57 100644
--- a/ldap/servers/plugins/syntaxes/value.c
+++ b/ldap/servers/plugins/syntaxes/value.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/uiduniq/7bit.c b/ldap/servers/plugins/uiduniq/7bit.c
index 71286d5a..cfea16fd 100644
--- a/ldap/servers/plugins/uiduniq/7bit.c
+++ b/ldap/servers/plugins/uiduniq/7bit.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/uiduniq/Makefile b/ldap/servers/plugins/uiduniq/Makefile
index 1839a382..e697cf42 100644
--- a/ldap/servers/plugins/uiduniq/Makefile
+++ b/ldap/servers/plugins/uiduniq/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/uiduniq/UID-Notes b/ldap/servers/plugins/uiduniq/UID-Notes
index 1d195a02..ec47d323 100644
--- a/ldap/servers/plugins/uiduniq/UID-Notes
+++ b/ldap/servers/plugins/uiduniq/UID-Notes
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/uiduniq/libuiduniq.def b/ldap/servers/plugins/uiduniq/libuiduniq.def
index e2fcf6f9..f8a116ad 100644
--- a/ldap/servers/plugins/uiduniq/libuiduniq.def
+++ b/ldap/servers/plugins/uiduniq/libuiduniq.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/uiduniq/uid.c b/ldap/servers/plugins/uiduniq/uid.c
index 433ccbe0..10beab34 100644
--- a/ldap/servers/plugins/uiduniq/uid.c
+++ b/ldap/servers/plugins/uiduniq/uid.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/vattrsp_template/Makefile b/ldap/servers/plugins/vattrsp_template/Makefile
index 04622ac0..cbcade9b 100644
--- a/ldap/servers/plugins/vattrsp_template/Makefile
+++ b/ldap/servers/plugins/vattrsp_template/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/vattrsp_template/dllmain.c b/ldap/servers/plugins/vattrsp_template/dllmain.c
index 852ee2f2..78d47523 100644
--- a/ldap/servers/plugins/vattrsp_template/dllmain.c
+++ b/ldap/servers/plugins/vattrsp_template/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/vattrsp_template/vattrsp.c b/ldap/servers/plugins/vattrsp_template/vattrsp.c
index d9e419b6..bb67cfa3 100644
--- a/ldap/servers/plugins/vattrsp_template/vattrsp.c
+++ b/ldap/servers/plugins/vattrsp_template/vattrsp.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/vattrsp_template/vattrsp.def b/ldap/servers/plugins/vattrsp_template/vattrsp.def
index 44efc081..e5734b6c 100644
--- a/ldap/servers/plugins/vattrsp_template/vattrsp.def
+++ b/ldap/servers/plugins/vattrsp_template/vattrsp.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/views/Makefile b/ldap/servers/plugins/views/Makefile
index 364fedeb..bf49db96 100644
--- a/ldap/servers/plugins/views/Makefile
+++ b/ldap/servers/plugins/views/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/views/dllmain.c b/ldap/servers/plugins/views/dllmain.c
index 852ee2f2..78d47523 100644
--- a/ldap/servers/plugins/views/dllmain.c
+++ b/ldap/servers/plugins/views/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/views/views.c b/ldap/servers/plugins/views/views.c
index 5350d883..0377dea2 100644
--- a/ldap/servers/plugins/views/views.c
+++ b/ldap/servers/plugins/views/views.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/plugins/views/views.def b/ldap/servers/plugins/views/views.def
index 2b5645e6..b440d1e1 100644
--- a/ldap/servers/plugins/views/views.def
+++ b/ldap/servers/plugins/views/views.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile
index 64858b21..2e19f6b4 100644
--- a/ldap/servers/slapd/Makefile
+++ b/ldap/servers/slapd/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/abandon.c b/ldap/servers/slapd/abandon.c
index 0c65a61e..a87a5d07 100644
--- a/ldap/servers/slapd/abandon.c
+++ b/ldap/servers/slapd/abandon.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/add.c b/ldap/servers/slapd/add.c
index 17100577..bdae324a 100644
--- a/ldap/servers/slapd/add.c
+++ b/ldap/servers/slapd/add.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/agtmmap.c b/ldap/servers/slapd/agtmmap.c
index fb773024..cc950f5e 100644
--- a/ldap/servers/slapd/agtmmap.c
+++ b/ldap/servers/slapd/agtmmap.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/agtmmap.h b/ldap/servers/slapd/agtmmap.h
index 6c1fe801..e5488d6d 100644
--- a/ldap/servers/slapd/agtmmap.h
+++ b/ldap/servers/slapd/agtmmap.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/apibroker.c b/ldap/servers/slapd/apibroker.c
index 4aaf145c..14c38649 100644
--- a/ldap/servers/slapd/apibroker.c
+++ b/ldap/servers/slapd/apibroker.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/attr.c b/ldap/servers/slapd/attr.c
index 51350c80..9f8c9f96 100644
--- a/ldap/servers/slapd/attr.c
+++ b/ldap/servers/slapd/attr.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/attrlist.c b/ldap/servers/slapd/attrlist.c
index d7a95a2b..8fd89fcb 100644
--- a/ldap/servers/slapd/attrlist.c
+++ b/ldap/servers/slapd/attrlist.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/attrsyntax.c b/ldap/servers/slapd/attrsyntax.c
index 80ee7a6a..9d2293d2 100644
--- a/ldap/servers/slapd/attrsyntax.c
+++ b/ldap/servers/slapd/attrsyntax.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/auditlog.c b/ldap/servers/slapd/auditlog.c
index b9e7d114..2a079b2a 100644
--- a/ldap/servers/slapd/auditlog.c
+++ b/ldap/servers/slapd/auditlog.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/auth.c b/ldap/servers/slapd/auth.c
index 71460338..ccd2bf05 100644
--- a/ldap/servers/slapd/auth.c
+++ b/ldap/servers/slapd/auth.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/auth.h b/ldap/servers/slapd/auth.h
index e19881f2..4106b5a2 100644
--- a/ldap/servers/slapd/auth.h
+++ b/ldap/servers/slapd/auth.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ava.c b/ldap/servers/slapd/ava.c
index d1f2282e..a1974db8 100644
--- a/ldap/servers/slapd/ava.c
+++ b/ldap/servers/slapd/ava.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/Makefile b/ldap/servers/slapd/back-ldbm/Makefile
index 55076d3f..9066dd30 100644
--- a/ldap/servers/slapd/back-ldbm/Makefile
+++ b/ldap/servers/slapd/back-ldbm/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ancestorid.c b/ldap/servers/slapd/back-ldbm/ancestorid.c
index b4e00cb8..e40388e1 100644
--- a/ldap/servers/slapd/back-ldbm/ancestorid.c
+++ b/ldap/servers/slapd/back-ldbm/ancestorid.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/archive.c b/ldap/servers/slapd/back-ldbm/archive.c
index 6d486334..b047c0d3 100644
--- a/ldap/servers/slapd/back-ldbm/archive.c
+++ b/ldap/servers/slapd/back-ldbm/archive.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/attrcrypt.h b/ldap/servers/slapd/back-ldbm/attrcrypt.h
index ad13b326..f7df35ab 100644
--- a/ldap/servers/slapd/back-ldbm/attrcrypt.h
+++ b/ldap/servers/slapd/back-ldbm/attrcrypt.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h
index 3d2bb8d0..1b7e48bb 100644
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/backentry.c b/ldap/servers/slapd/back-ldbm/backentry.c
index aa7ad12d..362c3ec9 100644
--- a/ldap/servers/slapd/back-ldbm/backentry.c
+++ b/ldap/servers/slapd/back-ldbm/backentry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/cache.c b/ldap/servers/slapd/back-ldbm/cache.c
index 908eae71..1f099897 100644
--- a/ldap/servers/slapd/back-ldbm/cache.c
+++ b/ldap/servers/slapd/back-ldbm/cache.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/cleanup.c b/ldap/servers/slapd/back-ldbm/cleanup.c
index c0c28e21..c729397c 100644
--- a/ldap/servers/slapd/back-ldbm/cleanup.c
+++ b/ldap/servers/slapd/back-ldbm/cleanup.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/close.c b/ldap/servers/slapd/back-ldbm/close.c
index 4f05c888..e01cc3c3 100644
--- a/ldap/servers/slapd/back-ldbm/close.c
+++ b/ldap/servers/slapd/back-ldbm/close.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dbhelp.c b/ldap/servers/slapd/back-ldbm/dbhelp.c
index 2f0ed578..5ad59e84 100644
--- a/ldap/servers/slapd/back-ldbm/dbhelp.c
+++ b/ldap/servers/slapd/back-ldbm/dbhelp.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
index f9a2b8b2..d633849b 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.h b/ldap/servers/slapd/back-ldbm/dblayer.h
index 4b0c2460..4c4e1aaa 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.h
+++ b/ldap/servers/slapd/back-ldbm/dblayer.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dbsize.c b/ldap/servers/slapd/back-ldbm/dbsize.c
index 3a2db502..01af727d 100644
--- a/ldap/servers/slapd/back-ldbm/dbsize.c
+++ b/ldap/servers/slapd/back-ldbm/dbsize.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dbtest.c b/ldap/servers/slapd/back-ldbm/dbtest.c
index 1cac566d..5ec13173 100644
--- a/ldap/servers/slapd/back-ldbm/dbtest.c
+++ b/ldap/servers/slapd/back-ldbm/dbtest.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dbversion.c b/ldap/servers/slapd/back-ldbm/dbversion.c
index cfccc108..017e5e88 100644
--- a/ldap/servers/slapd/back-ldbm/dbversion.c
+++ b/ldap/servers/slapd/back-ldbm/dbversion.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dllmain.c b/ldap/servers/slapd/back-ldbm/dllmain.c
index 75893c0b..187f78b8 100644
--- a/ldap/servers/slapd/back-ldbm/dllmain.c
+++ b/ldap/servers/slapd/back-ldbm/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/dn2entry.c b/ldap/servers/slapd/back-ldbm/dn2entry.c
index 5bd44dbe..92bf30db 100644
--- a/ldap/servers/slapd/back-ldbm/dn2entry.c
+++ b/ldap/servers/slapd/back-ldbm/dn2entry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/entrystore.c b/ldap/servers/slapd/back-ldbm/entrystore.c
index fd96c0aa..6d71a38f 100644
--- a/ldap/servers/slapd/back-ldbm/entrystore.c
+++ b/ldap/servers/slapd/back-ldbm/entrystore.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/filterindex.c b/ldap/servers/slapd/back-ldbm/filterindex.c
index 78388f93..203f732d 100644
--- a/ldap/servers/slapd/back-ldbm/filterindex.c
+++ b/ldap/servers/slapd/back-ldbm/filterindex.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/findentry.c b/ldap/servers/slapd/back-ldbm/findentry.c
index 0d748d6f..b676c098 100644
--- a/ldap/servers/slapd/back-ldbm/findentry.c
+++ b/ldap/servers/slapd/back-ldbm/findentry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/haschildren.c b/ldap/servers/slapd/back-ldbm/haschildren.c
index 085c94f9..2cee1eb3 100644
--- a/ldap/servers/slapd/back-ldbm/haschildren.c
+++ b/ldap/servers/slapd/back-ldbm/haschildren.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/id2entry.c b/ldap/servers/slapd/back-ldbm/id2entry.c
index f55c22ca..f4b89c55 100644
--- a/ldap/servers/slapd/back-ldbm/id2entry.c
+++ b/ldap/servers/slapd/back-ldbm/id2entry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/idl.c b/ldap/servers/slapd/back-ldbm/idl.c
index d7927efd..e2c86d86 100644
--- a/ldap/servers/slapd/back-ldbm/idl.c
+++ b/ldap/servers/slapd/back-ldbm/idl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/idl_common.c b/ldap/servers/slapd/back-ldbm/idl_common.c
index b84d4dac..4dd54589 100644
--- a/ldap/servers/slapd/back-ldbm/idl_common.c
+++ b/ldap/servers/slapd/back-ldbm/idl_common.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/idl_new.c b/ldap/servers/slapd/back-ldbm/idl_new.c
index 07b365b6..cb391498 100644
--- a/ldap/servers/slapd/back-ldbm/idl_new.c
+++ b/ldap/servers/slapd/back-ldbm/idl_new.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/idl_shim.c b/ldap/servers/slapd/back-ldbm/idl_shim.c
index e7911567..9f258e1d 100644
--- a/ldap/servers/slapd/back-ldbm/idl_shim.c
+++ b/ldap/servers/slapd/back-ldbm/idl_shim.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/idlapi.h b/ldap/servers/slapd/back-ldbm/idlapi.h
index eca97bd8..129aec94 100644
--- a/ldap/servers/slapd/back-ldbm/idlapi.h
+++ b/ldap/servers/slapd/back-ldbm/idlapi.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/import-merge.c b/ldap/servers/slapd/back-ldbm/import-merge.c
index 09e9fbb7..e5f817e7 100644
--- a/ldap/servers/slapd/back-ldbm/import-merge.c
+++ b/ldap/servers/slapd/back-ldbm/import-merge.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c
index 1887cece..6add539d 100644
--- a/ldap/servers/slapd/back-ldbm/import-threads.c
+++ b/ldap/servers/slapd/back-ldbm/import-threads.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/import.c b/ldap/servers/slapd/back-ldbm/import.c
index e1135864..0889d894 100644
--- a/ldap/servers/slapd/back-ldbm/import.c
+++ b/ldap/servers/slapd/back-ldbm/import.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/import.h b/ldap/servers/slapd/back-ldbm/import.h
index d21f8003..f9af304c 100644
--- a/ldap/servers/slapd/back-ldbm/import.h
+++ b/ldap/servers/slapd/back-ldbm/import.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c
index 3af8084f..e9fac76d 100644
--- a/ldap/servers/slapd/back-ldbm/index.c
+++ b/ldap/servers/slapd/back-ldbm/index.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/init.c b/ldap/servers/slapd/back-ldbm/init.c
index d723516a..689dca72 100644
--- a/ldap/servers/slapd/back-ldbm/init.c
+++ b/ldap/servers/slapd/back-ldbm/init.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/instance.c b/ldap/servers/slapd/back-ldbm/instance.c
index fdd1afea..f2986808 100644
--- a/ldap/servers/slapd/back-ldbm/instance.c
+++ b/ldap/servers/slapd/back-ldbm/instance.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_abandon.c b/ldap/servers/slapd/back-ldbm/ldbm_abandon.c
index 27ac79fb..28669e3a 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_abandon.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_abandon.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c
index 66dfb795..b0fb93d6 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_add.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attr.c b/ldap/servers/slapd/back-ldbm/ldbm_attr.c
index 97b200d3..af53e796 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attr.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attr.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
index c7cff4fc..fa94025b 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
index aeaf4b8f..1a30cbb4 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_bind.c b/ldap/servers/slapd/back-ldbm/ldbm_bind.c
index 08c7be81..ab62ffee 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_bind.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_bind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_compare.c b/ldap/servers/slapd/back-ldbm/ldbm_compare.c
index 0f1c1045..354c008e 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_compare.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_compare.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index a3d8bab0..7f27b47a 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.h b/ldap/servers/slapd/back-ldbm/ldbm_config.h
index 824865f8..1eb56a49 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.h
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
index 7b54a5b5..d76491a8 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_index_config.c b/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
index 83e08100..ac168701 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
index 85fc8325..f71ca1d2 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
index 88de1295..bd8f8f98 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
index dabccc9c..eda6b091 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c
index 5c9d44d5..e5ac07c8 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_search.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_unbind.c b/ldap/servers/slapd/back-ldbm/ldbm_unbind.c
index 854f38c2..e5f72ae2 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_unbind.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_unbind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
index 97cb6cf9..42c7c06b 100644
--- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
+++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/libback-ldbm.def b/ldap/servers/slapd/back-ldbm/libback-ldbm.def
index 55981cbe..661973d5 100644
--- a/ldap/servers/slapd/back-ldbm/libback-ldbm.def
+++ b/ldap/servers/slapd/back-ldbm/libback-ldbm.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/matchrule.c b/ldap/servers/slapd/back-ldbm/matchrule.c
index 7d82164c..8e7c9401 100644
--- a/ldap/servers/slapd/back-ldbm/matchrule.c
+++ b/ldap/servers/slapd/back-ldbm/matchrule.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/misc.c b/ldap/servers/slapd/back-ldbm/misc.c
index adb70983..64e7a82d 100644
--- a/ldap/servers/slapd/back-ldbm/misc.c
+++ b/ldap/servers/slapd/back-ldbm/misc.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/monitor.c b/ldap/servers/slapd/back-ldbm/monitor.c
index afbae0ce..0e96d333 100644
--- a/ldap/servers/slapd/back-ldbm/monitor.c
+++ b/ldap/servers/slapd/back-ldbm/monitor.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/nextid.c b/ldap/servers/slapd/back-ldbm/nextid.c
index ca4600aa..4671db96 100644
--- a/ldap/servers/slapd/back-ldbm/nextid.c
+++ b/ldap/servers/slapd/back-ldbm/nextid.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/parents.c b/ldap/servers/slapd/back-ldbm/parents.c
index 748b9902..81980bbe 100644
--- a/ldap/servers/slapd/back-ldbm/parents.c
+++ b/ldap/servers/slapd/back-ldbm/parents.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/perfctrs.c b/ldap/servers/slapd/back-ldbm/perfctrs.c
index 57231193..6471b58a 100644
--- a/ldap/servers/slapd/back-ldbm/perfctrs.c
+++ b/ldap/servers/slapd/back-ldbm/perfctrs.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/perfctrs.h b/ldap/servers/slapd/back-ldbm/perfctrs.h
index 07e45634..99e58463 100644
--- a/ldap/servers/slapd/back-ldbm/perfctrs.h
+++ b/ldap/servers/slapd/back-ldbm/perfctrs.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
index 5531102f..d2c28372 100644
--- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/rmdb.c b/ldap/servers/slapd/back-ldbm/rmdb.c
index 495a2cba..36ee6b3a 100644
--- a/ldap/servers/slapd/back-ldbm/rmdb.c
+++ b/ldap/servers/slapd/back-ldbm/rmdb.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/seq.c b/ldap/servers/slapd/back-ldbm/seq.c
index 086e958a..9fb667f2 100644
--- a/ldap/servers/slapd/back-ldbm/seq.c
+++ b/ldap/servers/slapd/back-ldbm/seq.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/sort.c b/ldap/servers/slapd/back-ldbm/sort.c
index 6218b791..07de9e14 100644
--- a/ldap/servers/slapd/back-ldbm/sort.c
+++ b/ldap/servers/slapd/back-ldbm/sort.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/start.c b/ldap/servers/slapd/back-ldbm/start.c
index 538fc543..51a7b061 100644
--- a/ldap/servers/slapd/back-ldbm/start.c
+++ b/ldap/servers/slapd/back-ldbm/start.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile b/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
index e379e37e..20d3e245 100644
--- a/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
+++ b/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/tools/index_dump/index_dump.c b/ldap/servers/slapd/back-ldbm/tools/index_dump/index_dump.c
index a7899dc2..7cf5b76f 100644
--- a/ldap/servers/slapd/back-ldbm/tools/index_dump/index_dump.c
+++ b/ldap/servers/slapd/back-ldbm/tools/index_dump/index_dump.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/uniqueid2entry.c b/ldap/servers/slapd/back-ldbm/uniqueid2entry.c
index 74a063dd..e37b0dd0 100644
--- a/ldap/servers/slapd/back-ldbm/uniqueid2entry.c
+++ b/ldap/servers/slapd/back-ldbm/uniqueid2entry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/upgrade.c b/ldap/servers/slapd/back-ldbm/upgrade.c
index fec714b2..7c932ee5 100644
--- a/ldap/servers/slapd/back-ldbm/upgrade.c
+++ b/ldap/servers/slapd/back-ldbm/upgrade.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/vlv.c b/ldap/servers/slapd/back-ldbm/vlv.c
index c1554f69..7185a351 100644
--- a/ldap/servers/slapd/back-ldbm/vlv.c
+++ b/ldap/servers/slapd/back-ldbm/vlv.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/vlv_key.c b/ldap/servers/slapd/back-ldbm/vlv_key.c
index ef519dbc..80524867 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_key.c
+++ b/ldap/servers/slapd/back-ldbm/vlv_key.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/vlv_key.h b/ldap/servers/slapd/back-ldbm/vlv_key.h
index 2f06899c..f9892403 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_key.h
+++ b/ldap/servers/slapd/back-ldbm/vlv_key.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/vlv_srch.c b/ldap/servers/slapd/back-ldbm/vlv_srch.c
index 2219d9ec..892b9125 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_srch.c
+++ b/ldap/servers/slapd/back-ldbm/vlv_srch.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldbm/vlv_srch.h b/ldap/servers/slapd/back-ldbm/vlv_srch.h
index 0205abec..87f1b0b7 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_srch.h
+++ b/ldap/servers/slapd/back-ldbm/vlv_srch.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/Makefile b/ldap/servers/slapd/back-ldif/Makefile
index d1b5af4d..3b5ea958 100644
--- a/ldap/servers/slapd/back-ldif/Makefile
+++ b/ldap/servers/slapd/back-ldif/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/add.c b/ldap/servers/slapd/back-ldif/add.c
index 80f354fe..f78c11dd 100644
--- a/ldap/servers/slapd/back-ldif/add.c
+++ b/ldap/servers/slapd/back-ldif/add.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/back-ldif.h b/ldap/servers/slapd/back-ldif/back-ldif.h
index 579efb4d..1c9b4d47 100644
--- a/ldap/servers/slapd/back-ldif/back-ldif.h
+++ b/ldap/servers/slapd/back-ldif/back-ldif.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/bind.c b/ldap/servers/slapd/back-ldif/bind.c
index 375279e1..c370adaa 100644
--- a/ldap/servers/slapd/back-ldif/bind.c
+++ b/ldap/servers/slapd/back-ldif/bind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/close.c b/ldap/servers/slapd/back-ldif/close.c
index 5fb407e5..037caa52 100644
--- a/ldap/servers/slapd/back-ldif/close.c
+++ b/ldap/servers/slapd/back-ldif/close.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/compare.c b/ldap/servers/slapd/back-ldif/compare.c
index eb4e236c..c3748db2 100644
--- a/ldap/servers/slapd/back-ldif/compare.c
+++ b/ldap/servers/slapd/back-ldif/compare.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/config.c b/ldap/servers/slapd/back-ldif/config.c
index 2ba1245d..593738ff 100644
--- a/ldap/servers/slapd/back-ldif/config.c
+++ b/ldap/servers/slapd/back-ldif/config.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/delete.c b/ldap/servers/slapd/back-ldif/delete.c
index d7fab7ea..c0f89453 100644
--- a/ldap/servers/slapd/back-ldif/delete.c
+++ b/ldap/servers/slapd/back-ldif/delete.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/dllmain.c b/ldap/servers/slapd/back-ldif/dllmain.c
index 26777463..9dc45e74 100644
--- a/ldap/servers/slapd/back-ldif/dllmain.c
+++ b/ldap/servers/slapd/back-ldif/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/init.c b/ldap/servers/slapd/back-ldif/init.c
index cdfaedc2..7d95021e 100644
--- a/ldap/servers/slapd/back-ldif/init.c
+++ b/ldap/servers/slapd/back-ldif/init.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/libback-ldif.def b/ldap/servers/slapd/back-ldif/libback-ldif.def
index 3306b513..6665d0b1 100644
--- a/ldap/servers/slapd/back-ldif/libback-ldif.def
+++ b/ldap/servers/slapd/back-ldif/libback-ldif.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/modify.c b/ldap/servers/slapd/back-ldif/modify.c
index 3b0d125b..50d68ed5 100644
--- a/ldap/servers/slapd/back-ldif/modify.c
+++ b/ldap/servers/slapd/back-ldif/modify.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/modrdn.c b/ldap/servers/slapd/back-ldif/modrdn.c
index e9556f97..5cb75ea1 100644
--- a/ldap/servers/slapd/back-ldif/modrdn.c
+++ b/ldap/servers/slapd/back-ldif/modrdn.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/monitor.c b/ldap/servers/slapd/back-ldif/monitor.c
index 5a19b272..a70f69ed 100644
--- a/ldap/servers/slapd/back-ldif/monitor.c
+++ b/ldap/servers/slapd/back-ldif/monitor.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/search.c b/ldap/servers/slapd/back-ldif/search.c
index e3b70443..e93cd85c 100644
--- a/ldap/servers/slapd/back-ldif/search.c
+++ b/ldap/servers/slapd/back-ldif/search.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/start.c b/ldap/servers/slapd/back-ldif/start.c
index fb5b31aa..7e0bff41 100644
--- a/ldap/servers/slapd/back-ldif/start.c
+++ b/ldap/servers/slapd/back-ldif/start.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/back-ldif/unbind.c b/ldap/servers/slapd/back-ldif/unbind.c
index d88820bb..f1684871 100644
--- a/ldap/servers/slapd/back-ldif/unbind.c
+++ b/ldap/servers/slapd/back-ldif/unbind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/backend.c b/ldap/servers/slapd/backend.c
index b465a37e..0b04a548 100644
--- a/ldap/servers/slapd/backend.c
+++ b/ldap/servers/slapd/backend.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/backend_manager.c b/ldap/servers/slapd/backend_manager.c
index 4f3533ad..d22e1919 100644
--- a/ldap/servers/slapd/backend_manager.c
+++ b/ldap/servers/slapd/backend_manager.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/bind.c b/ldap/servers/slapd/bind.c
index aea98153..df8f816a 100644
--- a/ldap/servers/slapd/bind.c
+++ b/ldap/servers/slapd/bind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/bitset.c b/ldap/servers/slapd/bitset.c
index 6462201f..1d93597c 100644
--- a/ldap/servers/slapd/bitset.c
+++ b/ldap/servers/slapd/bitset.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/bulk_import.c b/ldap/servers/slapd/bulk_import.c
index aa06b334..f12bcdaf 100644
--- a/ldap/servers/slapd/bulk_import.c
+++ b/ldap/servers/slapd/bulk_import.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ch_malloc.c b/ldap/servers/slapd/ch_malloc.c
index 97cefde2..ab204539 100644
--- a/ldap/servers/slapd/ch_malloc.c
+++ b/ldap/servers/slapd/ch_malloc.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/charray.c b/ldap/servers/slapd/charray.c
index 87cf5d2f..855b2463 100644
--- a/ldap/servers/slapd/charray.c
+++ b/ldap/servers/slapd/charray.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/compare.c b/ldap/servers/slapd/compare.c
index 2bc844f4..e14dc490 100644
--- a/ldap/servers/slapd/compare.c
+++ b/ldap/servers/slapd/compare.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/computed.c b/ldap/servers/slapd/computed.c
index b9c8cbf1..dc58194c 100644
--- a/ldap/servers/slapd/computed.c
+++ b/ldap/servers/slapd/computed.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/config.c b/ldap/servers/slapd/config.c
index 9e6748b9..bc2fd50c 100644
--- a/ldap/servers/slapd/config.c
+++ b/ldap/servers/slapd/config.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/configdse.c b/ldap/servers/slapd/configdse.c
index 4b7cad9b..2d8ffee9 100644
--- a/ldap/servers/slapd/configdse.c
+++ b/ldap/servers/slapd/configdse.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index 4184b7a6..e7a85243 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/conntable.c b/ldap/servers/slapd/conntable.c
index fc55d3a3..3c73b9dd 100644
--- a/ldap/servers/slapd/conntable.c
+++ b/ldap/servers/slapd/conntable.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/control.c b/ldap/servers/slapd/control.c
index 20a89d22..d9cce7d7 100644
--- a/ldap/servers/slapd/control.c
+++ b/ldap/servers/slapd/control.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/counters.c b/ldap/servers/slapd/counters.c
index 1ab58685..ed941712 100644
--- a/ldap/servers/slapd/counters.c
+++ b/ldap/servers/slapd/counters.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/csn.c b/ldap/servers/slapd/csn.c
index 9f76880e..ecabfc4b 100644
--- a/ldap/servers/slapd/csn.c
+++ b/ldap/servers/slapd/csn.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/csngen.c b/ldap/servers/slapd/csngen.c
index 8e272116..dc45da22 100644
--- a/ldap/servers/slapd/csngen.c
+++ b/ldap/servers/slapd/csngen.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/csngen.h b/ldap/servers/slapd/csngen.h
index d72b6e02..b65a19d9 100644
--- a/ldap/servers/slapd/csngen.h
+++ b/ldap/servers/slapd/csngen.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/csnset.c b/ldap/servers/slapd/csnset.c
index bc501ca6..245a4afd 100644
--- a/ldap/servers/slapd/csnset.c
+++ b/ldap/servers/slapd/csnset.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index cf94aef0..658365a0 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/defbackend.c b/ldap/servers/slapd/defbackend.c
index 982262c2..bd727945 100644
--- a/ldap/servers/slapd/defbackend.c
+++ b/ldap/servers/slapd/defbackend.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/delete.c b/ldap/servers/slapd/delete.c
index 93641844..44db6463 100644
--- a/ldap/servers/slapd/delete.c
+++ b/ldap/servers/slapd/delete.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/detach.c b/ldap/servers/slapd/detach.c
index 8c1c02de..de226b4e 100644
--- a/ldap/servers/slapd/detach.c
+++ b/ldap/servers/slapd/detach.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/disconnect_error_strings.h b/ldap/servers/slapd/disconnect_error_strings.h
index e08c1a63..e417e8aa 100644
--- a/ldap/servers/slapd/disconnect_error_strings.h
+++ b/ldap/servers/slapd/disconnect_error_strings.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/disconnect_errors.h b/ldap/servers/slapd/disconnect_errors.h
index 2b5e87fc..85f5f967 100644
--- a/ldap/servers/slapd/disconnect_errors.h
+++ b/ldap/servers/slapd/disconnect_errors.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/dl.c b/ldap/servers/slapd/dl.c
index 2d2b87a1..8daaabd8 100644
--- a/ldap/servers/slapd/dl.c
+++ b/ldap/servers/slapd/dl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/dn.c b/ldap/servers/slapd/dn.c
index 2ff9b749..fe17a6e0 100644
--- a/ldap/servers/slapd/dn.c
+++ b/ldap/servers/slapd/dn.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/dse.c b/ldap/servers/slapd/dse.c
index e0919c30..c26f9fc1 100644
--- a/ldap/servers/slapd/dse.c
+++ b/ldap/servers/slapd/dse.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/dynalib.c b/ldap/servers/slapd/dynalib.c
index f57ea3d3..791dde19 100644
--- a/ldap/servers/slapd/dynalib.c
+++ b/ldap/servers/slapd/dynalib.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c
index d2e3faec..238cad28 100644
--- a/ldap/servers/slapd/entry.c
+++ b/ldap/servers/slapd/entry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c
index eccfead4..0760ca5e 100644
--- a/ldap/servers/slapd/entrywsi.c
+++ b/ldap/servers/slapd/entrywsi.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/errormap.c b/ldap/servers/slapd/errormap.c
index 54bb6c1d..ec484448 100644
--- a/ldap/servers/slapd/errormap.c
+++ b/ldap/servers/slapd/errormap.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/eventq.c b/ldap/servers/slapd/eventq.c
index 29bca229..ca7ab67b 100644
--- a/ldap/servers/slapd/eventq.c
+++ b/ldap/servers/slapd/eventq.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/extendop.c b/ldap/servers/slapd/extendop.c
index 681213b5..0a46c0ad 100644
--- a/ldap/servers/slapd/extendop.c
+++ b/ldap/servers/slapd/extendop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/factory.c b/ldap/servers/slapd/factory.c
index 8e7c79bf..1ad9f297 100644
--- a/ldap/servers/slapd/factory.c
+++ b/ldap/servers/slapd/factory.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/fe.h b/ldap/servers/slapd/fe.h
index 35917072..32040a82 100644
--- a/ldap/servers/slapd/fe.h
+++ b/ldap/servers/slapd/fe.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/fedse.c b/ldap/servers/slapd/fedse.c
index cc25dde8..ef3034d4 100644
--- a/ldap/servers/slapd/fedse.c
+++ b/ldap/servers/slapd/fedse.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/fileio.c b/ldap/servers/slapd/fileio.c
index 9dd55116..13771fda 100644
--- a/ldap/servers/slapd/fileio.c
+++ b/ldap/servers/slapd/fileio.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/filter.c b/ldap/servers/slapd/filter.c
index e13b6ade..cd2c774a 100644
--- a/ldap/servers/slapd/filter.c
+++ b/ldap/servers/slapd/filter.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/filter.h b/ldap/servers/slapd/filter.h
index 2c7f2f6f..93299503 100644
--- a/ldap/servers/slapd/filter.h
+++ b/ldap/servers/slapd/filter.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/filtercmp.c b/ldap/servers/slapd/filtercmp.c
index b99499bc..b820563e 100644
--- a/ldap/servers/slapd/filtercmp.c
+++ b/ldap/servers/slapd/filtercmp.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/filterentry.c b/ldap/servers/slapd/filterentry.c
index ca3c1e61..2d55a234 100644
--- a/ldap/servers/slapd/filterentry.c
+++ b/ldap/servers/slapd/filterentry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/generation.c b/ldap/servers/slapd/generation.c
index def1fcd1..995981c7 100644
--- a/ldap/servers/slapd/generation.c
+++ b/ldap/servers/slapd/generation.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/getfilelist.c b/ldap/servers/slapd/getfilelist.c
index ab4e729d..56b165c6 100644
--- a/ldap/servers/slapd/getfilelist.c
+++ b/ldap/servers/slapd/getfilelist.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/getopt_ext.c b/ldap/servers/slapd/getopt_ext.c
index c0b82443..ac3bbea8 100644
--- a/ldap/servers/slapd/getopt_ext.c
+++ b/ldap/servers/slapd/getopt_ext.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/getopt_ext.h b/ldap/servers/slapd/getopt_ext.h
index bc63aa07..30230a36 100644
--- a/ldap/servers/slapd/getopt_ext.h
+++ b/ldap/servers/slapd/getopt_ext.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/globals.c b/ldap/servers/slapd/globals.c
index ba70ed47..a6077f75 100644
--- a/ldap/servers/slapd/globals.c
+++ b/ldap/servers/slapd/globals.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/house.c b/ldap/servers/slapd/house.c
index 1bc54b70..23791da9 100644
--- a/ldap/servers/slapd/house.c
+++ b/ldap/servers/slapd/house.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/http.h b/ldap/servers/slapd/http.h
index 78f37ac4..26e85309 100644
--- a/ldap/servers/slapd/http.h
+++ b/ldap/servers/slapd/http.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/index_subsys.h b/ldap/servers/slapd/index_subsys.h
index 0a4e3c0b..ee375cf2 100644
--- a/ldap/servers/slapd/index_subsys.h
+++ b/ldap/servers/slapd/index_subsys.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/index_subsystem.c b/ldap/servers/slapd/index_subsystem.c
index 014c05e5..88db257e 100644
--- a/ldap/servers/slapd/index_subsystem.c
+++ b/ldap/servers/slapd/index_subsystem.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/init.c b/ldap/servers/slapd/init.c
index c91e914b..b823942c 100644
--- a/ldap/servers/slapd/init.c
+++ b/ldap/servers/slapd/init.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/intrinsics.h b/ldap/servers/slapd/intrinsics.h
index e5a3d5f8..6ed302b0 100644
--- a/ldap/servers/slapd/intrinsics.h
+++ b/ldap/servers/slapd/intrinsics.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ldbmlinktest.c b/ldap/servers/slapd/ldbmlinktest.c
index b6350aac..015f6411 100644
--- a/ldap/servers/slapd/ldbmlinktest.c
+++ b/ldap/servers/slapd/ldbmlinktest.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/lenstr.c b/ldap/servers/slapd/lenstr.c
index 326237d8..d9e196db 100644
--- a/ldap/servers/slapd/lenstr.c
+++ b/ldap/servers/slapd/lenstr.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index c554f15b..b28d3b80 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/libmakefile b/ldap/servers/slapd/libmakefile
index e17b01da..fdc70aeb 100644
--- a/ldap/servers/slapd/libmakefile
+++ b/ldap/servers/slapd/libmakefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/libsh_stub/Makefile b/ldap/servers/slapd/libsh_stub/Makefile
index 0cd685fd..9614bbed 100644
--- a/ldap/servers/slapd/libsh_stub/Makefile
+++ b/ldap/servers/slapd/libsh_stub/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/libsh_stub/libsh_stub.c b/ldap/servers/slapd/libsh_stub/libsh_stub.c
index 709b556d..e5347f55 100644
--- a/ldap/servers/slapd/libsh_stub/libsh_stub.c
+++ b/ldap/servers/slapd/libsh_stub/libsh_stub.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/libslapd.def b/ldap/servers/slapd/libslapd.def
index 61f0d7fd..074a8873 100644
--- a/ldap/servers/slapd/libslapd.def
+++ b/ldap/servers/slapd/libslapd.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/listConfigAttrs.pl b/ldap/servers/slapd/listConfigAttrs.pl
index 4f430092..ed4826be 100644
--- a/ldap/servers/slapd/listConfigAttrs.pl
+++ b/ldap/servers/slapd/listConfigAttrs.pl
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/lite_entries.c b/ldap/servers/slapd/lite_entries.c
index 0392fc6f..68dfe41f 100644
--- a/ldap/servers/slapd/lite_entries.c
+++ b/ldap/servers/slapd/lite_entries.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/localhost.c b/ldap/servers/slapd/localhost.c
index d87fa2bf..a6c569f0 100644
--- a/ldap/servers/slapd/localhost.c
+++ b/ldap/servers/slapd/localhost.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/lock.c b/ldap/servers/slapd/lock.c
index 064a1d34..847edffb 100644
--- a/ldap/servers/slapd/lock.c
+++ b/ldap/servers/slapd/lock.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/log.c b/ldap/servers/slapd/log.c
index 0430b608..e880f86f 100644
--- a/ldap/servers/slapd/log.c
+++ b/ldap/servers/slapd/log.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/log.h b/ldap/servers/slapd/log.h
index 00c2b2b6..5082184e 100644
--- a/ldap/servers/slapd/log.h
+++ b/ldap/servers/slapd/log.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c
index 3eb207fc..f6aaeca2 100644
--- a/ldap/servers/slapd/main.c
+++ b/ldap/servers/slapd/main.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/mapping_tree.c b/ldap/servers/slapd/mapping_tree.c
index a0320d0d..22a34414 100644
--- a/ldap/servers/slapd/mapping_tree.c
+++ b/ldap/servers/slapd/mapping_tree.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/match.c b/ldap/servers/slapd/match.c
index b62e7688..4ee5e589 100644
--- a/ldap/servers/slapd/match.c
+++ b/ldap/servers/slapd/match.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/mkDBErrStrs.pl b/ldap/servers/slapd/mkDBErrStrs.pl
index ec3b4f65..2db777d9 100755
--- a/ldap/servers/slapd/mkDBErrStrs.pl
+++ b/ldap/servers/slapd/mkDBErrStrs.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/modify.c b/ldap/servers/slapd/modify.c
index f9e87a9c..42a1e154 100644
--- a/ldap/servers/slapd/modify.c
+++ b/ldap/servers/slapd/modify.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/modrdn.c b/ldap/servers/slapd/modrdn.c
index 657af53d..1f53a641 100644
--- a/ldap/servers/slapd/modrdn.c
+++ b/ldap/servers/slapd/modrdn.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/modutil.c b/ldap/servers/slapd/modutil.c
index 225c8004..47739318 100644
--- a/ldap/servers/slapd/modutil.c
+++ b/ldap/servers/slapd/modutil.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/monitor.c b/ldap/servers/slapd/monitor.c
index c6b7ecec..092bca06 100644
--- a/ldap/servers/slapd/monitor.c
+++ b/ldap/servers/slapd/monitor.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntmsgdll/Makefile b/ldap/servers/slapd/ntmsgdll/Makefile
index 2fb1b646..fccb9528 100644
--- a/ldap/servers/slapd/ntmsgdll/Makefile
+++ b/ldap/servers/slapd/ntmsgdll/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.c b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.c
index 6d7ed7c8..b2ee7844 100644
--- a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.c
+++ b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
index aa23addf..77fe4762 100644
--- a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
+++ b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
@@ -27,7 +27,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/Makefile b/ldap/servers/slapd/ntperfdll/Makefile
index a9e850c2..a639b0fc 100644
--- a/ldap/servers/slapd/ntperfdll/Makefile
+++ b/ldap/servers/slapd/ntperfdll/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/exports.def b/ldap/servers/slapd/ntperfdll/exports.def
index 83d1cc67..2a20e0a1 100644
--- a/ldap/servers/slapd/ntperfdll/exports.def
+++ b/ldap/servers/slapd/ntperfdll/exports.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctr.cpp b/ldap/servers/slapd/ntperfdll/nsldapctr.cpp
index 9411f665..4dc36f3b 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctr.cpp
+++ b/ldap/servers/slapd/ntperfdll/nsldapctr.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrdef.h b/ldap/servers/slapd/ntperfdll/nsldapctrdef.h
index 3f1b216d..1c16af00 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrdef.h
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrdef.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrmc.h b/ldap/servers/slapd/ntperfdll/nsldapctrmc.h
index 13e9456b..8bf70f27 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrmc.h
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrmc.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrmc.mc b/ldap/servers/slapd/ntperfdll/nsldapctrmc.mc
index 51012914..343f84e8 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrmc.mc
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrmc.mc
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrmsg.h b/ldap/servers/slapd/ntperfdll/nsldapctrmsg.h
index 3b1b8bc6..fc662cfd 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrmsg.h
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrmsg.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrs.h b/ldap/servers/slapd/ntperfdll/nsldapctrs.h
index b2bda541..7974f76b 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrs.h
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrs.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrs.ini b/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
index dad4ca6a..20868364 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrutil.cpp b/ldap/servers/slapd/ntperfdll/nsldapctrutil.cpp
index 8f5905ff..99be713f 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrutil.cpp
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrutil.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrutil.h b/ldap/servers/slapd/ntperfdll/nsldapctrutil.h
index db4ebd00..8a3ee908 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrutil.h
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrutil.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntperfdll/nsldapreg.ini b/ldap/servers/slapd/ntperfdll/nsldapreg.ini
index c01aa48f..b1ded2f5 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapreg.ini
+++ b/ldap/servers/slapd/ntperfdll/nsldapreg.ini
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntuserpin.c b/ldap/servers/slapd/ntuserpin.c
index 9d4bb5b7..4859903a 100644
--- a/ldap/servers/slapd/ntuserpin.c
+++ b/ldap/servers/slapd/ntuserpin.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntwdog/Makefile b/ldap/servers/slapd/ntwdog/Makefile
index 721643b9..18d5ee1e 100644
--- a/ldap/servers/slapd/ntwdog/Makefile
+++ b/ldap/servers/slapd/ntwdog/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntwdog/cron_conf.c b/ldap/servers/slapd/ntwdog/cron_conf.c
index 624f1114..44d7033b 100644
--- a/ldap/servers/slapd/ntwdog/cron_conf.c
+++ b/ldap/servers/slapd/ntwdog/cron_conf.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntwdog/cron_conf.h b/ldap/servers/slapd/ntwdog/cron_conf.h
index 516a4f9c..d2472611 100644
--- a/ldap/servers/slapd/ntwdog/cron_conf.h
+++ b/ldap/servers/slapd/ntwdog/cron_conf.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.
@@ -34,7 +36,7 @@
* All rights reserved.
* END COPYRIGHT BLOCK **/
/***********************************************************************
-** $Id: cron_conf.h,v 1.3 2005/04/15 22:40:44 nkinder Exp $
+** $Id: cron_conf.h,v 1.4 2005/04/19 22:07:40 nkinder Exp $
**
**
** NAME
diff --git a/ldap/servers/slapd/ntwdog/ntcron.c b/ldap/servers/slapd/ntwdog/ntcron.c
index 8cd830b0..862eb18e 100644
--- a/ldap/servers/slapd/ntwdog/ntcron.c
+++ b/ldap/servers/slapd/ntwdog/ntcron.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ntwdog/ntwatchdog.c b/ldap/servers/slapd/ntwdog/ntwatchdog.c
index a11be490..0a959671 100644
--- a/ldap/servers/slapd/ntwdog/ntwatchdog.c
+++ b/ldap/servers/slapd/ntwdog/ntwatchdog.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/object.c b/ldap/servers/slapd/object.c
index d20297ea..bb2f1c1e 100644
--- a/ldap/servers/slapd/object.c
+++ b/ldap/servers/slapd/object.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/objset.c b/ldap/servers/slapd/objset.c
index e2c0eb2b..0bf12336 100644
--- a/ldap/servers/slapd/objset.c
+++ b/ldap/servers/slapd/objset.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/operation.c b/ldap/servers/slapd/operation.c
index 693be0e6..0fb8eccd 100644
--- a/ldap/servers/slapd/operation.c
+++ b/ldap/servers/slapd/operation.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c
index cbe9cf1d..58d6d4a7 100644
--- a/ldap/servers/slapd/opshared.c
+++ b/ldap/servers/slapd/opshared.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/passwd_extop.c b/ldap/servers/slapd/passwd_extop.c
index c5009761..4455c158 100644
--- a/ldap/servers/slapd/passwd_extop.c
+++ b/ldap/servers/slapd/passwd_extop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c
index a1f5a19e..d08a04f1 100644
--- a/ldap/servers/slapd/pblock.c
+++ b/ldap/servers/slapd/pblock.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/plugin.c b/ldap/servers/slapd/plugin.c
index 02afbdae..cd28d188 100644
--- a/ldap/servers/slapd/plugin.c
+++ b/ldap/servers/slapd/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/ldap/servers/slapd/plugin_acl.c b/ldap/servers/slapd/plugin_acl.c
index f8493496..7d61b359 100644
--- a/ldap/servers/slapd/plugin_acl.c
+++ b/ldap/servers/slapd/plugin_acl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/plugin_internal_op.c b/ldap/servers/slapd/plugin_internal_op.c
index 5b53b501..81513e37 100644
--- a/ldap/servers/slapd/plugin_internal_op.c
+++ b/ldap/servers/slapd/plugin_internal_op.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/plugin_mr.c b/ldap/servers/slapd/plugin_mr.c
index 9a9d74f4..c7a09db4 100644
--- a/ldap/servers/slapd/plugin_mr.c
+++ b/ldap/servers/slapd/plugin_mr.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/plugin_role.c b/ldap/servers/slapd/plugin_role.c
index d4eb31d1..aff6cb9c 100644
--- a/ldap/servers/slapd/plugin_role.c
+++ b/ldap/servers/slapd/plugin_role.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/plugin_syntax.c b/ldap/servers/slapd/plugin_syntax.c
index d0ba886f..7859a3f4 100644
--- a/ldap/servers/slapd/plugin_syntax.c
+++ b/ldap/servers/slapd/plugin_syntax.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/poll_using_select.c b/ldap/servers/slapd/poll_using_select.c
index 3266fc5f..e32f8dbd 100644
--- a/ldap/servers/slapd/poll_using_select.c
+++ b/ldap/servers/slapd/poll_using_select.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/poll_using_select.h b/ldap/servers/slapd/poll_using_select.h
index 9de3f174..17d417fb 100644
--- a/ldap/servers/slapd/poll_using_select.h
+++ b/ldap/servers/slapd/poll_using_select.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/prerrstrs.h b/ldap/servers/slapd/prerrstrs.h
index e5d4154c..f7ae3f0a 100644
--- a/ldap/servers/slapd/prerrstrs.h
+++ b/ldap/servers/slapd/prerrstrs.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/protect_db.c b/ldap/servers/slapd/protect_db.c
index aed642e8..db628419 100644
--- a/ldap/servers/slapd/protect_db.c
+++ b/ldap/servers/slapd/protect_db.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/protect_db.h b/ldap/servers/slapd/protect_db.h
index 3ac84589..9c6e1a6e 100644
--- a/ldap/servers/slapd/protect_db.h
+++ b/ldap/servers/slapd/protect_db.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index 406ffde7..5f37b920 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/psearch.c b/ldap/servers/slapd/psearch.c
index 2f5f4169..48110938 100644
--- a/ldap/servers/slapd/psearch.c
+++ b/ldap/servers/slapd/psearch.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/pw.c b/ldap/servers/slapd/pw.c
index f85493c3..a377a334 100644
--- a/ldap/servers/slapd/pw.c
+++ b/ldap/servers/slapd/pw.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/pw.h b/ldap/servers/slapd/pw.h
index fa0afc75..734e6331 100644
--- a/ldap/servers/slapd/pw.h
+++ b/ldap/servers/slapd/pw.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/pw_mgmt.c b/ldap/servers/slapd/pw_mgmt.c
index 50b77e8e..2c3de026 100644
--- a/ldap/servers/slapd/pw_mgmt.c
+++ b/ldap/servers/slapd/pw_mgmt.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/pw_retry.c b/ldap/servers/slapd/pw_retry.c
index 8a3a3172..e0adbddb 100644
--- a/ldap/servers/slapd/pw_retry.c
+++ b/ldap/servers/slapd/pw_retry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/rdn.c b/ldap/servers/slapd/rdn.c
index 68f5c412..cf8b2a38 100644
--- a/ldap/servers/slapd/rdn.c
+++ b/ldap/servers/slapd/rdn.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/referral.c b/ldap/servers/slapd/referral.c
index 873ed064..5d4f8941 100644
--- a/ldap/servers/slapd/referral.c
+++ b/ldap/servers/slapd/referral.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/regex.c b/ldap/servers/slapd/regex.c
index cf8d5ab5..e112705b 100644
--- a/ldap/servers/slapd/regex.c
+++ b/ldap/servers/slapd/regex.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.
@@ -84,6 +86,9 @@ slapd_re_unlock( void )
* Modification history:
*
* $Log: regex.c,v $
+ * Revision 1.4 2005/04/19 22:07:37 nkinder
+ * Fixed licensing typo
+ *
* Revision 1.3 2005/04/15 22:40:35 nkinder
* 155068 - Added license to source files
*
diff --git a/ldap/servers/slapd/resourcelimit.c b/ldap/servers/slapd/resourcelimit.c
index 8da6d673..a73b0211 100644
--- a/ldap/servers/slapd/resourcelimit.c
+++ b/ldap/servers/slapd/resourcelimit.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/result.c b/ldap/servers/slapd/result.c
index 07e975c8..dc26e986 100644
--- a/ldap/servers/slapd/result.c
+++ b/ldap/servers/slapd/result.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/rootdse.c b/ldap/servers/slapd/rootdse.c
index d14b7300..36a70925 100644
--- a/ldap/servers/slapd/rootdse.c
+++ b/ldap/servers/slapd/rootdse.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/rwlock.c b/ldap/servers/slapd/rwlock.c
index ce5f7c76..0943aa3e 100644
--- a/ldap/servers/slapd/rwlock.c
+++ b/ldap/servers/slapd/rwlock.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/rwlock.h b/ldap/servers/slapd/rwlock.h
index eb73e07a..8d3bcdc6 100644
--- a/ldap/servers/slapd/rwlock.h
+++ b/ldap/servers/slapd/rwlock.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/sasl_io.c b/ldap/servers/slapd/sasl_io.c
index 9ee5dc40..70d1b98e 100644
--- a/ldap/servers/slapd/sasl_io.c
+++ b/ldap/servers/slapd/sasl_io.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/sasl_map.c b/ldap/servers/slapd/sasl_map.c
index a7e1bade..c1f6065c 100644
--- a/ldap/servers/slapd/sasl_map.c
+++ b/ldap/servers/slapd/sasl_map.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c
index 3ba31f6a..af8eb6de 100644
--- a/ldap/servers/slapd/saslbind.c
+++ b/ldap/servers/slapd/saslbind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/schema.c b/ldap/servers/slapd/schema.c
index 19b46136..6ce43a52 100644
--- a/ldap/servers/slapd/schema.c
+++ b/ldap/servers/slapd/schema.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/schemaparse.c b/ldap/servers/slapd/schemaparse.c
index 26a3c10d..994f7819 100644
--- a/ldap/servers/slapd/schemaparse.c
+++ b/ldap/servers/slapd/schemaparse.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/search.c b/ldap/servers/slapd/search.c
index f9935a72..f52cd53e 100644
--- a/ldap/servers/slapd/search.c
+++ b/ldap/servers/slapd/search.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/secerrstrs.h b/ldap/servers/slapd/secerrstrs.h
index e88064fe..2fb17527 100644
--- a/ldap/servers/slapd/secerrstrs.h
+++ b/ldap/servers/slapd/secerrstrs.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/security_wrappers.c b/ldap/servers/slapd/security_wrappers.c
index fd30c166..6384e926 100644
--- a/ldap/servers/slapd/security_wrappers.c
+++ b/ldap/servers/slapd/security_wrappers.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 7ded0a3a..380d773e 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/slapd.lite.key b/ldap/servers/slapd/slapd.lite.key
index 50dc8da4..75baaefb 100644
--- a/ldap/servers/slapd/slapd.lite.key
+++ b/ldap/servers/slapd/slapd.lite.key
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/slapd.normal.key b/ldap/servers/slapd/slapd.normal.key
index c60b6d9b..2a607044 100644
--- a/ldap/servers/slapd/slapd.normal.key
+++ b/ldap/servers/slapd/slapd.normal.key
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/slapd_plhash.c b/ldap/servers/slapd/slapd_plhash.c
index 0d7f15db..c07a1f0c 100644
--- a/ldap/servers/slapd/slapd_plhash.c
+++ b/ldap/servers/slapd/slapd_plhash.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/slapi-plugin-compat4.h b/ldap/servers/slapd/slapi-plugin-compat4.h
index b49ada22..cecf7b30 100644
--- a/ldap/servers/slapd/slapi-plugin-compat4.h
+++ b/ldap/servers/slapd/slapi-plugin-compat4.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index e3f6e389..e4b80725 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-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/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h
index 35f0a80d..27b5609b 100644
--- a/ldap/servers/slapd/slapi-private.h
+++ b/ldap/servers/slapd/slapi-private.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/slapi2nspr.c b/ldap/servers/slapd/slapi2nspr.c
index 5066a77a..41bd7e4e 100644
--- a/ldap/servers/slapd/slapi2nspr.c
+++ b/ldap/servers/slapd/slapi2nspr.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/snmp_collator.c b/ldap/servers/slapd/snmp_collator.c
index 3d5c05a5..79838247 100644
--- a/ldap/servers/slapd/snmp_collator.c
+++ b/ldap/servers/slapd/snmp_collator.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/snmp_collator.h b/ldap/servers/slapd/snmp_collator.h
index b9bc5d2d..2a55d73a 100644
--- a/ldap/servers/slapd/snmp_collator.h
+++ b/ldap/servers/slapd/snmp_collator.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/snoop.c b/ldap/servers/slapd/snoop.c
index b7d203d4..924bfdec 100644
--- a/ldap/servers/slapd/snoop.c
+++ b/ldap/servers/slapd/snoop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/ssl.c b/ldap/servers/slapd/ssl.c
index a5b57494..e88c3446 100644
--- a/ldap/servers/slapd/ssl.c
+++ b/ldap/servers/slapd/ssl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/sslerrstrs.h b/ldap/servers/slapd/sslerrstrs.h
index 7253c489..17cc08eb 100644
--- a/ldap/servers/slapd/sslerrstrs.h
+++ b/ldap/servers/slapd/sslerrstrs.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/start_tls_extop.c b/ldap/servers/slapd/start_tls_extop.c
index 2b49dbda..443d12f5 100644
--- a/ldap/servers/slapd/start_tls_extop.c
+++ b/ldap/servers/slapd/start_tls_extop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/statechange.h b/ldap/servers/slapd/statechange.h
index 446fa6b2..757c5091 100644
--- a/ldap/servers/slapd/statechange.h
+++ b/ldap/servers/slapd/statechange.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/str2filter.c b/ldap/servers/slapd/str2filter.c
index 276aa0c9..a69d27d6 100644
--- a/ldap/servers/slapd/str2filter.c
+++ b/ldap/servers/slapd/str2filter.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/strdup.c b/ldap/servers/slapd/strdup.c
index 1839e655..fd44e0e2 100644
--- a/ldap/servers/slapd/strdup.c
+++ b/ldap/servers/slapd/strdup.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/stubrepl.c b/ldap/servers/slapd/stubrepl.c
index ce8d3ed5..76b94897 100644
--- a/ldap/servers/slapd/stubrepl.c
+++ b/ldap/servers/slapd/stubrepl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/stubs.c b/ldap/servers/slapd/stubs.c
index fc03d39c..ff006173 100644
--- a/ldap/servers/slapd/stubs.c
+++ b/ldap/servers/slapd/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/ldap/servers/slapd/subentry.c b/ldap/servers/slapd/subentry.c
index d01863a0..93b0602e 100644
--- a/ldap/servers/slapd/subentry.c
+++ b/ldap/servers/slapd/subentry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/task.c b/ldap/servers/slapd/task.c
index 12abff15..76495f27 100644
--- a/ldap/servers/slapd/task.c
+++ b/ldap/servers/slapd/task.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/tempnam.c b/ldap/servers/slapd/tempnam.c
index faec0c9d..dd77714b 100644
--- a/ldap/servers/slapd/tempnam.c
+++ b/ldap/servers/slapd/tempnam.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile b/ldap/servers/slapd/test-plugins/Makefile
index eea4f992..024e2ebb 100644
--- a/ldap/servers/slapd/test-plugins/Makefile
+++ b/ldap/servers/slapd/test-plugins/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.AIX b/ldap/servers/slapd/test-plugins/Makefile.AIX
index 8c68d486..d7bda4a8 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.AIX
+++ b/ldap/servers/slapd/test-plugins/Makefile.AIX
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.BSDI b/ldap/servers/slapd/test-plugins/Makefile.BSDI
index 98ccef1f..4b2eccfe 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.BSDI
+++ b/ldap/servers/slapd/test-plugins/Makefile.BSDI
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.HPUX b/ldap/servers/slapd/test-plugins/Makefile.HPUX
index a7ef63ab..a2e7abdb 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.HPUX
+++ b/ldap/servers/slapd/test-plugins/Makefile.HPUX
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.HPUX64 b/ldap/servers/slapd/test-plugins/Makefile.HPUX64
index 2220f2a4..e6018687 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.HPUX64
+++ b/ldap/servers/slapd/test-plugins/Makefile.HPUX64
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.IRIX b/ldap/servers/slapd/test-plugins/Makefile.IRIX
index 4afd2a53..fbe1086f 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.IRIX
+++ b/ldap/servers/slapd/test-plugins/Makefile.IRIX
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.Linux b/ldap/servers/slapd/test-plugins/Makefile.Linux
index 7076ccf1..d69b5877 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.Linux
+++ b/ldap/servers/slapd/test-plugins/Makefile.Linux
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.OSF1 b/ldap/servers/slapd/test-plugins/Makefile.OSF1
index 96faeb66..fd9f9353 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.OSF1
+++ b/ldap/servers/slapd/test-plugins/Makefile.OSF1
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.ReliantUNIX b/ldap/servers/slapd/test-plugins/Makefile.ReliantUNIX
index 98ccef1f..4b2eccfe 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.ReliantUNIX
+++ b/ldap/servers/slapd/test-plugins/Makefile.ReliantUNIX
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.SOLARIS b/ldap/servers/slapd/test-plugins/Makefile.SOLARIS
index 3eb2c7b7..13ded851 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.SOLARIS
+++ b/ldap/servers/slapd/test-plugins/Makefile.SOLARIS
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.SOLARIS64 b/ldap/servers/slapd/test-plugins/Makefile.SOLARIS64
index 50509bb4..bae2cb08 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.SOLARIS64
+++ b/ldap/servers/slapd/test-plugins/Makefile.SOLARIS64
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.SOLARISx86 b/ldap/servers/slapd/test-plugins/Makefile.SOLARISx86
index 98ccef1f..4b2eccfe 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.SOLARISx86
+++ b/ldap/servers/slapd/test-plugins/Makefile.SOLARISx86
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.UnixWare b/ldap/servers/slapd/test-plugins/Makefile.UnixWare
index 98ccef1f..4b2eccfe 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.UnixWare
+++ b/ldap/servers/slapd/test-plugins/Makefile.UnixWare
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.UnixWareUDK b/ldap/servers/slapd/test-plugins/Makefile.UnixWareUDK
index 98ccef1f..4b2eccfe 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.UnixWareUDK
+++ b/ldap/servers/slapd/test-plugins/Makefile.UnixWareUDK
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.WINNT b/ldap/servers/slapd/test-plugins/Makefile.WINNT
index 7c9ef52a..6dd08ec8 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.WINNT
+++ b/ldap/servers/slapd/test-plugins/Makefile.WINNT
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/Makefile.server b/ldap/servers/slapd/test-plugins/Makefile.server
index 763eaf0d..d055ddd8 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.server
+++ b/ldap/servers/slapd/test-plugins/Makefile.server
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/README b/ldap/servers/slapd/test-plugins/README
index d34500b6..7dbec119 100644
--- a/ldap/servers/slapd/test-plugins/README
+++ b/ldap/servers/slapd/test-plugins/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/ldap/servers/slapd/test-plugins/clients/README b/ldap/servers/slapd/test-plugins/clients/README
index 83c4f15e..9e323dc4 100644
--- a/ldap/servers/slapd/test-plugins/clients/README
+++ b/ldap/servers/slapd/test-plugins/clients/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/ldap/servers/slapd/test-plugins/clients/ReqExtOp.java b/ldap/servers/slapd/test-plugins/clients/ReqExtOp.java
index b96cb095..367af56f 100644
--- a/ldap/servers/slapd/test-plugins/clients/ReqExtOp.java
+++ b/ldap/servers/slapd/test-plugins/clients/ReqExtOp.java
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/clients/reqextop.c b/ldap/servers/slapd/test-plugins/clients/reqextop.c
index ca94b975..5687cafb 100644
--- a/ldap/servers/slapd/test-plugins/clients/reqextop.c
+++ b/ldap/servers/slapd/test-plugins/clients/reqextop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/dllmain.c b/ldap/servers/slapd/test-plugins/dllmain.c
index 6ab954b7..17f0a578 100644
--- a/ldap/servers/slapd/test-plugins/dllmain.c
+++ b/ldap/servers/slapd/test-plugins/dllmain.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/installDse.pl b/ldap/servers/slapd/test-plugins/installDse.pl
index eadb3766..973ea320 100755
--- a/ldap/servers/slapd/test-plugins/installDse.pl
+++ b/ldap/servers/slapd/test-plugins/installDse.pl
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/nicknames b/ldap/servers/slapd/test-plugins/nicknames
index 3979b7ac..3e319689 100644
--- a/ldap/servers/slapd/test-plugins/nicknames
+++ b/ldap/servers/slapd/test-plugins/nicknames
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/testbind.c b/ldap/servers/slapd/test-plugins/testbind.c
index 9d596c48..d2fadc7d 100644
--- a/ldap/servers/slapd/test-plugins/testbind.c
+++ b/ldap/servers/slapd/test-plugins/testbind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/testdatainterop.c b/ldap/servers/slapd/test-plugins/testdatainterop.c
index 163d23d6..728a146d 100644
--- a/ldap/servers/slapd/test-plugins/testdatainterop.c
+++ b/ldap/servers/slapd/test-plugins/testdatainterop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/test-plugins/testdbinterop.c b/ldap/servers/slapd/test-plugins/testdbinterop.c
index e932557b..8ba9c6a4 100644
--- a/ldap/servers/slapd/test-plugins/testdbinterop.c
+++ b/ldap/servers/slapd/test-plugins/testdbinterop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/testdbinterop.h b/ldap/servers/slapd/test-plugins/testdbinterop.h
index e852462f..3ee4b442 100644
--- a/ldap/servers/slapd/test-plugins/testdbinterop.h
+++ b/ldap/servers/slapd/test-plugins/testdbinterop.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/test-plugins/testentry.c b/ldap/servers/slapd/test-plugins/testentry.c
index c59dd729..72464d2b 100644
--- a/ldap/servers/slapd/test-plugins/testentry.c
+++ b/ldap/servers/slapd/test-plugins/testentry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/testextendedop.c b/ldap/servers/slapd/test-plugins/testextendedop.c
index 51ed6979..d6e0841d 100644
--- a/ldap/servers/slapd/test-plugins/testextendedop.c
+++ b/ldap/servers/slapd/test-plugins/testextendedop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/testgetip.c b/ldap/servers/slapd/test-plugins/testgetip.c
index 661b34d7..8e781ee4 100644
--- a/ldap/servers/slapd/test-plugins/testgetip.c
+++ b/ldap/servers/slapd/test-plugins/testgetip.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/testplugin.def b/ldap/servers/slapd/test-plugins/testplugin.def
index 8d4dc9e0..8fd0d6d9 100644
--- a/ldap/servers/slapd/test-plugins/testplugin.def
+++ b/ldap/servers/slapd/test-plugins/testplugin.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/testplugin.dsp b/ldap/servers/slapd/test-plugins/testplugin.dsp
index 63a94f1a..5e140565 100644
--- a/ldap/servers/slapd/test-plugins/testplugin.dsp
+++ b/ldap/servers/slapd/test-plugins/testplugin.dsp
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/testplugin.mak b/ldap/servers/slapd/test-plugins/testplugin.mak
index 6b6aa952..6dda603c 100644
--- a/ldap/servers/slapd/test-plugins/testplugin.mak
+++ b/ldap/servers/slapd/test-plugins/testplugin.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/ldap/servers/slapd/test-plugins/testpostop.c b/ldap/servers/slapd/test-plugins/testpostop.c
index 42776a12..f5982592 100644
--- a/ldap/servers/slapd/test-plugins/testpostop.c
+++ b/ldap/servers/slapd/test-plugins/testpostop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/testpreop.c b/ldap/servers/slapd/test-plugins/testpreop.c
index 2dac1280..af3ca1f4 100644
--- a/ldap/servers/slapd/test-plugins/testpreop.c
+++ b/ldap/servers/slapd/test-plugins/testpreop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/test-plugins/testsaslbind.c b/ldap/servers/slapd/test-plugins/testsaslbind.c
index d5941475..295e5d31 100644
--- a/ldap/servers/slapd/test-plugins/testsaslbind.c
+++ b/ldap/servers/slapd/test-plugins/testsaslbind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/time.c b/ldap/servers/slapd/time.c
index 43cdd47d..b4c4ef55 100644
--- a/ldap/servers/slapd/time.c
+++ b/ldap/servers/slapd/time.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/tools/Makefile b/ldap/servers/slapd/tools/Makefile
index 06d8968a..3daa312f 100644
--- a/ldap/servers/slapd/tools/Makefile
+++ b/ldap/servers/slapd/tools/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/tools/dbscan.c b/ldap/servers/slapd/tools/dbscan.c
index 63d66a33..7e1d0a1b 100644
--- a/ldap/servers/slapd/tools/dbscan.c
+++ b/ldap/servers/slapd/tools/dbscan.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/slapd/tools/eggencode.c b/ldap/servers/slapd/tools/eggencode.c
index 7d9f5689..a00d7601 100644
--- a/ldap/servers/slapd/tools/eggencode.c
+++ b/ldap/servers/slapd/tools/eggencode.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/tools/keyupg.c b/ldap/servers/slapd/tools/keyupg.c
index b8aba069..fdb115a0 100644
--- a/ldap/servers/slapd/tools/keyupg.c
+++ b/ldap/servers/slapd/tools/keyupg.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/tools/ldif.c b/ldap/servers/slapd/tools/ldif.c
index 5308517c..08b33424 100644
--- a/ldap/servers/slapd/tools/ldif.c
+++ b/ldap/servers/slapd/tools/ldif.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/tools/migratecred.c b/ldap/servers/slapd/tools/migratecred.c
index 6b9f94ea..d898889a 100644
--- a/ldap/servers/slapd/tools/migratecred.c
+++ b/ldap/servers/slapd/tools/migratecred.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/tools/mkdep.c b/ldap/servers/slapd/tools/mkdep.c
index 056073ec..821aebfb 100644
--- a/ldap/servers/slapd/tools/mkdep.c
+++ b/ldap/servers/slapd/tools/mkdep.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/tools/mmldif.c b/ldap/servers/slapd/tools/mmldif.c
index d3037668..7274930b 100644
--- a/ldap/servers/slapd/tools/mmldif.c
+++ b/ldap/servers/slapd/tools/mmldif.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/tools/pwenc.c b/ldap/servers/slapd/tools/pwenc.c
index 62b9a83c..350f7111 100644
--- a/ldap/servers/slapd/tools/pwenc.c
+++ b/ldap/servers/slapd/tools/pwenc.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/unbind.c b/ldap/servers/slapd/unbind.c
index 61b09df1..8f3c18be 100644
--- a/ldap/servers/slapd/unbind.c
+++ b/ldap/servers/slapd/unbind.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/uniqueid.c b/ldap/servers/slapd/uniqueid.c
index 4ae72e39..0297fd83 100644
--- a/ldap/servers/slapd/uniqueid.c
+++ b/ldap/servers/slapd/uniqueid.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/uniqueidgen.c b/ldap/servers/slapd/uniqueidgen.c
index f31e0cf6..2b07abef 100644
--- a/ldap/servers/slapd/uniqueidgen.c
+++ b/ldap/servers/slapd/uniqueidgen.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/utf8compare.c b/ldap/servers/slapd/utf8compare.c
index 1ac6fa5f..8b1b34fb 100644
--- a/ldap/servers/slapd/utf8compare.c
+++ b/ldap/servers/slapd/utf8compare.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index 098dc905..ec675709 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/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/ldap/servers/slapd/uuid.c b/ldap/servers/slapd/uuid.c
index 854801d5..6ca110c3 100644
--- a/ldap/servers/slapd/uuid.c
+++ b/ldap/servers/slapd/uuid.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/uuid.h b/ldap/servers/slapd/uuid.h
index 12bcbe29..d0c3fb25 100644
--- a/ldap/servers/slapd/uuid.h
+++ b/ldap/servers/slapd/uuid.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/value.c b/ldap/servers/slapd/value.c
index 5d381f43..5986f6eb 100644
--- a/ldap/servers/slapd/value.c
+++ b/ldap/servers/slapd/value.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/valueset.c b/ldap/servers/slapd/valueset.c
index 3440d63c..a65cbdd2 100644
--- a/ldap/servers/slapd/valueset.c
+++ b/ldap/servers/slapd/valueset.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/vattr.c b/ldap/servers/slapd/vattr.c
index 6a1daf38..82f6f48c 100644
--- a/ldap/servers/slapd/vattr.c
+++ b/ldap/servers/slapd/vattr.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/vattr_spi.h b/ldap/servers/slapd/vattr_spi.h
index 3f1650f4..dae329b4 100644
--- a/ldap/servers/slapd/vattr_spi.h
+++ b/ldap/servers/slapd/vattr_spi.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/slapd/views.h b/ldap/servers/slapd/views.h
index b628cd13..ab59a4c0 100644
--- a/ldap/servers/slapd/views.h
+++ b/ldap/servers/slapd/views.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/snmp/Makefile b/ldap/servers/snmp/Makefile
index eeda4803..19b33c91 100644
--- a/ldap/servers/snmp/Makefile
+++ b/ldap/servers/snmp/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/snmp/ldap-agent.c b/ldap/servers/snmp/ldap-agent.c
index 4791ae78..769c3acb 100644
--- a/ldap/servers/snmp/ldap-agent.c
+++ b/ldap/servers/snmp/ldap-agent.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/snmp/ldap-agent.h b/ldap/servers/snmp/ldap-agent.h
index 9ce6eaea..65a1a915 100644
--- a/ldap/servers/snmp/ldap-agent.h
+++ b/ldap/servers/snmp/ldap-agent.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/snmp/main.c b/ldap/servers/snmp/main.c
index 967702f1..b42fd7eb 100644
--- a/ldap/servers/snmp/main.c
+++ b/ldap/servers/snmp/main.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/servers/snmp/netscape-ldap.mib b/ldap/servers/snmp/netscape-ldap.mib
index 3cfe4a19..9c0cfa86 100644
--- a/ldap/servers/snmp/netscape-ldap.mib
+++ b/ldap/servers/snmp/netscape-ldap.mib
@@ -26,7 +26,9 @@
-- in conjunction with the Program except the Non-GPL Code covered by this
-- exception. If you modify this file, you may extend this exception to your
-- version of the file, but you are not obligated to do so. If you do not wish to
--- do so, delete this exception statement from your version.
+-- provide this exception without modification, you must delete this exception
+-- statement from your version and license this file solely under the GPL without
+-- exception.
--
--
-- Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/snmp/ntagt/Makefile b/ldap/servers/snmp/ntagt/Makefile
index 87c31b3b..2e7d59ce 100644
--- a/ldap/servers/snmp/ntagt/Makefile
+++ b/ldap/servers/snmp/ntagt/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/snmp/ntagt/msrvdefs.mak b/ldap/servers/snmp/ntagt/msrvdefs.mak
index d9dc358e..20725497 100644
--- a/ldap/servers/snmp/ntagt/msrvdefs.mak
+++ b/ldap/servers/snmp/ntagt/msrvdefs.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/ldap/servers/snmp/ntagt/nslagtcom_nt.h b/ldap/servers/snmp/ntagt/nslagtcom_nt.h
index e60f937e..314b8a6f 100644
--- a/ldap/servers/snmp/ntagt/nslagtcom_nt.h
+++ b/ldap/servers/snmp/ntagt/nslagtcom_nt.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/snmp/ntagt/nsldapagt_nt.c b/ldap/servers/snmp/ntagt/nsldapagt_nt.c
index ae45e971..853ac04b 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.c
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/snmp/ntagt/nsldapagt_nt.def b/ldap/servers/snmp/ntagt/nsldapagt_nt.def
index 488b7cfe..7f4b8e70 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.def
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/snmp/ntagt/nsldapagt_nt.h b/ldap/servers/snmp/ntagt/nsldapagt_nt.h
index d4a3ffc7..461ad8b2 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.h
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/snmp/ntagt/nsldapmib_nt.c b/ldap/servers/snmp/ntagt/nsldapmib_nt.c
index cd74d57b..a4ea3ded 100644
--- a/ldap/servers/snmp/ntagt/nsldapmib_nt.c
+++ b/ldap/servers/snmp/ntagt/nsldapmib_nt.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/snmp/ntagt/nsldapmib_nt.h b/ldap/servers/snmp/ntagt/nsldapmib_nt.h
index 95634063..c7dbce5a 100644
--- a/ldap/servers/snmp/ntagt/nsldapmib_nt.h
+++ b/ldap/servers/snmp/ntagt/nsldapmib_nt.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/servers/snmp/redhat-directory.mib b/ldap/servers/snmp/redhat-directory.mib
index 8a1a1712..a483cc32 100644
--- a/ldap/servers/snmp/redhat-directory.mib
+++ b/ldap/servers/snmp/redhat-directory.mib
@@ -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.