summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--LICENSE4
-rw-r--r--Makefile4
-rwxr-xr-xbuilddsrpm.sh4
-rwxr-xr-xbuildnum.pl4
-rw-r--r--buildpaths.mk4
-rw-r--r--component_versions.mk4
-rw-r--r--components.mk4
-rw-r--r--config/HP-UX.mk4
-rw-r--r--config/HP-UXB.11.11.mk4
-rw-r--r--config/Linux2.4.mk4
-rw-r--r--config/Linux2.6.mk4
-rw-r--r--config/Makefile4
-rw-r--r--config/SunOS5.8.mk4
-rw-r--r--config/SunOS5.8_i86pc.mk4
-rw-r--r--config/SunOS5.9.mk4
-rw-r--r--config/SunOS5.mk4
-rw-r--r--config/UNIX.mk4
-rw-r--r--config/WINNT5.0.mk4
-rw-r--r--config/common.mn4
-rw-r--r--config/config.mk4
-rw-r--r--config/nfspwd.pl4
-rw-r--r--config/nsinstall.c4
-rw-r--r--config/pathsub.c4
-rw-r--r--config/pathsub.h4
-rw-r--r--config/revdepth-nt.pl4
-rw-r--r--config/revdepth.pl4
-rw-r--r--config/rules.mk4
-rw-r--r--config/webint.mk4
-rwxr-xr-xdirver.pl4
-rwxr-xr-xhttpd/autobuild4
-rw-r--r--httpd/src/Makefile4
-rw-r--r--httpd/src/ntnsapi.c4
-rw-r--r--httpd/src/unixso.mk4
-rw-r--r--include/base/crit.h4
-rw-r--r--include/base/dbtbase.h4
-rw-r--r--include/base/ereport.h4
-rw-r--r--include/base/eventhandler.h4
-rw-r--r--include/base/eventlog.h4
-rw-r--r--include/base/file.h4
-rw-r--r--include/base/fsmutex.h4
-rw-r--r--include/base/lexer.h4
-rw-r--r--include/base/nterr.h4
-rw-r--r--include/base/nterrors.h4
-rw-r--r--include/base/plist.h4
-rw-r--r--include/base/pool.h4
-rw-r--r--include/base/rwlock.h4
-rw-r--r--include/base/shexp.h4
-rw-r--r--include/base/systems.h4
-rw-r--r--include/base/systhr.h4
-rw-r--r--include/base/util.h4
-rw-r--r--include/i18n.h4
-rw-r--r--include/ldaputil/cert.h4
-rw-r--r--include/ldaputil/certmap.h4
-rw-r--r--include/ldaputil/dbconf.h4
-rw-r--r--include/ldaputil/encode.h4
-rw-r--r--include/ldaputil/errors.h4
-rw-r--r--include/ldaputil/extcmap.h4
-rw-r--r--include/ldaputil/init.h4
-rw-r--r--include/ldaputil/ldapauth.h4
-rw-r--r--include/ldaputil/ldapdb.h4
-rw-r--r--include/ldaputil/ldaputil.h4
-rw-r--r--include/libaccess/acl.h4
-rw-r--r--include/libaccess/aclerror.h4
-rw-r--r--include/libaccess/acleval.h4
-rw-r--r--include/libaccess/aclglobal.h4
-rw-r--r--include/libaccess/aclproto.h4
-rw-r--r--include/libaccess/aclstruct.h4
-rw-r--r--include/libaccess/attrec.h4
-rw-r--r--include/libaccess/authdb.h4
-rw-r--r--include/libaccess/dbtlibaccess.h4
-rw-r--r--include/libaccess/dnfstruct.h4
-rw-r--r--include/libaccess/ipfstruct.h4
-rw-r--r--include/libaccess/las.h4
-rw-r--r--include/libaccess/ldapacl.h4
-rw-r--r--include/libaccess/nsauth.h4
-rw-r--r--include/libaccess/nsautherr.h4
-rw-r--r--include/libaccess/nserror.h4
-rw-r--r--include/libaccess/symbols.h4
-rw-r--r--include/libaccess/userauth.h4
-rw-r--r--include/libaccess/usi.h4
-rw-r--r--include/libaccess/usrcache.h4
-rw-r--r--include/libadmin/dbtlibadmin.h4
-rw-r--r--include/libadmin/libadmin.h4
-rw-r--r--include/netsite.h4
-rw-r--r--include/nt/messages.h4
-rw-r--r--include/nt/nsapi.h4
-rw-r--r--include/nt/ntos.h4
-rw-r--r--include/nt/regparms.h4
-rw-r--r--include/nt/resource.h4
-rw-r--r--include/public/base/systems.h4
-rw-r--r--include/public/netsite.h4
-rw-r--r--include/public/nsacl/aclapi.h4
-rw-r--r--include/public/nsacl/acldef.h4
-rw-r--r--include/public/nsacl/nserrdef.h4
-rw-r--r--include/public/nsacl/plistdef.h4
-rw-r--r--include/public/nsapi.h4
-rw-r--r--include/version.h4
-rw-r--r--internal_buildpaths.mk4
-rw-r--r--internal_comp_deps.mk4
-rw-r--r--l10n/dirserv/de/ns-slapd.txt9
-rw-r--r--l10n/dirserv/de/ns-slapd.txt.iso88599
-rw-r--r--l10n/dirserv/en/ns-slapd.txt9
-rw-r--r--l10n/dirserv/es/ns-slapd.txt9
-rw-r--r--l10n/dirserv/es/ns-slapd.txt.iso88599
-rw-r--r--l10n/dirserv/fr/ns-slapd.txt9
-rw-r--r--l10n/dirserv/fr/ns-slapd.txt.iso88599
-rw-r--r--l10n/dirserv/ja/ns-slapd.txt9
-rw-r--r--l10n/dirserv/ja/ns-slapd.txt.eucjp9
-rw-r--r--ldap/Makefile4
-rw-r--r--ldap/Makefile.client4
-rw-r--r--ldap/admin/Makefile4
-rw-r--r--ldap/admin/include/Makefile4
-rw-r--r--ldap/admin/include/dsalib.h4
-rw-r--r--ldap/admin/include/dsalib_pw.h4
-rw-r--r--ldap/admin/include/dsalib_schema.h4
-rw-r--r--ldap/admin/include/nterrors.h4
-rw-r--r--ldap/admin/lib/Makefile4
-rw-r--r--ldap/admin/lib/dsalib_conf.c4
-rw-r--r--ldap/admin/lib/dsalib_confs.c4
-rw-r--r--ldap/admin/lib/dsalib_db.c4
-rw-r--r--ldap/admin/lib/dsalib_debug.c4
-rw-r--r--ldap/admin/lib/dsalib_dn.c4
-rw-r--r--ldap/admin/lib/dsalib_filename.c4
-rw-r--r--ldap/admin/lib/dsalib_html.c4
-rw-r--r--ldap/admin/lib/dsalib_ldif.c4
-rw-r--r--ldap/admin/lib/dsalib_location.c4
-rw-r--r--ldap/admin/lib/dsalib_pw.c4
-rw-r--r--ldap/admin/lib/dsalib_tailf.c4
-rw-r--r--ldap/admin/lib/dsalib_updown.c4
-rw-r--r--ldap/admin/lib/dsalib_util.c4
-rw-r--r--ldap/admin/src/AddPerlHeader.pl4
-rw-r--r--ldap/admin/src/Base.def4
-rw-r--r--ldap/admin/src/Base.pm4
-rw-r--r--ldap/admin/src/CGI_ENV4
-rw-r--r--ldap/admin/src/Cgi.pm4
-rw-r--r--ldap/admin/src/CreateInstall.pl4
-rw-r--r--ldap/admin/src/DSAdmin.def4
-rw-r--r--ldap/admin/src/DSAdmin.mk4
-rw-r--r--ldap/admin/src/DSAdmin.pm4
-rw-r--r--ldap/admin/src/DSAdmin.xs4
-rw-r--r--ldap/admin/src/Inf.pm4
-rw-r--r--ldap/admin/src/Makefile4
-rw-r--r--ldap/admin/src/addindex.c4
-rw-r--r--ldap/admin/src/cfg_sspt.c4
-rw-r--r--ldap/admin/src/cfg_sspt.h4
-rw-r--r--ldap/admin/src/configure_instance.cpp4
-rw-r--r--ldap/admin/src/configure_instance.h4
-rw-r--r--ldap/admin/src/create_instance.c4
-rw-r--r--ldap/admin/src/create_instance.h4
-rw-r--r--ldap/admin/src/ds_bak2db.c4
-rw-r--r--ldap/admin/src/ds_db2bak.c4
-rw-r--r--ldap/admin/src/ds_db2ldif.c4
-rw-r--r--ldap/admin/src/ds_ldif2db.c4
-rw-r--r--ldap/admin/src/ds_listdb.c4
-rw-r--r--ldap/admin/src/ds_newinst.c4
-rw-r--r--ldap/admin/src/ds_newinst.pl4
-rw-r--r--ldap/admin/src/ds_remove.c4
-rw-r--r--ldap/admin/src/ds_remove_uninst.cpp4
-rw-r--r--ldap/admin/src/ds_remove_uninst.h4
-rw-r--r--ldap/admin/src/ds_rmdb.c4
-rw-r--r--ldap/admin/src/ds_snmpctrl.c4
-rw-r--r--ldap/admin/src/ds_viewlog.pl4
-rwxr-xr-xldap/admin/src/fix_secmod_db_644
-rw-r--r--ldap/admin/src/getConfigInfo4
-rwxr-xr-xldap/admin/src/import2info4
-rw-r--r--ldap/admin/src/init_ds_env.c4
-rw-r--r--ldap/admin/src/init_ds_env.h4
-rw-r--r--ldap/admin/src/install_keywords.h4
-rw-r--r--ldap/admin/src/instindex.cpp4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/DSMLReader.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/GetOpt.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/Makefile4
-rwxr-xr-xldap/admin/src/java/install4
-rwxr-xr-xldap/admin/src/java/mcc4
-rw-r--r--ldap/admin/src/java/mcc.bat4
-rw-r--r--ldap/admin/src/key.rc4
-rw-r--r--ldap/admin/src/latest_file.c4
-rwxr-xr-xldap/admin/src/logconv.pl4
-rw-r--r--ldap/admin/src/makemccvlvindexes4
-rw-r--r--ldap/admin/src/makevlvindex4
-rw-r--r--ldap/admin/src/makevlvsearch4
-rw-r--r--ldap/admin/src/migrateInstance4
-rw-r--r--ldap/admin/src/migrateLocalDB4
-rw-r--r--ldap/admin/src/migratePwdFile4
-rw-r--r--ldap/admin/src/migrateTo44
-rwxr-xr-xldap/admin/src/migratedsgw4
-rw-r--r--ldap/admin/src/namegen.c4
-rw-r--r--ldap/admin/src/ns-newpwpolicy.pl4
-rw-r--r--ldap/admin/src/restart.c4
-rw-r--r--ldap/admin/src/script-gen.c4
-rw-r--r--ldap/admin/src/scripts/template-bak2db.pl4
-rwxr-xr-xldap/admin/src/scripts/template-cl-dump.pl8
-rw-r--r--ldap/admin/src/scripts/template-db2bak.pl4
-rw-r--r--ldap/admin/src/scripts/template-db2index.pl4
-rw-r--r--ldap/admin/src/scripts/template-db2ldif.pl4
-rw-r--r--ldap/admin/src/scripts/template-dsml-activate.pl4
-rw-r--r--ldap/admin/src/scripts/template-ldif2db.pl4
-rw-r--r--ldap/admin/src/scripts/template-migrate50to514
-rw-r--r--ldap/admin/src/scripts/template-migrate5to64
-rw-r--r--ldap/admin/src/scripts/template-migrate5to74
-rw-r--r--ldap/admin/src/scripts/template-migrate6to74
-rw-r--r--ldap/admin/src/scripts/template-migrateInstance54
-rw-r--r--ldap/admin/src/scripts/template-migrateInstance64
-rw-r--r--ldap/admin/src/scripts/template-migrateInstance74
-rwxr-xr-xldap/admin/src/scripts/template-migrateTo54
-rw-r--r--ldap/admin/src/scripts/template-migrateTo64
-rw-r--r--ldap/admin/src/scripts/template-migrateTo74
-rw-r--r--ldap/admin/src/scripts/template-ns-accountstatus.pl4
-rw-r--r--ldap/admin/src/scripts/template-ns-activate.pl4
-rw-r--r--ldap/admin/src/scripts/template-ns-inactivate.pl4
-rwxr-xr-xldap/admin/src/scripts/template-ns-newpwpolicy.pl4
-rwxr-xr-xldap/admin/src/scripts/template-repl-monitor-cgi.pl4
-rwxr-xr-xldap/admin/src/scripts/template-repl-monitor.pl8
-rw-r--r--ldap/admin/src/scripts/template-verify-db.pl4
-rw-r--r--ldap/admin/src/shutdown.c4
-rw-r--r--ldap/admin/src/start.c4
-rw-r--r--ldap/admin/src/uname.lib4
-rwxr-xr-xldap/admin/src/updatedsgw4
-rwxr-xr-xldap/admin/src/upgradeServer4
-rw-r--r--ldap/admin/src/vlvindex.c4
-rw-r--r--ldap/clients/Makefile4
-rw-r--r--ldap/clients/dsgw/Makefile4
-rw-r--r--ldap/clients/dsgw/Versiongw.c4
-rw-r--r--ldap/clients/dsgw/admhtml/Makefile4
-rw-r--r--ldap/clients/dsgw/admhtml/display-country.html4
-rw-r--r--ldap/clients/dsgw/admhtml/display-dnedit.html4
-rw-r--r--ldap/clients/dsgw/admhtml/display-dnedittop.html4
-rw-r--r--ldap/clients/dsgw/admhtml/display-group.html4
-rw-r--r--ldap/clients/dsgw/admhtml/display-groupun.html4
-rw-r--r--ldap/clients/dsgw/admhtml/display-licensed-user.html4
-rw-r--r--ldap/clients/dsgw/admhtml/display-mailgroup.html4
-rw-r--r--ldap/clients/dsgw/admhtml/display-org.html4
-rw-r--r--ldap/clients/dsgw/admhtml/display-orgperson.html4
-rw-r--r--ldap/clients/dsgw/admhtml/display-orgunit.html4
-rw-r--r--ldap/clients/dsgw/admhtml/display-person.html4
-rw-r--r--ldap/clients/dsgw/admhtml/display-umperson.html4
-rw-r--r--ldap/clients/dsgw/admhtml/dsconfig.html4
-rw-r--r--ldap/clients/dsgw/admhtml/dscrgroup.html4
-rw-r--r--ldap/clients/dsgw/admhtml/dscrou.html4
-rw-r--r--ldap/clients/dsgw/admhtml/dscruser.html4
-rw-r--r--ldap/clients/dsgw/admhtml/dsexpldif.html4
-rw-r--r--ldap/clients/dsgw/admhtml/dsimpldif.html4
-rw-r--r--ldap/clients/dsgw/admhtml/dslsgroups.html4
-rw-r--r--ldap/clients/dsgw/admhtml/dslsous.html4
-rw-r--r--ldap/clients/dsgw/admhtml/dslsusers.html4
-rw-r--r--ldap/clients/dsgw/admhtml/edit-passwd.html4
-rw-r--r--ldap/clients/dsgw/admhtml/index.lst4
-rw-r--r--ldap/clients/dsgw/admhtml/list-Anything.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-Auth.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-Groups-report.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-Groups-rm.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-Groups.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-Org-Units.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-OrgUnits-report.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-OrgUnits.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-Organizations.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-Ous-rm.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-People-report.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-People-rm.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-People.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-fa-Groups.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-fa-People.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-fa_people.html4
-rw-r--r--ldap/clients/dsgw/admhtml/list-urlsearch.html4
-rw-r--r--ldap/clients/dsgw/auth.c4
-rw-r--r--ldap/clients/dsgw/cgiutil.c4
-rw-r--r--ldap/clients/dsgw/ckdel.c4
-rw-r--r--ldap/clients/dsgw/ckdump.c4
-rw-r--r--ldap/clients/dsgw/ckget.c4
-rw-r--r--ldap/clients/dsgw/ckpurge.c4
-rw-r--r--ldap/clients/dsgw/ckput.c4
-rw-r--r--ldap/clients/dsgw/collate.c4
-rw-r--r--ldap/clients/dsgw/config.c4
-rw-r--r--ldap/clients/dsgw/config/Makefile4
-rw-r--r--ldap/clients/dsgw/config/authPassword.html4
-rw-r--r--ldap/clients/dsgw/config/authSearch.html4
-rw-r--r--ldap/clients/dsgw/config/csearch.html4
-rw-r--r--ldap/clients/dsgw/config/csearchAttr.html4
-rw-r--r--ldap/clients/dsgw/config/csearchBase.html4
-rw-r--r--ldap/clients/dsgw/config/csearchMatch.html4
-rw-r--r--ldap/clients/dsgw/config/csearchString.html4
-rw-r--r--ldap/clients/dsgw/config/csearchType.html4
-rw-r--r--ldap/clients/dsgw/config/de/authPassword.html4
-rw-r--r--ldap/clients/dsgw/config/de/authSearch.html4
-rw-r--r--ldap/clients/dsgw/config/de/csearchAttr.html4
-rw-r--r--ldap/clients/dsgw/config/de/csearchBase.html4
-rw-r--r--ldap/clients/dsgw/config/de/csearchString.html4
-rw-r--r--ldap/clients/dsgw/config/de/csearchType.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-country.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-dnedit.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-dneditpeople.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-group.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-groupun.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-mailgroup.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-ntgroup.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-ntperson.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-org.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-orgperson.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-orgunit.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-person.html4
-rw-r--r--ldap/clients/dsgw/config/de/display-umperson.html4
-rw-r--r--ldap/clients/dsgw/config/de/dsgw-l10n.conf4
-rw-r--r--ldap/clients/dsgw/config/de/dsgw.conf4
-rw-r--r--ldap/clients/dsgw/config/de/dsgw.tmpl4
-rw-r--r--ldap/clients/dsgw/config/de/dsgw_adm.conf4
-rw-r--r--ldap/clients/dsgw/config/de/dsgwfilter.conf4
-rw-r--r--ldap/clients/dsgw/config/de/dsgwfilter_adm.conf4
-rw-r--r--ldap/clients/dsgw/config/de/dsgwsearchprefs.conf4
-rw-r--r--ldap/clients/dsgw/config/de/edit-passwd.html4
-rw-r--r--ldap/clients/dsgw/config/de/list-Anything.html4
-rw-r--r--ldap/clients/dsgw/config/de/list-Auth.html4
-rw-r--r--ldap/clients/dsgw/config/de/list-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/de/list-NT-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/de/list-NT-People.html4
-rw-r--r--ldap/clients/dsgw/config/de/list-Org-Units.html4
-rw-r--r--ldap/clients/dsgw/config/de/list-Organizations.html4
-rw-r--r--ldap/clients/dsgw/config/de/list-People.html4
-rw-r--r--ldap/clients/dsgw/config/de/list-fa-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/de/list-fa-People.html4
-rw-r--r--ldap/clients/dsgw/config/de/list-urlsearch.html4
-rw-r--r--ldap/clients/dsgw/config/de/newentry.html4
-rw-r--r--ldap/clients/dsgw/config/de/newentryName.html4
-rw-r--r--ldap/clients/dsgw/config/de/newentryType.html4
-rw-r--r--ldap/clients/dsgw/config/de/search.html4
-rw-r--r--ldap/clients/dsgw/config/de/searchString.html4
-rw-r--r--ldap/clients/dsgw/config/display-country.html4
-rw-r--r--ldap/clients/dsgw/config/display-dc.html4
-rw-r--r--ldap/clients/dsgw/config/display-dnedit.html4
-rw-r--r--ldap/clients/dsgw/config/display-dneditpeople.html4
-rw-r--r--ldap/clients/dsgw/config/display-group.html4
-rw-r--r--ldap/clients/dsgw/config/display-groupun.html4
-rw-r--r--ldap/clients/dsgw/config/display-ntgroup.html4
-rw-r--r--ldap/clients/dsgw/config/display-ntperson.html4
-rw-r--r--ldap/clients/dsgw/config/display-org.html4
-rw-r--r--ldap/clients/dsgw/config/display-orgperson.html4
-rw-r--r--ldap/clients/dsgw/config/display-orgunit.html4
-rw-r--r--ldap/clients/dsgw/config/display-person.html4
-rw-r--r--ldap/clients/dsgw/config/dsgw-l10n.conf4
-rw-r--r--ldap/clients/dsgw/config/dsgw.tmpl4
-rw-r--r--ldap/clients/dsgw/config/dsgw_adm.conf4
-rw-r--r--ldap/clients/dsgw/config/dsgwfilter.conf4
-rw-r--r--ldap/clients/dsgw/config/dsgwfilter_adm.conf4
-rw-r--r--ldap/clients/dsgw/config/dsgwsearchprefs.conf4
-rw-r--r--ldap/clients/dsgw/config/edit-passwd.html4
-rw-r--r--ldap/clients/dsgw/config/en-us/dsgw-l10n.conf4
-rw-r--r--ldap/clients/dsgw/config/en-us/dsgwcollate.conf4
-rw-r--r--ldap/clients/dsgw/config/en/dsgw-l10n.conf4
-rw-r--r--ldap/clients/dsgw/config/en/dsgwcollate.conf4
-rw-r--r--ldap/clients/dsgw/config/es/authPassword.html4
-rw-r--r--ldap/clients/dsgw/config/es/authSearch.html4
-rw-r--r--ldap/clients/dsgw/config/es/csearch.html4
-rw-r--r--ldap/clients/dsgw/config/es/csearchAttr.html4
-rw-r--r--ldap/clients/dsgw/config/es/csearchBase.html4
-rw-r--r--ldap/clients/dsgw/config/es/csearchString.html4
-rw-r--r--ldap/clients/dsgw/config/es/csearchType.html4
-rw-r--r--ldap/clients/dsgw/config/es/display-country.html4
-rw-r--r--ldap/clients/dsgw/config/es/display-dnedit.html4
-rw-r--r--ldap/clients/dsgw/config/es/display-dneditpeople.html4
-rw-r--r--ldap/clients/dsgw/config/es/display-group.html4
-rw-r--r--ldap/clients/dsgw/config/es/display-groupun.html4
-rw-r--r--ldap/clients/dsgw/config/es/display-ntgroup.html4
-rw-r--r--ldap/clients/dsgw/config/es/display-ntperson.html4
-rw-r--r--ldap/clients/dsgw/config/es/display-org.html4
-rw-r--r--ldap/clients/dsgw/config/es/display-orgperson.html4
-rw-r--r--ldap/clients/dsgw/config/es/display-orgunit.html4
-rw-r--r--ldap/clients/dsgw/config/es/display-person.html4
-rw-r--r--ldap/clients/dsgw/config/es/dsgw-l10n.conf4
-rw-r--r--ldap/clients/dsgw/config/es/dsgw.tmpl4
-rw-r--r--ldap/clients/dsgw/config/es/dsgw_adm.conf4
-rw-r--r--ldap/clients/dsgw/config/es/dsgwfilter.conf4
-rw-r--r--ldap/clients/dsgw/config/es/dsgwfilter_adm.conf4
-rw-r--r--ldap/clients/dsgw/config/es/dsgwsearchprefs.conf4
-rw-r--r--ldap/clients/dsgw/config/es/edit-passwd.html4
-rw-r--r--ldap/clients/dsgw/config/es/list-Anything.html4
-rw-r--r--ldap/clients/dsgw/config/es/list-Auth.html4
-rw-r--r--ldap/clients/dsgw/config/es/list-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/es/list-NT-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/es/list-NT-People.html4
-rw-r--r--ldap/clients/dsgw/config/es/list-Org-Units.html4
-rw-r--r--ldap/clients/dsgw/config/es/list-Organizations.html4
-rw-r--r--ldap/clients/dsgw/config/es/list-People.html4
-rw-r--r--ldap/clients/dsgw/config/es/list-fa-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/es/list-fa-People.html4
-rw-r--r--ldap/clients/dsgw/config/es/list-urlsearch.html4
-rw-r--r--ldap/clients/dsgw/config/es/newentry.html4
-rw-r--r--ldap/clients/dsgw/config/es/newentryName.html4
-rw-r--r--ldap/clients/dsgw/config/es/newentryType.html4
-rw-r--r--ldap/clients/dsgw/config/es/ns-license-schema.conf4
-rw-r--r--ldap/clients/dsgw/config/es/search.html4
-rw-r--r--ldap/clients/dsgw/config/es/searchString.html4
-rw-r--r--ldap/clients/dsgw/config/fr/authPassword.html4
-rw-r--r--ldap/clients/dsgw/config/fr/authSearch.html4
-rw-r--r--ldap/clients/dsgw/config/fr/csearch.html4
-rw-r--r--ldap/clients/dsgw/config/fr/csearchAttr.html4
-rw-r--r--ldap/clients/dsgw/config/fr/csearchBase.html4
-rw-r--r--ldap/clients/dsgw/config/fr/csearchString.html4
-rw-r--r--ldap/clients/dsgw/config/fr/csearchType.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-country.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-dnedit.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-dneditpeople.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-group.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-groupun.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-mailgroup.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-ntgroup.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-ntperson.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-org.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-orgperson.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-orgunit.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-person.html4
-rw-r--r--ldap/clients/dsgw/config/fr/display-umperson.html4
-rw-r--r--ldap/clients/dsgw/config/fr/dsgw-l10n.conf4
-rw-r--r--ldap/clients/dsgw/config/fr/dsgw.conf4
-rw-r--r--ldap/clients/dsgw/config/fr/dsgw.tmpl4
-rw-r--r--ldap/clients/dsgw/config/fr/dsgw_adm.conf4
-rw-r--r--ldap/clients/dsgw/config/fr/dsgwfilter.conf4
-rw-r--r--ldap/clients/dsgw/config/fr/dsgwfilter_adm.conf4
-rw-r--r--ldap/clients/dsgw/config/fr/dsgwsearchprefs.conf4
-rw-r--r--ldap/clients/dsgw/config/fr/edit-passwd.html4
-rw-r--r--ldap/clients/dsgw/config/fr/list-Anything.html4
-rw-r--r--ldap/clients/dsgw/config/fr/list-Auth.html4
-rw-r--r--ldap/clients/dsgw/config/fr/list-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/fr/list-NT-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/fr/list-NT-People.html4
-rw-r--r--ldap/clients/dsgw/config/fr/list-Org-Units.html4
-rw-r--r--ldap/clients/dsgw/config/fr/list-Organizations.html4
-rw-r--r--ldap/clients/dsgw/config/fr/list-People.html4
-rw-r--r--ldap/clients/dsgw/config/fr/list-fa-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/fr/list-fa-People.html4
-rw-r--r--ldap/clients/dsgw/config/fr/list-urlsearch.html4
-rw-r--r--ldap/clients/dsgw/config/fr/newentry.html4
-rw-r--r--ldap/clients/dsgw/config/fr/newentryName.html4
-rw-r--r--ldap/clients/dsgw/config/fr/newentryType.html4
-rw-r--r--ldap/clients/dsgw/config/fr/search.html4
-rw-r--r--ldap/clients/dsgw/config/fr/searchString.html4
-rw-r--r--ldap/clients/dsgw/config/ja/authPassword.html4
-rw-r--r--ldap/clients/dsgw/config/ja/authSearch.html4
-rw-r--r--ldap/clients/dsgw/config/ja/csearch.html4
-rw-r--r--ldap/clients/dsgw/config/ja/csearchAttr.html4
-rw-r--r--ldap/clients/dsgw/config/ja/csearchBase.html4
-rw-r--r--ldap/clients/dsgw/config/ja/csearchString.html4
-rw-r--r--ldap/clients/dsgw/config/ja/csearchType.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-country.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-dnedit.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-dneditpeople.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-group.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-groupun.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-mailgroup.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-ntgroup.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-ntperson.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-org.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-orgperson.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-orgunit.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-person.html4
-rw-r--r--ldap/clients/dsgw/config/ja/display-umperson.html4
-rw-r--r--ldap/clients/dsgw/config/ja/dsgw-l10n.conf4
-rw-r--r--ldap/clients/dsgw/config/ja/dsgw.conf4
-rw-r--r--ldap/clients/dsgw/config/ja/dsgw.tmpl4
-rw-r--r--ldap/clients/dsgw/config/ja/dsgw_adm.conf4
-rw-r--r--ldap/clients/dsgw/config/ja/dsgwcharset.conf4
-rw-r--r--ldap/clients/dsgw/config/ja/dsgwcollate.conf4
-rw-r--r--ldap/clients/dsgw/config/ja/dsgwfilter.conf4
-rw-r--r--ldap/clients/dsgw/config/ja/dsgwfilter_adm.conf4
-rw-r--r--ldap/clients/dsgw/config/ja/dsgwsearchprefs.conf4
-rw-r--r--ldap/clients/dsgw/config/ja/edit-passwd.html4
-rw-r--r--ldap/clients/dsgw/config/ja/list-Anything.html4
-rw-r--r--ldap/clients/dsgw/config/ja/list-Auth.html4
-rw-r--r--ldap/clients/dsgw/config/ja/list-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/ja/list-NT-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/ja/list-NT-People.html4
-rw-r--r--ldap/clients/dsgw/config/ja/list-Org-Units.html4
-rw-r--r--ldap/clients/dsgw/config/ja/list-Organizations.html4
-rw-r--r--ldap/clients/dsgw/config/ja/list-People.html4
-rw-r--r--ldap/clients/dsgw/config/ja/list-fa-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/ja/list-fa-People.html4
-rw-r--r--ldap/clients/dsgw/config/ja/list-urlsearch.html4
-rw-r--r--ldap/clients/dsgw/config/ja/newentry.html4
-rw-r--r--ldap/clients/dsgw/config/ja/newentryName.html4
-rw-r--r--ldap/clients/dsgw/config/ja/newentryType.html4
-rw-r--r--ldap/clients/dsgw/config/ja/search.html4
-rw-r--r--ldap/clients/dsgw/config/ja/searchString.html4
-rw-r--r--ldap/clients/dsgw/config/ko/dsgw-l10n.conf4
-rw-r--r--ldap/clients/dsgw/config/ko/dsgwcharset.conf4
-rw-r--r--ldap/clients/dsgw/config/list-Anything.html4
-rw-r--r--ldap/clients/dsgw/config/list-Auth.html4
-rw-r--r--ldap/clients/dsgw/config/list-Domaincomponent.html4
-rw-r--r--ldap/clients/dsgw/config/list-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/list-NT-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/list-NT-People.html4
-rw-r--r--ldap/clients/dsgw/config/list-Org-Units.html4
-rw-r--r--ldap/clients/dsgw/config/list-Organizations.html4
-rw-r--r--ldap/clients/dsgw/config/list-People.html4
-rw-r--r--ldap/clients/dsgw/config/list-fa-Groups.html4
-rw-r--r--ldap/clients/dsgw/config/list-fa-People.html4
-rw-r--r--ldap/clients/dsgw/config/list-urlsearch.html4
-rw-r--r--ldap/clients/dsgw/config/newentry.html4
-rw-r--r--ldap/clients/dsgw/config/newentryName.html4
-rw-r--r--ldap/clients/dsgw/config/newentryType.html4
-rw-r--r--ldap/clients/dsgw/config/ns-license-schema.conf4
-rw-r--r--ldap/clients/dsgw/config/search.html4
-rw-r--r--ldap/clients/dsgw/config/searchString.html4
-rw-r--r--ldap/clients/dsgw/config/zh/dsgw-l10n.conf4
-rw-r--r--ldap/clients/dsgw/config/zh/dsgwcharset.conf4
-rw-r--r--ldap/clients/dsgw/cookie.c4
-rw-r--r--ldap/clients/dsgw/csearch.c4
-rw-r--r--ldap/clients/dsgw/dbtdsgw.h4
-rw-r--r--ldap/clients/dsgw/dnedit.c4
-rw-r--r--ldap/clients/dsgw/doauth.c4
-rw-r--r--ldap/clients/dsgw/domodify.c4
-rw-r--r--ldap/clients/dsgw/dosearch.c4
-rw-r--r--ldap/clients/dsgw/dsconfig.c4
-rw-r--r--ldap/clients/dsgw/dsexpldif.c4
-rw-r--r--ldap/clients/dsgw/dsgw.h4
-rw-r--r--ldap/clients/dsgw/dsgw_include.mk4
-rw-r--r--ldap/clients/dsgw/dsgwutil.c4
-rw-r--r--ldap/clients/dsgw/dsimpldif.c4
-rw-r--r--ldap/clients/dsgw/edit.c4
-rw-r--r--ldap/clients/dsgw/emitauth.c4
-rw-r--r--ldap/clients/dsgw/emitf.c4
-rw-r--r--ldap/clients/dsgw/entrydisplay.c4
-rw-r--r--ldap/clients/dsgw/error.c4
-rw-r--r--ldap/clients/dsgw/genscreen.c4
-rw-r--r--ldap/clients/dsgw/getopt.c4
-rw-r--r--ldap/clients/dsgw/html/Makefile4
-rw-r--r--ldap/clients/dsgw/html/alert.html4
-rw-r--r--ldap/clients/dsgw/html/auth.html4
-rw-r--r--ldap/clients/dsgw/html/authroot.html4
-rw-r--r--ldap/clients/dsgw/html/authtitle.html4
-rw-r--r--ldap/clients/dsgw/html/confirm.html4
-rw-r--r--ldap/clients/dsgw/html/csearchtitle.html4
-rw-r--r--ldap/clients/dsgw/html/de/auth.html4
-rw-r--r--ldap/clients/dsgw/html/de/authroot.html4
-rw-r--r--ldap/clients/dsgw/html/de/authtitle.html4
-rw-r--r--ldap/clients/dsgw/html/de/csearchtitle.html4
-rw-r--r--ldap/clients/dsgw/html/de/eduser.html4
-rw-r--r--ldap/clients/dsgw/html/de/greeting.html4
-rw-r--r--ldap/clients/dsgw/html/de/index.html4
-rw-r--r--ldap/clients/dsgw/html/de/maintitle.html4
-rw-r--r--ldap/clients/dsgw/html/de/newentrytitle.html4
-rw-r--r--ldap/clients/dsgw/html/de/searchtitle.html4
-rw-r--r--ldap/clients/dsgw/html/eduser.html4
-rw-r--r--ldap/clients/dsgw/html/emptyFrame.html4
-rw-r--r--ldap/clients/dsgw/html/es/auth.html4
-rw-r--r--ldap/clients/dsgw/html/es/authroot.html4
-rw-r--r--ldap/clients/dsgw/html/es/authtitle.html4
-rw-r--r--ldap/clients/dsgw/html/es/csearchtitle.html4
-rw-r--r--ldap/clients/dsgw/html/es/eduser.html4
-rw-r--r--ldap/clients/dsgw/html/es/greeting.html4
-rw-r--r--ldap/clients/dsgw/html/es/index.html4
-rw-r--r--ldap/clients/dsgw/html/es/maintitle.html4
-rw-r--r--ldap/clients/dsgw/html/es/newentrytitle.html4
-rw-r--r--ldap/clients/dsgw/html/es/searchtitle.html4
-rw-r--r--ldap/clients/dsgw/html/fr/auth.html4
-rw-r--r--ldap/clients/dsgw/html/fr/authroot.html4
-rw-r--r--ldap/clients/dsgw/html/fr/authtitle.html4
-rw-r--r--ldap/clients/dsgw/html/fr/csearchtitle.html4
-rw-r--r--ldap/clients/dsgw/html/fr/eduser.html4
-rw-r--r--ldap/clients/dsgw/html/fr/greeting.html4
-rw-r--r--ldap/clients/dsgw/html/fr/index.html4
-rw-r--r--ldap/clients/dsgw/html/fr/maintitle.html4
-rw-r--r--ldap/clients/dsgw/html/fr/newentrytitle.html4
-rw-r--r--ldap/clients/dsgw/html/fr/searchtitle.html4
-rw-r--r--ldap/clients/dsgw/html/greeting.html4
-rw-r--r--ldap/clients/dsgw/html/index.html4
-rw-r--r--ldap/clients/dsgw/html/info/Makefile4
-rw-r--r--ldap/clients/dsgw/html/info/infonav.html4
-rw-r--r--ldap/clients/dsgw/html/ja/auth.html4
-rw-r--r--ldap/clients/dsgw/html/ja/authroot.html4
-rw-r--r--ldap/clients/dsgw/html/ja/authtitle.html4
-rw-r--r--ldap/clients/dsgw/html/ja/csearchtitle.html4
-rw-r--r--ldap/clients/dsgw/html/ja/eduser.html4
-rw-r--r--ldap/clients/dsgw/html/ja/greeting.html4
-rw-r--r--ldap/clients/dsgw/html/ja/index.html4
-rw-r--r--ldap/clients/dsgw/html/ja/maintitle.html4
-rw-r--r--ldap/clients/dsgw/html/ja/newentrytitle.html4
-rw-r--r--ldap/clients/dsgw/html/ja/searchtitle.html4
-rw-r--r--ldap/clients/dsgw/html/maintitle.html4
-rw-r--r--ldap/clients/dsgw/html/manual/Makefile4
-rw-r--r--ldap/clients/dsgw/html/manual/add.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/attribut.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/auth.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/contents.html4
-rw-r--r--ldap/clients/dsgw/html/manual/dn.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/filters.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/index.html4
-rw-r--r--ldap/clients/dsgw/html/manual/index.map4
-rw-r--r--ldap/clients/dsgw/html/manual/intro.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/ja/add.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/ja/attribut.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/ja/auth.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/ja/contents.html4
-rw-r--r--ldap/clients/dsgw/html/manual/ja/filters.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/ja/intro.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/ja/mod.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/ja/objclass.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/ja/search.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/mod.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/objclass.htm4
-rw-r--r--ldap/clients/dsgw/html/manual/search.htm4
-rw-r--r--ldap/clients/dsgw/html/newentrytitle.html4
-rw-r--r--ldap/clients/dsgw/html/searchtitle.html4
-rw-r--r--ldap/clients/dsgw/html/style.css4
-rw-r--r--ldap/clients/dsgw/htmlout.c4
-rw-r--r--ldap/clients/dsgw/htmlparse.c4
-rw-r--r--ldap/clients/dsgw/lang.c4
-rw-r--r--ldap/clients/dsgw/ldaputil.c4
-rw-r--r--ldap/clients/dsgw/newentry.c4
-rw-r--r--ldap/clients/dsgw/pbconfig/Makefile4
-rw-r--r--ldap/clients/dsgw/pbconfig/authPassword.html6
-rw-r--r--ldap/clients/dsgw/pbconfig/authSearch.html6
-rw-r--r--ldap/clients/dsgw/pbconfig/display-orgperson.html4
-rw-r--r--ldap/clients/dsgw/pbconfig/display-orgunit.html6
-rw-r--r--ldap/clients/dsgw/pbconfig/display-room.html4
-rw-r--r--ldap/clients/dsgw/pbconfig/dsgwfilter.conf6
-rw-r--r--ldap/clients/dsgw/pbconfig/dsgwsearchprefs.conf6
-rw-r--r--ldap/clients/dsgw/pbconfig/edit-passwd.html4
-rw-r--r--ldap/clients/dsgw/pbconfig/list-Auth.html6
-rw-r--r--ldap/clients/dsgw/pbconfig/list-People.html4
-rw-r--r--ldap/clients/dsgw/pbconfig/pb.tmpl4
-rw-r--r--ldap/clients/dsgw/pbhtml/Makefile4
-rw-r--r--ldap/clients/dsgw/pbhtml/alert.html4
-rw-r--r--ldap/clients/dsgw/pbhtml/carded.html4
-rw-r--r--ldap/clients/dsgw/pbhtml/confirm.html4
-rw-r--r--ldap/clients/dsgw/pbhtml/emptyFrame.html4
-rw-r--r--ldap/clients/dsgw/pbhtml/index.html4
-rw-r--r--ldap/clients/dsgw/pbhtml/intro.html4
-rw-r--r--ldap/clients/dsgw/pbhtml/modify.html6
-rw-r--r--ldap/clients/dsgw/pbhtml/nonemp.html6
-rw-r--r--ldap/clients/dsgw/pbhtml/nullStringError.html4
-rw-r--r--ldap/clients/dsgw/pbhtml/phone.html4
-rwxr-xr-xldap/clients/dsgw/pbhtml/phone.js4
-rw-r--r--ldap/clients/dsgw/pbhtml/report.html4
-rw-r--r--ldap/clients/dsgw/pbhtml/style.css4
-rw-r--r--ldap/clients/dsgw/search.c4
-rw-r--r--ldap/clients/dsgw/secglue.c4
-rw-r--r--ldap/clients/dsgw/sort.c4
-rw-r--r--ldap/clients/dsgw/templateindex.c4
-rw-r--r--ldap/clients/dsgw/tutor.c4
-rw-r--r--ldap/clients/dsgw/unauth.c4
-rw-r--r--ldap/clients/dsgw/userhtml/Makefile4
-rw-r--r--ldap/clients/dsgw/userhtml/edit-userpasswd.html4
-rw-r--r--ldap/clients/dsgw/userhtml/edit-userpinfo.html4
-rw-r--r--ldap/clients/dsgw/userhtml/index.html4
-rw-r--r--ldap/clients/dsgw/userhtml/index.lst4
-rw-r--r--ldap/clients/dsgw/utf8compare.c4
-rw-r--r--ldap/clients/dsgw/vcard.c4
-rw-r--r--ldap/clients/dsmlgw/Makefile4
-rw-r--r--ldap/clients/dsmlgw/build.xml8
-rw-r--r--ldap/clients/dsmlgw/misc/dsmlgw.cfg4
-rw-r--r--ldap/clients/dsmlgw/misc/server-config.wsdd8
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Constants.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/test/SOAPClient.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlClient.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java4
-rw-r--r--ldap/clients/orgchart/botframe.html8
-rw-r--r--ldap/clients/orgchart/config.tmpl4
-rw-r--r--ldap/clients/orgchart/index.html8
-rw-r--r--ldap/clients/orgchart/myorg.bat4
-rwxr-xr-xldap/clients/orgchart/myorg.pl4
-rw-r--r--ldap/clients/orgchart/org.bat4
-rwxr-xr-xldap/clients/orgchart/org.pl4
-rw-r--r--ldap/clients/orgchart/styles.css4
-rw-r--r--ldap/clients/orgchart/topframe.html8
-rw-r--r--ldap/clients/orgchart/wrapper.c4
-rw-r--r--ldap/cm/Makefile4
-rw-r--r--ldap/cm/filterfiles.sh4
-rw-r--r--ldap/cm/fixBaseInf.pl4
-rw-r--r--ldap/cm/fixNSPerlInf.pl4
-rw-r--r--ldap/cm/fixPerlDAPInf.pl4
-rw-r--r--ldap/cm/fixSetupInf.pl4
-rw-r--r--ldap/cm/ldapjava.mpw4
-rw-r--r--ldap/cm/nbsp2utf8.sh4
-rw-r--r--ldap/cm/newinst/Makefile4
-rw-r--r--ldap/cm/newinst/fixINF.pl4
-rwxr-xr-xldap/cm/newinst/ns-keygen4
-rwxr-xr-xldap/cm/newinst/ns-update4
-rw-r--r--ldap/cm/newinst/replaceToken.pl4
-rwxr-xr-xldap/cm/newinst/setup4
-rwxr-xr-xldap/cm/newinst/setup.pl4
-rwxr-xr-xldap/cm/newinst/setup.sh4
-rw-r--r--ldap/cm/newinst/slapd.inf4
-rwxr-xr-xldap/cm/newinst/uninstall4
-rw-r--r--ldap/cm/newinst/ux-config.cc4
-rw-r--r--ldap/cm/newinst/ux-config.h7
-rw-r--r--ldap/cm/newinst/ux-dialog.cc4
-rw-r--r--ldap/cm/newinst/ux-dialog.h4
-rw-r--r--ldap/cm/newinst/ux-dsalib_dn.c4
-rw-r--r--ldap/cm/newinst/ux-guesses.cc9
-rw-r--r--ldap/cm/newinstnt/Makefile4
-rw-r--r--ldap/cm/newinstnt/consolinst.c4
-rw-r--r--ldap/cm/newinstnt/consolinst.h4
-rw-r--r--ldap/cm/newinstnt/dsinst.c4
-rw-r--r--ldap/cm/newinstnt/dsinst.h4
-rw-r--r--ldap/cm/newinstnt/dsinst.rc4
-rw-r--r--ldap/cm/newinstnt/dsinst_dsalib_dn.c4
-rw-r--r--ldap/cm/newinstnt/libinst.c4
-rw-r--r--ldap/cm/newinstnt/libinst.h4
-rw-r--r--ldap/cm/newinstnt/resource.h4
-rw-r--r--ldap/cm/newinstnt/setup.bat4
-rw-r--r--ldap/cm/newinstnt/setup.inf4
-rw-r--r--ldap/cm/newinstnt/slapd.inf4
-rw-r--r--ldap/cm/ntpack.sh4
-rwxr-xr-xldap/cm/unixstrip4
-rw-r--r--ldap/cm/unixstrip.pl4
-rw-r--r--ldap/cm/v1confs/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-media-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-news-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-web-schema.conf4
-rw-r--r--ldap/cm/v1confs/slapd.at.conf4
-rw-r--r--ldap/cm/v1confs/slapd.oc.conf4
-rw-r--r--ldap/cm/v3confs/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-media-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-news-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-web-schema.conf4
-rw-r--r--ldap/cm/v3confs/slapd.at.conf4
-rw-r--r--ldap/cm/v3confs/slapd.oc.conf4
-rw-r--r--ldap/cm/v4confs/40/java-object-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-admin-schema.confbin4903 -> 5015 bytes
-rw-r--r--ldap/cm/v4confs/40/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-common-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-cos-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-delegated-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-legacy-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mcd-browser-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mcd-config-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mcd-li-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mcd-li-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mcd-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-media-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mlm-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-msg-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-netshare-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-news-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-value-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-wcal-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-wcal-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-web-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/slapd.at.conf4
-rw-r--r--ldap/cm/v4confs/40/slapd.oc.conf4
-rw-r--r--ldap/cm/v4confs/41/java-object-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-common-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-cos-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-delegated-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-legacy-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mcd-browser-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mcd-config-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mcd-li-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mcd-li-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mcd-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-media-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mlm-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-msg-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-netshare-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-news-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-value-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-wcal-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-wcal-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-web-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/slapd.at.conf4
-rw-r--r--ldap/cm/v4confs/41/slapd.oc.conf4
-rw-r--r--ldap/cm/v4confs/411/java-object-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-common-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-cos-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-delegated-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-legacy-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mcd-browser-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mcd-config-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mcd-li-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mcd-li-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mcd-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-media-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mlm-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-msg-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-netshare-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-news-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-value-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-wcal-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-wcal-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-web-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/slapd.at.conf4
-rw-r--r--ldap/cm/v4confs/411/slapd.oc.conf4
-rw-r--r--ldap/cm/v4confs/412/java-object-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-common-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-cos-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-delegated-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-legacy-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mcd-browser-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mcd-config-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mcd-li-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mcd-li-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mcd-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-media-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mlm-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-msg-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-netshare-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-news-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-value-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-wcal-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-wcal-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-web-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/slapd.at.conf4
-rw-r--r--ldap/cm/v4confs/412/slapd.oc.conf4
-rw-r--r--ldap/dsml/European.dsml4
-rw-r--r--ldap/dsml/Example-roles.dsml4
-rw-r--r--ldap/dsml/Example.dsml4
-rw-r--r--ldap/include/Makefile4
-rw-r--r--ldap/include/Makefile.client4
-rw-r--r--ldap/include/avl.h4
-rw-r--r--ldap/include/dblayer.h4
-rw-r--r--ldap/include/dirlite_strings.h4
-rw-r--r--ldap/include/disptmpl.h4
-rw-r--r--ldap/include/ldaplog.h4
-rw-r--r--ldap/include/ldaprot.h4
-rw-r--r--ldap/include/ldbm.h4
-rw-r--r--ldap/include/ldif.h4
-rw-r--r--ldap/include/litekey.h4
-rw-r--r--ldap/include/lthread.h4
-rw-r--r--ldap/include/ntslapdregparms.h4
-rw-r--r--ldap/include/ntwatchdog.h4
-rw-r--r--ldap/include/portable.h4
-rw-r--r--ldap/include/proto-ntutil.h4
-rw-r--r--ldap/include/regex.h4
-rw-r--r--ldap/include/srchpref.h4
-rw-r--r--ldap/include/sysexits-compat.h4
-rw-r--r--ldap/javarules.mk4
-rw-r--r--ldap/ldif/Ace.ldif4
-rw-r--r--ldap/ldif/European.ldif4
-rw-r--r--ldap/ldif/Eurosuffix.ldif4
-rw-r--r--ldap/ldif/Example-roles.ldif4
-rw-r--r--ldap/ldif/Example-views.ldif4
-rw-r--r--ldap/ldif/Example.ldif4
-rw-r--r--ldap/ldif/commonTasks.ldif4
-rw-r--r--ldap/ldif/roledit.ldif4
-rw-r--r--ldap/ldif/tasks.ldif4
-rw-r--r--ldap/ldif/template.ldif4
-rw-r--r--ldap/libraries/Makefile4
-rw-r--r--ldap/libraries/Makefile.client4
-rw-r--r--ldap/libraries/libavl/Makefile4
-rw-r--r--ldap/libraries/libavl/avl.c4
-rw-r--r--ldap/libraries/libavl/testavl.c4
-rw-r--r--ldap/libraries/libldif/Makefile4
-rw-r--r--ldap/libraries/libldif/fileurl.c4
-rw-r--r--ldap/libraries/libldif/fileurl.h4
-rw-r--r--ldap/libraries/libldif/line64.c4
-rw-r--r--ldap/libraries/liblitekey/Makefile4
-rw-r--r--ldap/libraries/liblitekey/keycheck.c4
-rw-r--r--ldap/libraries/libutil/Makefile4
-rw-r--r--ldap/libraries/libutil/ntdebug.c4
-rw-r--r--ldap/libraries/libutil/ntevent.c4
-rw-r--r--ldap/libraries/libutil/ntreg.c4
-rw-r--r--ldap/libraries/libutil/ntresource.h4
-rw-r--r--ldap/libraries/libutil/ntstubs.c4
-rw-r--r--ldap/nsdeps.mk4
-rw-r--r--ldap/nsldap.mk4
-rw-r--r--ldap/schema/00core.ldif4
-rw-r--r--ldap/schema/05rfc2247.ldif4
-rw-r--r--ldap/schema/05rfc2927.ldif4
-rw-r--r--ldap/schema/10presence.ldif4
-rw-r--r--ldap/schema/10rfc2307.ldif4
-rw-r--r--ldap/schema/20subscriber.ldif4
-rw-r--r--ldap/schema/25java-object.ldif4
-rw-r--r--ldap/schema/28pilot.ldif4
-rw-r--r--ldap/schema/30ns-common.ldif4
-rw-r--r--ldap/schema/50ns-admin.ldif4
-rw-r--r--ldap/schema/50ns-calendar.ldif4
-rw-r--r--ldap/schema/50ns-certificate.ldif4
-rw-r--r--ldap/schema/50ns-compass.ldif4
-rw-r--r--ldap/schema/50ns-delegated-admin.ldif4
-rw-r--r--ldap/schema/50ns-directory.ldif4
-rw-r--r--ldap/schema/50ns-legacy.ldif4
-rw-r--r--ldap/schema/50ns-mail.ldif4
-rw-r--r--ldap/schema/50ns-mcd-browser.ldif4
-rw-r--r--ldap/schema/50ns-mcd-config.ldif4
-rw-r--r--ldap/schema/50ns-mcd-li.ldif4
-rw-r--r--ldap/schema/50ns-mcd-mail.ldif4
-rw-r--r--ldap/schema/50ns-media.ldif4
-rw-r--r--ldap/schema/50ns-mlm.ldif4
-rw-r--r--ldap/schema/50ns-msg.ldif4
-rw-r--r--ldap/schema/50ns-netshare.ldif4
-rw-r--r--ldap/schema/50ns-news.ldif4
-rw-r--r--ldap/schema/50ns-proxy.ldif4
-rw-r--r--ldap/schema/50ns-value.ldif4
-rw-r--r--ldap/schema/50ns-wcal.ldif4
-rw-r--r--ldap/schema/50ns-web.ldif4
-rw-r--r--ldap/schema/51ns-calendar.ldif4
-rw-r--r--ldap/schema/60pam-plugin.ldif4
-rw-r--r--ldap/schema/99user.ldif4
-rw-r--r--ldap/schema/ns-calendar-globopt.conf4
-rw-r--r--ldap/schema/ns-certificate-globopt.conf4
-rw-r--r--ldap/schema/ns-compass-globopt.conf4
-rw-r--r--ldap/schema/ns-directory-globopt.conf4
-rw-r--r--ldap/schema/ns-mail-globopt.conf4
-rw-r--r--ldap/schema/ns-mcd-li-globopt.conf4
-rw-r--r--ldap/schema/ns-media-globopt.conf4
-rw-r--r--ldap/schema/ns-news-globopt.conf4
-rw-r--r--ldap/schema/ns-proxy-globopt.conf4
-rw-r--r--ldap/schema/ns-wcal-globopt.conf4
-rw-r--r--ldap/schema/ns-web-globopt.conf4
-rw-r--r--ldap/schema/slapd-collations.conf4
-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
-rw-r--r--ldap/synctools/Makefile4
-rw-r--r--ldap/synctools/passwordsync/README.txt4
-rw-r--r--ldap/synctools/passwordsync/build.bat4
-rw-r--r--ldap/synctools/passwordsync/passhand.cpp4
-rw-r--r--ldap/synctools/passwordsync/passhand.h4
-rw-r--r--ldap/synctools/passwordsync/passhook/passhook.cpp4
-rw-r--r--ldap/synctools/passwordsync/passhook/passhook.dep4
-rw-r--r--ldap/synctools/passwordsync/passhook/passhook.mak4
-rw-r--r--ldap/synctools/passwordsync/passsync/dssynch.h4
-rw-r--r--ldap/synctools/passwordsync/passsync/dssynchmsg.h4
-rw-r--r--ldap/synctools/passwordsync/passsync/ntservice.cpp4
-rw-r--r--ldap/synctools/passwordsync/passsync/ntservice.h4
-rw-r--r--ldap/synctools/passwordsync/passsync/resource.h4
-rw-r--r--ldap/synctools/passwordsync/passsync/service.cpp4
-rw-r--r--ldap/synctools/passwordsync/passsync/subuniutil.cpp4
-rw-r--r--ldap/synctools/passwordsync/passsync/subuniutil.h4
-rw-r--r--ldap/synctools/passwordsync/passsync/synchcmds.h4
-rw-r--r--ldap/synctools/passwordsync/passsync/syncserv.cpp4
-rw-r--r--ldap/synctools/passwordsync/passsync/syncserv.h4
-rw-r--r--ldap/synctools/passwordsync/wix/PassSync.wxs8
-rw-r--r--ldap/synctools/passwordsync/wix/README.txt4
-rw-r--r--ldap/systools/Makefile4
-rwxr-xr-xldap/systools/getHPPatches.pl4
-rwxr-xr-xldap/systools/getSolPatches.pl4
-rw-r--r--ldap/systools/hp_patches.c4
-rw-r--r--ldap/systools/idsktune.c4
-rwxr-xr-xldap/systools/mergeSolPatches.pl4
-rw-r--r--ldap/systools/pio.c4
-rw-r--r--ldap/systools/pio.h4
-rw-r--r--ldap/systools/sol_patches.c4
-rw-r--r--ldap/systools/viewcore.c4
-rw-r--r--ldapserver.spec.tmpl4
-rw-r--r--lib/base/Makefile4
-rw-r--r--lib/base/crit.cpp4
-rw-r--r--lib/base/dns.cpp4
-rw-r--r--lib/base/dnsdmain.cpp4
-rw-r--r--lib/base/ereport.cpp4
-rw-r--r--lib/base/eventlog.cpp4
-rw-r--r--lib/base/file.cpp4
-rw-r--r--lib/base/fsmutex.cpp4
-rw-r--r--lib/base/lexer.cpp4
-rw-r--r--lib/base/lexer_pvt.h4
-rw-r--r--lib/base/net.cpp4
-rw-r--r--lib/base/nscperror.c4
-rw-r--r--lib/base/nterrors.cpp4
-rw-r--r--lib/base/plist.cpp4
-rw-r--r--lib/base/plist_pvt.h4
-rw-r--r--lib/base/pool.cpp4
-rw-r--r--lib/base/rwlock.cpp4
-rw-r--r--lib/base/shexp.cpp4
-rw-r--r--lib/base/system.cpp4
-rw-r--r--lib/base/systhr.cpp4
-rw-r--r--lib/base/util.cpp4
-rw-r--r--lib/ldaputil/Makefile4
-rw-r--r--lib/ldaputil/cert.c4
-rw-r--r--lib/ldaputil/certmap.c4
-rw-r--r--lib/ldaputil/certmap.conf4
-rw-r--r--lib/ldaputil/dbconf.c4
-rw-r--r--lib/ldaputil/encode.c4
-rw-r--r--lib/ldaputil/errors.c4
-rw-r--r--lib/ldaputil/examples/Certmap.mak4
-rw-r--r--lib/ldaputil/examples/Makefile4
-rw-r--r--lib/ldaputil/examples/README4
-rw-r--r--lib/ldaputil/examples/init.c4
-rw-r--r--lib/ldaputil/examples/plugin.c4
-rw-r--r--lib/ldaputil/examples/plugin.h4
-rw-r--r--lib/ldaputil/init.c4
-rw-r--r--lib/ldaputil/ldapauth.c4
-rw-r--r--lib/ldaputil/ldapdb.c4
-rw-r--r--lib/ldaputil/ldapu-changes.html4
-rw-r--r--lib/ldaputil/ldaputili.h4
-rw-r--r--lib/ldaputil/utest/Makefile4
-rw-r--r--lib/ldaputil/utest/auth.cpp4
-rwxr-xr-xlib/ldaputil/utest/authtest4
-rw-r--r--lib/ldaputil/utest/certmap.conf4
-rw-r--r--lib/ldaputil/utest/dblist.conf4
-rw-r--r--lib/ldaputil/utest/example.c4
-rw-r--r--lib/ldaputil/utest/plugin.c4
-rw-r--r--lib/ldaputil/utest/plugin.h4
-rw-r--r--lib/ldaputil/utest/stubs.c4
-rw-r--r--lib/ldaputil/utest/stubs.cpp4
-rw-r--r--lib/ldaputil/utest/test.ref4
-rw-r--r--lib/ldaputil/vtable.c4
-rw-r--r--lib/libaccess/Makefile4
-rw-r--r--lib/libaccess/access_plhash.cpp4
-rw-r--r--lib/libaccess/access_plhash.h4
-rw-r--r--lib/libaccess/acl.tab.cpp4
-rw-r--r--lib/libaccess/acl.tab.h4
-rw-r--r--lib/libaccess/acl.yy.cpp4
-rw-r--r--lib/libaccess/aclcache.cpp4
-rw-r--r--lib/libaccess/aclcache.h4
-rw-r--r--lib/libaccess/aclerror.cpp4
-rw-r--r--lib/libaccess/acleval.cpp4
-rw-r--r--lib/libaccess/aclflush.cpp4
-rw-r--r--lib/libaccess/aclpriv.h4
-rw-r--r--lib/libaccess/aclscan.h4
-rw-r--r--lib/libaccess/aclscan.l4
-rw-r--r--lib/libaccess/aclspace.cpp4
-rw-r--r--lib/libaccess/acltext.y4
-rw-r--r--lib/libaccess/acltools.cpp4
-rw-r--r--lib/libaccess/aclutil.cpp4
-rw-r--r--lib/libaccess/aclutil.h4
-rw-r--r--lib/libaccess/authdb.cpp4
-rw-r--r--lib/libaccess/las.h4
-rw-r--r--lib/libaccess/lasdns.cpp4
-rw-r--r--lib/libaccess/lasdns.h4
-rw-r--r--lib/libaccess/lasgroup.cpp4
-rw-r--r--lib/libaccess/lasip.cpp4
-rw-r--r--lib/libaccess/lasip.h4
-rw-r--r--lib/libaccess/lastod.cpp4
-rw-r--r--lib/libaccess/lasuser.cpp4
-rw-r--r--lib/libaccess/ldapacl.cpp4
-rw-r--r--lib/libaccess/ldapauth.h4
-rw-r--r--lib/libaccess/method.cpp4
-rw-r--r--lib/libaccess/nsautherr.cpp4
-rw-r--r--lib/libaccess/nseframe.cpp4
-rw-r--r--lib/libaccess/oneeval.cpp4
-rw-r--r--lib/libaccess/oneeval.h4
-rw-r--r--lib/libaccess/parse.h4
-rw-r--r--lib/libaccess/permhash.h4
-rw-r--r--lib/libaccess/register.cpp4
-rw-r--r--lib/libaccess/symbols.cpp4
-rw-r--r--lib/libaccess/usi.cpp4
-rw-r--r--lib/libaccess/usrcache.cpp4
-rw-r--r--lib/libaccess/utest/Makefile4
-rw-r--r--lib/libaccess/utest/acl.dat4
-rw-r--r--lib/libaccess/utest/aclfile04
-rw-r--r--lib/libaccess/utest/aclfile14
-rw-r--r--lib/libaccess/utest/aclfile104
-rw-r--r--lib/libaccess/utest/aclfile114
-rw-r--r--lib/libaccess/utest/aclfile124
-rw-r--r--lib/libaccess/utest/aclfile134
-rw-r--r--lib/libaccess/utest/aclfile144
-rw-r--r--lib/libaccess/utest/aclfile154
-rw-r--r--lib/libaccess/utest/aclfile164
-rw-r--r--lib/libaccess/utest/aclfile174
-rw-r--r--lib/libaccess/utest/aclfile184
-rw-r--r--lib/libaccess/utest/aclfile194
-rw-r--r--lib/libaccess/utest/aclfile24
-rw-r--r--lib/libaccess/utest/aclfile34
-rw-r--r--lib/libaccess/utest/aclfile44
-rw-r--r--lib/libaccess/utest/aclfile54
-rw-r--r--lib/libaccess/utest/aclfile64
-rw-r--r--lib/libaccess/utest/aclfile74
-rw-r--r--lib/libaccess/utest/aclfile84
-rw-r--r--lib/libaccess/utest/aclfile94
-rw-r--r--lib/libaccess/utest/aclgrp04
-rw-r--r--lib/libaccess/utest/aclgrp14
-rw-r--r--lib/libaccess/utest/aclgrp24
-rw-r--r--lib/libaccess/utest/aclgrp34
-rw-r--r--lib/libaccess/utest/aclgrp44
-rw-r--r--lib/libaccess/utest/acltest.cpp4
-rw-r--r--lib/libaccess/utest/lasemail.cpp4
-rw-r--r--lib/libaccess/utest/onetest.cpp4
-rw-r--r--lib/libaccess/utest/shexp.cpp4
-rw-r--r--lib/libaccess/utest/shexp.h4
-rw-r--r--lib/libaccess/utest/testmain.cpp4
-rw-r--r--lib/libaccess/utest/twotest.cpp4
-rw-r--r--lib/libaccess/utest/ustubs.cpp4
-rw-r--r--lib/libaccess/yy-sed4
-rw-r--r--lib/libadmin/Makefile4
-rw-r--r--lib/libadmin/authdb.c4
-rw-r--r--lib/libadmin/error.c4
-rw-r--r--lib/libadmin/template.c4
-rw-r--r--lib/libadmin/util.c4
-rw-r--r--lib/libnt/Makefile4
-rw-r--r--lib/libnt/info.c4
-rw-r--r--lib/libnt/path.c4
-rw-r--r--lib/libnt/pmddeml.c4
-rw-r--r--lib/libnt/registry.c4
-rw-r--r--lib/libnt/service.c4
-rw-r--r--lib/libnt/tcpip.c4
-rw-r--r--lib/libsi18n/Makefile4
-rw-r--r--lib/libsi18n/acclanglist.c4
-rw-r--r--lib/libsi18n/coreres.c4
-rw-r--r--lib/libsi18n/coreres.h4
-rw-r--r--lib/libsi18n/getlang.c4
-rw-r--r--lib/libsi18n/getstrmem.c4
-rw-r--r--lib/libsi18n/getstrmem.h4
-rw-r--r--lib/libsi18n/getstrprop.c4
-rw-r--r--lib/libsi18n/gsslapd.h4
-rw-r--r--lib/libsi18n/makstrdb.c4
-rw-r--r--lib/libsi18n/propset.c4
-rw-r--r--lib/libsi18n/propset.h4
-rw-r--r--lib/libsi18n/reshash.c4
-rw-r--r--lib/libsi18n/reshash.h4
-rw-r--r--lib/libsi18n/txtfile.c4
-rw-r--r--lib/libsi18n/txtfile.h4
-rw-r--r--modules.awk4
-rw-r--r--modules.sh4
-rw-r--r--ns_usepurify.mk4
-rw-r--r--ns_usequantify.mk4
-rw-r--r--ns_usesh.mk4
-rwxr-xr-xnsarch4
-rw-r--r--nsarch.bat4
-rw-r--r--nsconfig.mk4
-rw-r--r--nscore.mk4
-rw-r--r--nsdefs.mk4
-rwxr-xr-xnsperl.mk4
-rw-r--r--ntversion.pl4
-rw-r--r--pumpkin.pl4
1826 files changed, 5548 insertions, 1858 deletions
diff --git a/LICENSE b/LICENSE
index 0f96e761..ca7a70fe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -25,4 +25,6 @@ Public License in all respects for all of the Program code and other code used
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
-do so, delete this exception statement from your version.
+provide this exception without modification, you must delete this exception
+statement from your version and license this file solely under the GPL without
+exception.
diff --git a/Makefile b/Makefile
index 1068387c..2497a0b8 100644
--- a/Makefile
+++ b/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/builddsrpm.sh b/builddsrpm.sh
index 93790fd9..53a1fc68 100755
--- a/builddsrpm.sh
+++ b/builddsrpm.sh
@@ -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/buildnum.pl b/buildnum.pl
index 086df8a4..eb2643e9 100755
--- a/buildnum.pl
+++ b/buildnum.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/buildpaths.mk b/buildpaths.mk
index 6435d21f..b4cb8382 100644
--- a/buildpaths.mk
+++ b/buildpaths.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
diff --git a/component_versions.mk b/component_versions.mk
index b6ebc015..96789024 100644
--- a/component_versions.mk
+++ b/component_versions.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/components.mk b/components.mk
index d9b6bb62..345c233b 100644
--- a/components.mk
+++ b/components.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/HP-UX.mk b/config/HP-UX.mk
index d0031d37..11ae3ed3 100644
--- a/config/HP-UX.mk
+++ b/config/HP-UX.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/HP-UXB.11.11.mk b/config/HP-UXB.11.11.mk
index ff0150a9..427c2698 100644
--- a/config/HP-UXB.11.11.mk
+++ b/config/HP-UXB.11.11.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/Linux2.4.mk b/config/Linux2.4.mk
index 1cbe63ca..7ddc0f15 100644
--- a/config/Linux2.4.mk
+++ b/config/Linux2.4.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/Linux2.6.mk b/config/Linux2.6.mk
index 1cbe63ca..7ddc0f15 100644
--- a/config/Linux2.6.mk
+++ b/config/Linux2.6.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/Makefile b/config/Makefile
index d6a3b4d8..1a73193a 100644
--- a/config/Makefile
+++ b/config/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/config/SunOS5.8.mk b/config/SunOS5.8.mk
index 4faa64ab..603edcfd 100644
--- a/config/SunOS5.8.mk
+++ b/config/SunOS5.8.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/SunOS5.8_i86pc.mk b/config/SunOS5.8_i86pc.mk
index 4faa64ab..603edcfd 100644
--- a/config/SunOS5.8_i86pc.mk
+++ b/config/SunOS5.8_i86pc.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/SunOS5.9.mk b/config/SunOS5.9.mk
index 43e6cd45..25161fcf 100644
--- a/config/SunOS5.9.mk
+++ b/config/SunOS5.9.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/SunOS5.mk b/config/SunOS5.mk
index 6020921f..2c5076af 100644
--- a/config/SunOS5.mk
+++ b/config/SunOS5.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/UNIX.mk b/config/UNIX.mk
index f16e1e7e..c95cfd89 100644
--- a/config/UNIX.mk
+++ b/config/UNIX.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/WINNT5.0.mk b/config/WINNT5.0.mk
index 5223e2a2..17af9c6e 100644
--- a/config/WINNT5.0.mk
+++ b/config/WINNT5.0.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/common.mn b/config/common.mn
index b861831c..38a92b1e 100644
--- a/config/common.mn
+++ b/config/common.mn
@@ -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/config/config.mk b/config/config.mk
index 00d23074..840f930f 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/nfspwd.pl b/config/nfspwd.pl
index e456629c..f1878163 100644
--- a/config/nfspwd.pl
+++ b/config/nfspwd.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/config/nsinstall.c b/config/nsinstall.c
index 4be4ae92..90a7b2f1 100644
--- a/config/nsinstall.c
+++ b/config/nsinstall.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/pathsub.c b/config/pathsub.c
index 07c74761..2f243d0d 100644
--- a/config/pathsub.c
+++ b/config/pathsub.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/pathsub.h b/config/pathsub.h
index 1b0af908..aa06a11a 100644
--- a/config/pathsub.h
+++ b/config/pathsub.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/config/revdepth-nt.pl b/config/revdepth-nt.pl
index 60a0182e..9df9219c 100644
--- a/config/revdepth-nt.pl
+++ b/config/revdepth-nt.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/config/revdepth.pl b/config/revdepth.pl
index 4d8ecacc..a0ef02fe 100644
--- a/config/revdepth.pl
+++ b/config/revdepth.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/config/rules.mk b/config/rules.mk
index 71bdcf72..6ffd2d6a 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/config/webint.mk b/config/webint.mk
index 53589a7c..a5c2928c 100644
--- a/config/webint.mk
+++ b/config/webint.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/dirver.pl b/dirver.pl
index 743a2041..7733793d 100755
--- a/dirver.pl
+++ b/dirver.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/httpd/autobuild b/httpd/autobuild
index dd5f67c4..1818f249 100755
--- a/httpd/autobuild
+++ b/httpd/autobuild
@@ -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/httpd/src/Makefile b/httpd/src/Makefile
index 1925c03e..3064968d 100644
--- a/httpd/src/Makefile
+++ b/httpd/src/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/httpd/src/ntnsapi.c b/httpd/src/ntnsapi.c
index f9db9f9c..5cab8fda 100644
--- a/httpd/src/ntnsapi.c
+++ b/httpd/src/ntnsapi.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/httpd/src/unixso.mk b/httpd/src/unixso.mk
index 4e51f08d..8c0c4661 100644
--- a/httpd/src/unixso.mk
+++ b/httpd/src/unixso.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/include/base/crit.h b/include/base/crit.h
index 0d3879c2..cb98d5d1 100644
--- a/include/base/crit.h
+++ b/include/base/crit.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/include/base/dbtbase.h b/include/base/dbtbase.h
index cbced92a..460b5caf 100644
--- a/include/base/dbtbase.h
+++ b/include/base/dbtbase.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/include/base/ereport.h b/include/base/ereport.h
index 00966050..fe096750 100644
--- a/include/base/ereport.h
+++ b/include/base/ereport.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/include/base/eventhandler.h b/include/base/eventhandler.h
index 68d04be1..ac8597dc 100644
--- a/include/base/eventhandler.h
+++ b/include/base/eventhandler.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/include/base/eventlog.h b/include/base/eventlog.h
index 16c16c76..c1e748de 100644
--- a/include/base/eventlog.h
+++ b/include/base/eventlog.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/include/base/file.h b/include/base/file.h
index 7c0d0a5c..4ad5de2e 100644
--- a/include/base/file.h
+++ b/include/base/file.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/include/base/fsmutex.h b/include/base/fsmutex.h
index a889cb1f..f5fe2422 100644
--- a/include/base/fsmutex.h
+++ b/include/base/fsmutex.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/include/base/lexer.h b/include/base/lexer.h
index db921cf7..30a29b5e 100644
--- a/include/base/lexer.h
+++ b/include/base/lexer.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/include/base/nterr.h b/include/base/nterr.h
index 67525d29..ead6eca7 100644
--- a/include/base/nterr.h
+++ b/include/base/nterr.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/include/base/nterrors.h b/include/base/nterrors.h
index b2d3ccb9..c81f355c 100644
--- a/include/base/nterrors.h
+++ b/include/base/nterrors.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/include/base/plist.h b/include/base/plist.h
index c3a3528a..aff540a0 100644
--- a/include/base/plist.h
+++ b/include/base/plist.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/include/base/pool.h b/include/base/pool.h
index 7695fece..767eb6eb 100644
--- a/include/base/pool.h
+++ b/include/base/pool.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/include/base/rwlock.h b/include/base/rwlock.h
index 8d49aa50..3ca1ffa0 100644
--- a/include/base/rwlock.h
+++ b/include/base/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/include/base/shexp.h b/include/base/shexp.h
index a23ba6bf..17856b5e 100644
--- a/include/base/shexp.h
+++ b/include/base/shexp.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/include/base/systems.h b/include/base/systems.h
index 96683879..a5ce0b54 100644
--- a/include/base/systems.h
+++ b/include/base/systems.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/include/base/systhr.h b/include/base/systhr.h
index 3fb5b667..098c13e9 100644
--- a/include/base/systhr.h
+++ b/include/base/systhr.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/include/base/util.h b/include/base/util.h
index 05885027..fa3614ac 100644
--- a/include/base/util.h
+++ b/include/base/util.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/include/i18n.h b/include/i18n.h
index 78770d82..27cbde11 100644
--- a/include/i18n.h
+++ b/include/i18n.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/include/ldaputil/cert.h b/include/ldaputil/cert.h
index ccdd1b12..d7307cf6 100644
--- a/include/ldaputil/cert.h
+++ b/include/ldaputil/cert.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/include/ldaputil/certmap.h b/include/ldaputil/certmap.h
index 1c73cf1b..6fc81c89 100644
--- a/include/ldaputil/certmap.h
+++ b/include/ldaputil/certmap.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/include/ldaputil/dbconf.h b/include/ldaputil/dbconf.h
index 26a37cd9..c430c94e 100644
--- a/include/ldaputil/dbconf.h
+++ b/include/ldaputil/dbconf.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/include/ldaputil/encode.h b/include/ldaputil/encode.h
index 1fafcdd4..0c3a4a07 100644
--- a/include/ldaputil/encode.h
+++ b/include/ldaputil/encode.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/include/ldaputil/errors.h b/include/ldaputil/errors.h
index 20e07942..6dd074ec 100644
--- a/include/ldaputil/errors.h
+++ b/include/ldaputil/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/include/ldaputil/extcmap.h b/include/ldaputil/extcmap.h
index ead52b3c..aae63066 100644
--- a/include/ldaputil/extcmap.h
+++ b/include/ldaputil/extcmap.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/include/ldaputil/init.h b/include/ldaputil/init.h
index 36112c14..f51d3bf3 100644
--- a/include/ldaputil/init.h
+++ b/include/ldaputil/init.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/include/ldaputil/ldapauth.h b/include/ldaputil/ldapauth.h
index 2dd94063..bc3b73ae 100644
--- a/include/ldaputil/ldapauth.h
+++ b/include/ldaputil/ldapauth.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/include/ldaputil/ldapdb.h b/include/ldaputil/ldapdb.h
index 5c643582..fd667e62 100644
--- a/include/ldaputil/ldapdb.h
+++ b/include/ldaputil/ldapdb.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/include/ldaputil/ldaputil.h b/include/ldaputil/ldaputil.h
index 397df293..35b9a640 100644
--- a/include/ldaputil/ldaputil.h
+++ b/include/ldaputil/ldaputil.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/include/libaccess/acl.h b/include/libaccess/acl.h
index f5170038..253fa4f8 100644
--- a/include/libaccess/acl.h
+++ b/include/libaccess/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/include/libaccess/aclerror.h b/include/libaccess/aclerror.h
index 0cd2824d..771ffeb7 100644
--- a/include/libaccess/aclerror.h
+++ b/include/libaccess/aclerror.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/include/libaccess/acleval.h b/include/libaccess/acleval.h
index a90c1b3c..ce9750e5 100644
--- a/include/libaccess/acleval.h
+++ b/include/libaccess/acleval.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/include/libaccess/aclglobal.h b/include/libaccess/aclglobal.h
index 14bd8b04..0ddd06ee 100644
--- a/include/libaccess/aclglobal.h
+++ b/include/libaccess/aclglobal.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/include/libaccess/aclproto.h b/include/libaccess/aclproto.h
index b63af5aa..57f8137e 100644
--- a/include/libaccess/aclproto.h
+++ b/include/libaccess/aclproto.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/include/libaccess/aclstruct.h b/include/libaccess/aclstruct.h
index 9a83c288..7e9c7a30 100644
--- a/include/libaccess/aclstruct.h
+++ b/include/libaccess/aclstruct.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/include/libaccess/attrec.h b/include/libaccess/attrec.h
index ff5e0369..09fd9f68 100644
--- a/include/libaccess/attrec.h
+++ b/include/libaccess/attrec.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/include/libaccess/authdb.h b/include/libaccess/authdb.h
index 65493b2d..97c2e5a6 100644
--- a/include/libaccess/authdb.h
+++ b/include/libaccess/authdb.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/include/libaccess/dbtlibaccess.h b/include/libaccess/dbtlibaccess.h
index 5db9f37e..dc902675 100644
--- a/include/libaccess/dbtlibaccess.h
+++ b/include/libaccess/dbtlibaccess.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/include/libaccess/dnfstruct.h b/include/libaccess/dnfstruct.h
index 07a5f3b2..2c2502d7 100644
--- a/include/libaccess/dnfstruct.h
+++ b/include/libaccess/dnfstruct.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/include/libaccess/ipfstruct.h b/include/libaccess/ipfstruct.h
index 6bdd2619..37d1d7c6 100644
--- a/include/libaccess/ipfstruct.h
+++ b/include/libaccess/ipfstruct.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/include/libaccess/las.h b/include/libaccess/las.h
index 67c0baf2..c2127f83 100644
--- a/include/libaccess/las.h
+++ b/include/libaccess/las.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/include/libaccess/ldapacl.h b/include/libaccess/ldapacl.h
index 53981579..881d42b3 100644
--- a/include/libaccess/ldapacl.h
+++ b/include/libaccess/ldapacl.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/include/libaccess/nsauth.h b/include/libaccess/nsauth.h
index 2cda74c5..91e5d64b 100644
--- a/include/libaccess/nsauth.h
+++ b/include/libaccess/nsauth.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/include/libaccess/nsautherr.h b/include/libaccess/nsautherr.h
index 89d988e6..43b30225 100644
--- a/include/libaccess/nsautherr.h
+++ b/include/libaccess/nsautherr.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/include/libaccess/nserror.h b/include/libaccess/nserror.h
index b3286c93..b09d04f4 100644
--- a/include/libaccess/nserror.h
+++ b/include/libaccess/nserror.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/include/libaccess/symbols.h b/include/libaccess/symbols.h
index f842a156..7a30f28a 100644
--- a/include/libaccess/symbols.h
+++ b/include/libaccess/symbols.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/include/libaccess/userauth.h b/include/libaccess/userauth.h
index acdab6a5..3766d26a 100644
--- a/include/libaccess/userauth.h
+++ b/include/libaccess/userauth.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/include/libaccess/usi.h b/include/libaccess/usi.h
index ee3f9e04..2a51d85b 100644
--- a/include/libaccess/usi.h
+++ b/include/libaccess/usi.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/include/libaccess/usrcache.h b/include/libaccess/usrcache.h
index 1259a398..464980a8 100644
--- a/include/libaccess/usrcache.h
+++ b/include/libaccess/usrcache.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/include/libadmin/dbtlibadmin.h b/include/libadmin/dbtlibadmin.h
index d373d7dd..43acf214 100644
--- a/include/libadmin/dbtlibadmin.h
+++ b/include/libadmin/dbtlibadmin.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/include/libadmin/libadmin.h b/include/libadmin/libadmin.h
index 1c557490..70631795 100644
--- a/include/libadmin/libadmin.h
+++ b/include/libadmin/libadmin.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/include/netsite.h b/include/netsite.h
index 9b86df76..2b7db9d6 100644
--- a/include/netsite.h
+++ b/include/netsite.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/include/nt/messages.h b/include/nt/messages.h
index 35accbc0..ee519ba9 100644
--- a/include/nt/messages.h
+++ b/include/nt/messages.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/include/nt/nsapi.h b/include/nt/nsapi.h
index a29319ce..09d4e134 100644
--- a/include/nt/nsapi.h
+++ b/include/nt/nsapi.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/include/nt/ntos.h b/include/nt/ntos.h
index 3f2f6913..7d129d6c 100644
--- a/include/nt/ntos.h
+++ b/include/nt/ntos.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/include/nt/regparms.h b/include/nt/regparms.h
index f7b14a2d..f0cbeff5 100644
--- a/include/nt/regparms.h
+++ b/include/nt/regparms.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/include/nt/resource.h b/include/nt/resource.h
index 4311b04d..2dcd3278 100644
--- a/include/nt/resource.h
+++ b/include/nt/resource.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/include/public/base/systems.h b/include/public/base/systems.h
index a73414d6..cdd9fc79 100644
--- a/include/public/base/systems.h
+++ b/include/public/base/systems.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/include/public/netsite.h b/include/public/netsite.h
index 561bed2a..643f2da8 100644
--- a/include/public/netsite.h
+++ b/include/public/netsite.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/include/public/nsacl/aclapi.h b/include/public/nsacl/aclapi.h
index 4f443df0..3180eb76 100644
--- a/include/public/nsacl/aclapi.h
+++ b/include/public/nsacl/aclapi.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/include/public/nsacl/acldef.h b/include/public/nsacl/acldef.h
index 9e684a07..4e9a0b74 100644
--- a/include/public/nsacl/acldef.h
+++ b/include/public/nsacl/acldef.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/include/public/nsacl/nserrdef.h b/include/public/nsacl/nserrdef.h
index 9a30189a..4850e8bb 100644
--- a/include/public/nsacl/nserrdef.h
+++ b/include/public/nsacl/nserrdef.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/include/public/nsacl/plistdef.h b/include/public/nsacl/plistdef.h
index 296e41c5..f991f1f3 100644
--- a/include/public/nsacl/plistdef.h
+++ b/include/public/nsacl/plistdef.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/include/public/nsapi.h b/include/public/nsapi.h
index 2a550f76..81013470 100644
--- a/include/public/nsapi.h
+++ b/include/public/nsapi.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/include/version.h b/include/version.h
index 46f0485b..f8520232 100644
--- a/include/version.h
+++ b/include/version.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/internal_buildpaths.mk b/internal_buildpaths.mk
index c8519360..6cd651e9 100644
--- a/internal_buildpaths.mk
+++ b/internal_buildpaths.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk
index f996abe1..b63ff4bd 100644
--- a/internal_comp_deps.mk
+++ b/internal_comp_deps.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
diff --git a/l10n/dirserv/de/ns-slapd.txt b/l10n/dirserv/de/ns-slapd.txt
index 04f58b9a..ba789100 100644
--- a/l10n/dirserv/de/ns-slapd.txt
+++ b/l10n/dirserv/de/ns-slapd.txt
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -36,8 +38,11 @@
/* This text file was generated by program dblink */
-$Revision: 1.3 $
+$Revision: 1.4 $
$Log: ns-slapd.txt,v $
+Revision 1.4 2005/04/19 22:06:50 nkinder
+Fixed licensing typo
+
Revision 1.3 2005/04/15 22:39:17 nkinder
155068 - Added license to source files
diff --git a/l10n/dirserv/de/ns-slapd.txt.iso8859 b/l10n/dirserv/de/ns-slapd.txt.iso8859
index 64cdc3d6..a2e0f595 100644
--- a/l10n/dirserv/de/ns-slapd.txt.iso8859
+++ b/l10n/dirserv/de/ns-slapd.txt.iso8859
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -36,8 +38,11 @@
/* This text file was generated by program dblink */
-$Revision: 1.3 $
+$Revision: 1.4 $
$Log: ns-slapd.txt.iso8859,v $
+Revision 1.4 2005/04/19 22:06:50 nkinder
+Fixed licensing typo
+
Revision 1.3 2005/04/15 22:39:18 nkinder
155068 - Added license to source files
diff --git a/l10n/dirserv/en/ns-slapd.txt b/l10n/dirserv/en/ns-slapd.txt
index e259069b..cedca87e 100644
--- a/l10n/dirserv/en/ns-slapd.txt
+++ b/l10n/dirserv/en/ns-slapd.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.
@@ -42,8 +44,11 @@
/* This text file was generated by program dblink */
-$Revision: 1.3 $
+$Revision: 1.4 $
$Log: ns-slapd.txt,v $
+Revision 1.4 2005/04/19 22:06:50 nkinder
+Fixed licensing typo
+
Revision 1.3 2005/04/15 22:39:18 nkinder
155068 - Added license to source files
diff --git a/l10n/dirserv/es/ns-slapd.txt b/l10n/dirserv/es/ns-slapd.txt
index b3bd5224..c326b753 100644
--- a/l10n/dirserv/es/ns-slapd.txt
+++ b/l10n/dirserv/es/ns-slapd.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.
@@ -42,8 +44,11 @@
/* This text file was generated by program dblink */
-$Revision: 1.3 $
+$Revision: 1.4 $
$Log: ns-slapd.txt,v $
+Revision 1.4 2005/04/19 22:06:51 nkinder
+Fixed licensing typo
+
Revision 1.3 2005/04/15 22:39:18 nkinder
155068 - Added license to source files
diff --git a/l10n/dirserv/es/ns-slapd.txt.iso8859 b/l10n/dirserv/es/ns-slapd.txt.iso8859
index e3ddf741..d88d5d7b 100644
--- a/l10n/dirserv/es/ns-slapd.txt.iso8859
+++ b/l10n/dirserv/es/ns-slapd.txt.iso8859
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -40,8 +42,11 @@
/* This text file was generated by program dblink */
-$Revision: 1.3 $
+$Revision: 1.4 $
$Log: ns-slapd.txt.iso8859,v $
+Revision 1.4 2005/04/19 22:06:51 nkinder
+Fixed licensing typo
+
Revision 1.3 2005/04/15 22:39:18 nkinder
155068 - Added license to source files
diff --git a/l10n/dirserv/fr/ns-slapd.txt b/l10n/dirserv/fr/ns-slapd.txt
index f92c7e3d..5485a622 100644
--- a/l10n/dirserv/fr/ns-slapd.txt
+++ b/l10n/dirserv/fr/ns-slapd.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.
@@ -42,8 +44,11 @@
/* This text file was generated by program dblink */
-$Revision: 1.3 $
+$Revision: 1.4 $
$Log: ns-slapd.txt,v $
+Revision 1.4 2005/04/19 22:06:51 nkinder
+Fixed licensing typo
+
Revision 1.3 2005/04/15 22:39:18 nkinder
155068 - Added license to source files
diff --git a/l10n/dirserv/fr/ns-slapd.txt.iso8859 b/l10n/dirserv/fr/ns-slapd.txt.iso8859
index c2393366..b774adf5 100644
--- a/l10n/dirserv/fr/ns-slapd.txt.iso8859
+++ b/l10n/dirserv/fr/ns-slapd.txt.iso8859
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -40,8 +42,11 @@
/* This text file was generated by program dblink */
-$Revision: 1.3 $
+$Revision: 1.4 $
$Log: ns-slapd.txt.iso8859,v $
+Revision 1.4 2005/04/19 22:06:52 nkinder
+Fixed licensing typo
+
Revision 1.3 2005/04/15 22:39:18 nkinder
155068 - Added license to source files
diff --git a/l10n/dirserv/ja/ns-slapd.txt b/l10n/dirserv/ja/ns-slapd.txt
index 25250f69..ab2dd6ef 100644
--- a/l10n/dirserv/ja/ns-slapd.txt
+++ b/l10n/dirserv/ja/ns-slapd.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.
@@ -42,8 +44,11 @@
/* This text file was generated by program dblink */
-$Revision: 1.3 $
+$Revision: 1.4 $
$Log: ns-slapd.txt,v $
+Revision 1.4 2005/04/19 22:06:52 nkinder
+Fixed licensing typo
+
Revision 1.3 2005/04/15 22:39:18 nkinder
155068 - Added license to source files
diff --git a/l10n/dirserv/ja/ns-slapd.txt.eucjp b/l10n/dirserv/ja/ns-slapd.txt.eucjp
index bc96611d..50ae08ed 100644
--- a/l10n/dirserv/ja/ns-slapd.txt.eucjp
+++ b/l10n/dirserv/ja/ns-slapd.txt.eucjp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -40,8 +42,11 @@
/* This text file was generated by program dblink */
-$Revision: 1.3 $
+$Revision: 1.4 $
$Log: ns-slapd.txt.eucjp,v $
+Revision 1.4 2005/04/19 22:06:52 nkinder
+Fixed licensing typo
+
Revision 1.3 2005/04/15 22:39:19 nkinder
155068 - Added license to source files
diff --git a/ldap/Makefile b/ldap/Makefile
index 2d7b2d24..6e5945c7 100644
--- a/ldap/Makefile
+++ b/ldap/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/Makefile.client b/ldap/Makefile.client
index 42ac2d50..4527abbc 100644
--- a/ldap/Makefile.client
+++ b/ldap/Makefile.client
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/Makefile b/ldap/admin/Makefile
index bf385893..d0f84525 100644
--- a/ldap/admin/Makefile
+++ b/ldap/admin/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/include/Makefile b/ldap/admin/include/Makefile
index e3b3575f..fbc00719 100644
--- a/ldap/admin/include/Makefile
+++ b/ldap/admin/include/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/include/dsalib.h b/ldap/admin/include/dsalib.h
index 78560f40..02ef156a 100644
--- a/ldap/admin/include/dsalib.h
+++ b/ldap/admin/include/dsalib.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/include/dsalib_pw.h b/ldap/admin/include/dsalib_pw.h
index 998414b9..3510d90a 100644
--- a/ldap/admin/include/dsalib_pw.h
+++ b/ldap/admin/include/dsalib_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/admin/include/dsalib_schema.h b/ldap/admin/include/dsalib_schema.h
index 3f1d3b24..a03ba3ae 100644
--- a/ldap/admin/include/dsalib_schema.h
+++ b/ldap/admin/include/dsalib_schema.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/include/nterrors.h b/ldap/admin/include/nterrors.h
index de34b5e5..1a74ac50 100644
--- a/ldap/admin/include/nterrors.h
+++ b/ldap/admin/include/nterrors.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/lib/Makefile b/ldap/admin/lib/Makefile
index 89df19e1..3eebe24d 100644
--- a/ldap/admin/lib/Makefile
+++ b/ldap/admin/lib/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/lib/dsalib_conf.c b/ldap/admin/lib/dsalib_conf.c
index 5fae7697..58a5eb5c 100644
--- a/ldap/admin/lib/dsalib_conf.c
+++ b/ldap/admin/lib/dsalib_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/admin/lib/dsalib_confs.c b/ldap/admin/lib/dsalib_confs.c
index c3b0d3bf..fc6c71fc 100644
--- a/ldap/admin/lib/dsalib_confs.c
+++ b/ldap/admin/lib/dsalib_confs.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/lib/dsalib_db.c b/ldap/admin/lib/dsalib_db.c
index ba2a5865..9c7b1ca9 100644
--- a/ldap/admin/lib/dsalib_db.c
+++ b/ldap/admin/lib/dsalib_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/admin/lib/dsalib_debug.c b/ldap/admin/lib/dsalib_debug.c
index 70153c9c..1dc2d808 100644
--- a/ldap/admin/lib/dsalib_debug.c
+++ b/ldap/admin/lib/dsalib_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/admin/lib/dsalib_dn.c b/ldap/admin/lib/dsalib_dn.c
index dd91b657..cd157876 100644
--- a/ldap/admin/lib/dsalib_dn.c
+++ b/ldap/admin/lib/dsalib_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/admin/lib/dsalib_filename.c b/ldap/admin/lib/dsalib_filename.c
index f50a3729..8f6d66f7 100644
--- a/ldap/admin/lib/dsalib_filename.c
+++ b/ldap/admin/lib/dsalib_filename.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/lib/dsalib_html.c b/ldap/admin/lib/dsalib_html.c
index b44f13a5..c1ef4888 100644
--- a/ldap/admin/lib/dsalib_html.c
+++ b/ldap/admin/lib/dsalib_html.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/lib/dsalib_ldif.c b/ldap/admin/lib/dsalib_ldif.c
index 2e947901..9813b918 100644
--- a/ldap/admin/lib/dsalib_ldif.c
+++ b/ldap/admin/lib/dsalib_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/admin/lib/dsalib_location.c b/ldap/admin/lib/dsalib_location.c
index 16d11805..84996495 100644
--- a/ldap/admin/lib/dsalib_location.c
+++ b/ldap/admin/lib/dsalib_location.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/lib/dsalib_pw.c b/ldap/admin/lib/dsalib_pw.c
index 55e7c406..038ac922 100644
--- a/ldap/admin/lib/dsalib_pw.c
+++ b/ldap/admin/lib/dsalib_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/admin/lib/dsalib_tailf.c b/ldap/admin/lib/dsalib_tailf.c
index 92960b61..8bddf224 100644
--- a/ldap/admin/lib/dsalib_tailf.c
+++ b/ldap/admin/lib/dsalib_tailf.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/lib/dsalib_updown.c b/ldap/admin/lib/dsalib_updown.c
index fb09bfcb..6c74b54a 100644
--- a/ldap/admin/lib/dsalib_updown.c
+++ b/ldap/admin/lib/dsalib_updown.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/lib/dsalib_util.c b/ldap/admin/lib/dsalib_util.c
index 9c2eba09..ead2a197 100644
--- a/ldap/admin/lib/dsalib_util.c
+++ b/ldap/admin/lib/dsalib_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/admin/src/AddPerlHeader.pl b/ldap/admin/src/AddPerlHeader.pl
index c8581b13..1e64c401 100644
--- a/ldap/admin/src/AddPerlHeader.pl
+++ b/ldap/admin/src/AddPerlHeader.pl
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/Base.def b/ldap/admin/src/Base.def
index 37c92ac9..0dd8f263 100644
--- a/ldap/admin/src/Base.def
+++ b/ldap/admin/src/Base.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/Base.pm b/ldap/admin/src/Base.pm
index 70ac3091..0edf682d 100644
--- a/ldap/admin/src/Base.pm
+++ b/ldap/admin/src/Base.pm
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/CGI_ENV b/ldap/admin/src/CGI_ENV
index 13fca644..7de4263b 100644
--- a/ldap/admin/src/CGI_ENV
+++ b/ldap/admin/src/CGI_ENV
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/Cgi.pm b/ldap/admin/src/Cgi.pm
index c6f4db69..a01d179b 100644
--- a/ldap/admin/src/Cgi.pm
+++ b/ldap/admin/src/Cgi.pm
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/CreateInstall.pl b/ldap/admin/src/CreateInstall.pl
index c74d920f..de15fdac 100644
--- a/ldap/admin/src/CreateInstall.pl
+++ b/ldap/admin/src/CreateInstall.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/DSAdmin.def b/ldap/admin/src/DSAdmin.def
index 1cc76053..06b766b8 100644
--- a/ldap/admin/src/DSAdmin.def
+++ b/ldap/admin/src/DSAdmin.def
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/DSAdmin.mk b/ldap/admin/src/DSAdmin.mk
index 715c1bbe..50a27fbe 100644
--- a/ldap/admin/src/DSAdmin.mk
+++ b/ldap/admin/src/DSAdmin.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/DSAdmin.pm b/ldap/admin/src/DSAdmin.pm
index 503134fe..a2c40d6a 100644
--- a/ldap/admin/src/DSAdmin.pm
+++ b/ldap/admin/src/DSAdmin.pm
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/DSAdmin.xs b/ldap/admin/src/DSAdmin.xs
index 9061a854..f25909a6 100644
--- a/ldap/admin/src/DSAdmin.xs
+++ b/ldap/admin/src/DSAdmin.xs
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/Inf.pm b/ldap/admin/src/Inf.pm
index 79a09f02..4eee2ade 100644
--- a/ldap/admin/src/Inf.pm
+++ b/ldap/admin/src/Inf.pm
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/Makefile b/ldap/admin/src/Makefile
index 2654b55a..fedbd724 100644
--- a/ldap/admin/src/Makefile
+++ b/ldap/admin/src/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/addindex.c b/ldap/admin/src/addindex.c
index d5778442..22732dbb 100644
--- a/ldap/admin/src/addindex.c
+++ b/ldap/admin/src/addindex.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/cfg_sspt.c b/ldap/admin/src/cfg_sspt.c
index 87e408b3..b378cac6 100644
--- a/ldap/admin/src/cfg_sspt.c
+++ b/ldap/admin/src/cfg_sspt.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/cfg_sspt.h b/ldap/admin/src/cfg_sspt.h
index 21c4c1f2..d437080a 100644
--- a/ldap/admin/src/cfg_sspt.h
+++ b/ldap/admin/src/cfg_sspt.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/configure_instance.cpp b/ldap/admin/src/configure_instance.cpp
index eab0ac2c..50cced26 100644
--- a/ldap/admin/src/configure_instance.cpp
+++ b/ldap/admin/src/configure_instance.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/configure_instance.h b/ldap/admin/src/configure_instance.h
index 1105d021..7127af83 100644
--- a/ldap/admin/src/configure_instance.h
+++ b/ldap/admin/src/configure_instance.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/create_instance.c b/ldap/admin/src/create_instance.c
index fffcb2d4..771b227b 100644
--- a/ldap/admin/src/create_instance.c
+++ b/ldap/admin/src/create_instance.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/create_instance.h b/ldap/admin/src/create_instance.h
index 640919f5..f16e5361 100644
--- a/ldap/admin/src/create_instance.h
+++ b/ldap/admin/src/create_instance.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ds_bak2db.c b/ldap/admin/src/ds_bak2db.c
index a72cc3be..57c17fc4 100644
--- a/ldap/admin/src/ds_bak2db.c
+++ b/ldap/admin/src/ds_bak2db.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ds_db2bak.c b/ldap/admin/src/ds_db2bak.c
index ab813a4a..0a1ceeed 100644
--- a/ldap/admin/src/ds_db2bak.c
+++ b/ldap/admin/src/ds_db2bak.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ds_db2ldif.c b/ldap/admin/src/ds_db2ldif.c
index 8db0d021..a63894d2 100644
--- a/ldap/admin/src/ds_db2ldif.c
+++ b/ldap/admin/src/ds_db2ldif.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ds_ldif2db.c b/ldap/admin/src/ds_ldif2db.c
index bab65826..276a0fe5 100644
--- a/ldap/admin/src/ds_ldif2db.c
+++ b/ldap/admin/src/ds_ldif2db.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ds_listdb.c b/ldap/admin/src/ds_listdb.c
index 05b8729d..197e5696 100644
--- a/ldap/admin/src/ds_listdb.c
+++ b/ldap/admin/src/ds_listdb.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ds_newinst.c b/ldap/admin/src/ds_newinst.c
index 47f81097..37576867 100644
--- a/ldap/admin/src/ds_newinst.c
+++ b/ldap/admin/src/ds_newinst.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/admin/src/ds_newinst.pl b/ldap/admin/src/ds_newinst.pl
index 90d7226c..401d4db0 100644
--- a/ldap/admin/src/ds_newinst.pl
+++ b/ldap/admin/src/ds_newinst.pl
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/admin/src/ds_remove.c b/ldap/admin/src/ds_remove.c
index f5cb4fc3..ee2491ac 100644
--- a/ldap/admin/src/ds_remove.c
+++ b/ldap/admin/src/ds_remove.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ds_remove_uninst.cpp b/ldap/admin/src/ds_remove_uninst.cpp
index 3dd190a2..672be925 100644
--- a/ldap/admin/src/ds_remove_uninst.cpp
+++ b/ldap/admin/src/ds_remove_uninst.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ds_remove_uninst.h b/ldap/admin/src/ds_remove_uninst.h
index f5a40c2c..a1500696 100644
--- a/ldap/admin/src/ds_remove_uninst.h
+++ b/ldap/admin/src/ds_remove_uninst.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ds_rmdb.c b/ldap/admin/src/ds_rmdb.c
index db9e6583..476897f6 100644
--- a/ldap/admin/src/ds_rmdb.c
+++ b/ldap/admin/src/ds_rmdb.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ds_snmpctrl.c b/ldap/admin/src/ds_snmpctrl.c
index c18dd48c..06c30503 100644
--- a/ldap/admin/src/ds_snmpctrl.c
+++ b/ldap/admin/src/ds_snmpctrl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ds_viewlog.pl b/ldap/admin/src/ds_viewlog.pl
index e7d6dc65..358d7d7b 100644
--- a/ldap/admin/src/ds_viewlog.pl
+++ b/ldap/admin/src/ds_viewlog.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/fix_secmod_db_64 b/ldap/admin/src/fix_secmod_db_64
index e6d58359..3588a35f 100755
--- a/ldap/admin/src/fix_secmod_db_64
+++ b/ldap/admin/src/fix_secmod_db_64
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/getConfigInfo b/ldap/admin/src/getConfigInfo
index c45ed039..f3e4b356 100644
--- a/ldap/admin/src/getConfigInfo
+++ b/ldap/admin/src/getConfigInfo
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/import2info b/ldap/admin/src/import2info
index 01ca2b14..9c65d914 100755
--- a/ldap/admin/src/import2info
+++ b/ldap/admin/src/import2info
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/init_ds_env.c b/ldap/admin/src/init_ds_env.c
index e91c8798..f291041c 100644
--- a/ldap/admin/src/init_ds_env.c
+++ b/ldap/admin/src/init_ds_env.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/init_ds_env.h b/ldap/admin/src/init_ds_env.h
index ad0d502d..fcb9c8c5 100644
--- a/ldap/admin/src/init_ds_env.h
+++ b/ldap/admin/src/init_ds_env.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/install_keywords.h b/ldap/admin/src/install_keywords.h
index 06fbbf1a..56856614 100644
--- a/ldap/admin/src/install_keywords.h
+++ b/ldap/admin/src/install_keywords.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/instindex.cpp b/ldap/admin/src/instindex.cpp
index 5557fdbf..16087c8c 100644
--- a/ldap/admin/src/instindex.cpp
+++ b/ldap/admin/src/instindex.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.java b/ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.java
index 71ec5a9b..8b6ac443 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.java
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/java/com/netscape/xmltools/DSMLReader.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLReader.java
index f6f7d978..30af93c7 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLReader.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLReader.java
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java
index 96e306b1..5d0f05f0 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java
index 15fa6a79..c8250581 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java
index bd57ab96..ecd3e0b9 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/java/com/netscape/xmltools/GetOpt.java b/ldap/admin/src/java/com/netscape/xmltools/GetOpt.java
index 70d96761..aa52cc6f 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/GetOpt.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/GetOpt.java
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java b/ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java
index e9c035d0..9db6a058 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/java/com/netscape/xmltools/Makefile b/ldap/admin/src/java/com/netscape/xmltools/Makefile
index b9a610a0..94003092 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/Makefile
+++ b/ldap/admin/src/java/com/netscape/xmltools/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/java/install b/ldap/admin/src/java/install
index e71c7ce2..c1ac5faf 100755
--- a/ldap/admin/src/java/install
+++ b/ldap/admin/src/java/install
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/java/mcc b/ldap/admin/src/java/mcc
index e2a67bf1..61b4ab3b 100755
--- a/ldap/admin/src/java/mcc
+++ b/ldap/admin/src/java/mcc
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/java/mcc.bat b/ldap/admin/src/java/mcc.bat
index b1a408af..66eeccb7 100644
--- a/ldap/admin/src/java/mcc.bat
+++ b/ldap/admin/src/java/mcc.bat
@@ -27,7 +27,9 @@
@rem // in conjunction with the Program except the Non-GPL Code covered by this
@rem // exception. If you modify this file, you may extend this exception to your
@rem // version of the file, but you are not obligated to do so. If you do not wish to
-@rem // do so, delete this exception statement from your version.
+@rem // provide this exception without modification, you must delete this exception
+@rem // statement from your version and license this file solely under the GPL without
+@rem // exception.
@rem //
@rem //
@rem // Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/key.rc b/ldap/admin/src/key.rc
index 41696f37..d4e2473a 100644
--- a/ldap/admin/src/key.rc
+++ b/ldap/admin/src/key.rc
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/latest_file.c b/ldap/admin/src/latest_file.c
index d9d8e9d4..df1d6dd2 100644
--- a/ldap/admin/src/latest_file.c
+++ b/ldap/admin/src/latest_file.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
index 4553c212..945c8125 100755
--- a/ldap/admin/src/logconv.pl
+++ b/ldap/admin/src/logconv.pl
@@ -29,7 +29,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/makemccvlvindexes b/ldap/admin/src/makemccvlvindexes
index 05acabc8..fb63e47d 100644
--- a/ldap/admin/src/makemccvlvindexes
+++ b/ldap/admin/src/makemccvlvindexes
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/makevlvindex b/ldap/admin/src/makevlvindex
index 5682711f..322ecc24 100644
--- a/ldap/admin/src/makevlvindex
+++ b/ldap/admin/src/makevlvindex
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/makevlvsearch b/ldap/admin/src/makevlvsearch
index 22399994..0423767d 100644
--- a/ldap/admin/src/makevlvsearch
+++ b/ldap/admin/src/makevlvsearch
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/migrateInstance b/ldap/admin/src/migrateInstance
index 5f981279..14cd5a54 100644
--- a/ldap/admin/src/migrateInstance
+++ b/ldap/admin/src/migrateInstance
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/migrateLocalDB b/ldap/admin/src/migrateLocalDB
index 3d272a1e..522532ad 100644
--- a/ldap/admin/src/migrateLocalDB
+++ b/ldap/admin/src/migrateLocalDB
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/migratePwdFile b/ldap/admin/src/migratePwdFile
index 2ef350c5..7677012e 100644
--- a/ldap/admin/src/migratePwdFile
+++ b/ldap/admin/src/migratePwdFile
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/migrateTo4 b/ldap/admin/src/migrateTo4
index dcf63eb5..22c17c52 100644
--- a/ldap/admin/src/migrateTo4
+++ b/ldap/admin/src/migrateTo4
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/migratedsgw b/ldap/admin/src/migratedsgw
index 1d99ab51..a15c580d 100755
--- a/ldap/admin/src/migratedsgw
+++ b/ldap/admin/src/migratedsgw
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/namegen.c b/ldap/admin/src/namegen.c
index 3a694936..5e36c15b 100644
--- a/ldap/admin/src/namegen.c
+++ b/ldap/admin/src/namegen.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/ns-newpwpolicy.pl b/ldap/admin/src/ns-newpwpolicy.pl
index 492ea416..c91aa822 100644
--- a/ldap/admin/src/ns-newpwpolicy.pl
+++ b/ldap/admin/src/ns-newpwpolicy.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/restart.c b/ldap/admin/src/restart.c
index b05b7d04..fec805fb 100644
--- a/ldap/admin/src/restart.c
+++ b/ldap/admin/src/restart.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/script-gen.c b/ldap/admin/src/script-gen.c
index 9d0e7e26..cac07884 100644
--- a/ldap/admin/src/script-gen.c
+++ b/ldap/admin/src/script-gen.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-bak2db.pl b/ldap/admin/src/scripts/template-bak2db.pl
index 0c6e872e..a409aeb2 100644
--- a/ldap/admin/src/scripts/template-bak2db.pl
+++ b/ldap/admin/src/scripts/template-bak2db.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-cl-dump.pl b/ldap/admin/src/scripts/template-cl-dump.pl
index 905d726f..7368aee2 100755
--- a/ldap/admin/src/scripts/template-cl-dump.pl
+++ b/ldap/admin/src/scripts/template-cl-dump.pl
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -64,7 +66,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-db2bak.pl b/ldap/admin/src/scripts/template-db2bak.pl
index f9a67fcd..231bf920 100644
--- a/ldap/admin/src/scripts/template-db2bak.pl
+++ b/ldap/admin/src/scripts/template-db2bak.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-db2index.pl b/ldap/admin/src/scripts/template-db2index.pl
index c4a57459..d86decc9 100644
--- a/ldap/admin/src/scripts/template-db2index.pl
+++ b/ldap/admin/src/scripts/template-db2index.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-db2ldif.pl b/ldap/admin/src/scripts/template-db2ldif.pl
index 2631a79c..be6efedc 100644
--- a/ldap/admin/src/scripts/template-db2ldif.pl
+++ b/ldap/admin/src/scripts/template-db2ldif.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-dsml-activate.pl b/ldap/admin/src/scripts/template-dsml-activate.pl
index 019cbb60..ca7d5652 100644
--- a/ldap/admin/src/scripts/template-dsml-activate.pl
+++ b/ldap/admin/src/scripts/template-dsml-activate.pl
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-ldif2db.pl b/ldap/admin/src/scripts/template-ldif2db.pl
index 04ef5fdb..04aa2f22 100644
--- a/ldap/admin/src/scripts/template-ldif2db.pl
+++ b/ldap/admin/src/scripts/template-ldif2db.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-migrate50to51 b/ldap/admin/src/scripts/template-migrate50to51
index 0feb4aca..518a978b 100644
--- a/ldap/admin/src/scripts/template-migrate50to51
+++ b/ldap/admin/src/scripts/template-migrate50to51
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-migrate5to6 b/ldap/admin/src/scripts/template-migrate5to6
index 5d0e89f6..63c5774d 100644
--- a/ldap/admin/src/scripts/template-migrate5to6
+++ b/ldap/admin/src/scripts/template-migrate5to6
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-migrate5to7 b/ldap/admin/src/scripts/template-migrate5to7
index b84a0c32..622b2216 100644
--- a/ldap/admin/src/scripts/template-migrate5to7
+++ b/ldap/admin/src/scripts/template-migrate5to7
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-migrate6to7 b/ldap/admin/src/scripts/template-migrate6to7
index f125f081..da799610 100644
--- a/ldap/admin/src/scripts/template-migrate6to7
+++ b/ldap/admin/src/scripts/template-migrate6to7
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-migrateInstance5 b/ldap/admin/src/scripts/template-migrateInstance5
index f7454472..f7224e8a 100644
--- a/ldap/admin/src/scripts/template-migrateInstance5
+++ b/ldap/admin/src/scripts/template-migrateInstance5
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-migrateInstance6 b/ldap/admin/src/scripts/template-migrateInstance6
index 7dc94a81..422e9450 100644
--- a/ldap/admin/src/scripts/template-migrateInstance6
+++ b/ldap/admin/src/scripts/template-migrateInstance6
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-migrateInstance7 b/ldap/admin/src/scripts/template-migrateInstance7
index 9e4d16a1..2493a82e 100644
--- a/ldap/admin/src/scripts/template-migrateInstance7
+++ b/ldap/admin/src/scripts/template-migrateInstance7
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-migrateTo5 b/ldap/admin/src/scripts/template-migrateTo5
index f7bcd5aa..d9849525 100755
--- a/ldap/admin/src/scripts/template-migrateTo5
+++ b/ldap/admin/src/scripts/template-migrateTo5
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-migrateTo6 b/ldap/admin/src/scripts/template-migrateTo6
index d17b329e..2f1c8c95 100644
--- a/ldap/admin/src/scripts/template-migrateTo6
+++ b/ldap/admin/src/scripts/template-migrateTo6
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-migrateTo7 b/ldap/admin/src/scripts/template-migrateTo7
index 93805902..4ee514e8 100644
--- a/ldap/admin/src/scripts/template-migrateTo7
+++ b/ldap/admin/src/scripts/template-migrateTo7
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-ns-accountstatus.pl b/ldap/admin/src/scripts/template-ns-accountstatus.pl
index 7d339b62..0cc5c3ee 100644
--- a/ldap/admin/src/scripts/template-ns-accountstatus.pl
+++ b/ldap/admin/src/scripts/template-ns-accountstatus.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-ns-activate.pl b/ldap/admin/src/scripts/template-ns-activate.pl
index 7d339b62..0cc5c3ee 100644
--- a/ldap/admin/src/scripts/template-ns-activate.pl
+++ b/ldap/admin/src/scripts/template-ns-activate.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-ns-inactivate.pl b/ldap/admin/src/scripts/template-ns-inactivate.pl
index 7d339b62..0cc5c3ee 100644
--- a/ldap/admin/src/scripts/template-ns-inactivate.pl
+++ b/ldap/admin/src/scripts/template-ns-inactivate.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-ns-newpwpolicy.pl b/ldap/admin/src/scripts/template-ns-newpwpolicy.pl
index 6a5d4c3f..55388f33 100755
--- a/ldap/admin/src/scripts/template-ns-newpwpolicy.pl
+++ b/ldap/admin/src/scripts/template-ns-newpwpolicy.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-repl-monitor-cgi.pl b/ldap/admin/src/scripts/template-repl-monitor-cgi.pl
index 72d4f474..ad88c1e6 100755
--- a/ldap/admin/src/scripts/template-repl-monitor-cgi.pl
+++ b/ldap/admin/src/scripts/template-repl-monitor-cgi.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/admin/src/scripts/template-repl-monitor.pl b/ldap/admin/src/scripts/template-repl-monitor.pl
index 748cb4fb..09869baf 100755
--- a/ldap/admin/src/scripts/template-repl-monitor.pl
+++ b/ldap/admin/src/scripts/template-repl-monitor.pl
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -64,7 +66,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/scripts/template-verify-db.pl b/ldap/admin/src/scripts/template-verify-db.pl
index ca7f92c2..4004f5ae 100644
--- a/ldap/admin/src/scripts/template-verify-db.pl
+++ b/ldap/admin/src/scripts/template-verify-db.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/admin/src/shutdown.c b/ldap/admin/src/shutdown.c
index 9665c076..14e6d86a 100644
--- a/ldap/admin/src/shutdown.c
+++ b/ldap/admin/src/shutdown.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/start.c b/ldap/admin/src/start.c
index 3b7e107d..63194fe3 100644
--- a/ldap/admin/src/start.c
+++ b/ldap/admin/src/start.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/uname.lib b/ldap/admin/src/uname.lib
index 8a7c8068..c8124389 100644
--- a/ldap/admin/src/uname.lib
+++ b/ldap/admin/src/uname.lib
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/updatedsgw b/ldap/admin/src/updatedsgw
index f7c28f1c..a0318d32 100755
--- a/ldap/admin/src/updatedsgw
+++ b/ldap/admin/src/updatedsgw
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/upgradeServer b/ldap/admin/src/upgradeServer
index 1aeeedf5..319bcdcf 100755
--- a/ldap/admin/src/upgradeServer
+++ b/ldap/admin/src/upgradeServer
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/admin/src/vlvindex.c b/ldap/admin/src/vlvindex.c
index 59d7f8a5..426c6925 100644
--- a/ldap/admin/src/vlvindex.c
+++ b/ldap/admin/src/vlvindex.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/Makefile b/ldap/clients/Makefile
index 8fd81ef1..142aba08 100644
--- a/ldap/clients/Makefile
+++ b/ldap/clients/Makefile
@@ -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/clients/dsgw/Makefile b/ldap/clients/dsgw/Makefile
index 6f7bb790..6f5cb10a 100644
--- a/ldap/clients/dsgw/Makefile
+++ b/ldap/clients/dsgw/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/clients/dsgw/Versiongw.c b/ldap/clients/dsgw/Versiongw.c
index ae4e7255..6f79ff7b 100644
--- a/ldap/clients/dsgw/Versiongw.c
+++ b/ldap/clients/dsgw/Versiongw.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/Makefile b/ldap/clients/dsgw/admhtml/Makefile
index 7e9bb963..ccda784f 100644
--- a/ldap/clients/dsgw/admhtml/Makefile
+++ b/ldap/clients/dsgw/admhtml/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/clients/dsgw/admhtml/display-country.html b/ldap/clients/dsgw/admhtml/display-country.html
index 92c82f90..24d95f80 100644
--- a/ldap/clients/dsgw/admhtml/display-country.html
+++ b/ldap/clients/dsgw/admhtml/display-country.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/display-dnedit.html b/ldap/clients/dsgw/admhtml/display-dnedit.html
index 5b81e90f..507ade02 100644
--- a/ldap/clients/dsgw/admhtml/display-dnedit.html
+++ b/ldap/clients/dsgw/admhtml/display-dnedit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/display-dnedittop.html b/ldap/clients/dsgw/admhtml/display-dnedittop.html
index fa246109..b5469c69 100644
--- a/ldap/clients/dsgw/admhtml/display-dnedittop.html
+++ b/ldap/clients/dsgw/admhtml/display-dnedittop.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/display-group.html b/ldap/clients/dsgw/admhtml/display-group.html
index 78e91da1..f9812334 100644
--- a/ldap/clients/dsgw/admhtml/display-group.html
+++ b/ldap/clients/dsgw/admhtml/display-group.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/display-groupun.html b/ldap/clients/dsgw/admhtml/display-groupun.html
index 7a6bd356..1e634cf5 100644
--- a/ldap/clients/dsgw/admhtml/display-groupun.html
+++ b/ldap/clients/dsgw/admhtml/display-groupun.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/display-licensed-user.html b/ldap/clients/dsgw/admhtml/display-licensed-user.html
index 4b8a784d..789f855f 100644
--- a/ldap/clients/dsgw/admhtml/display-licensed-user.html
+++ b/ldap/clients/dsgw/admhtml/display-licensed-user.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/display-mailgroup.html b/ldap/clients/dsgw/admhtml/display-mailgroup.html
index 5e3d8905..7b880376 100644
--- a/ldap/clients/dsgw/admhtml/display-mailgroup.html
+++ b/ldap/clients/dsgw/admhtml/display-mailgroup.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/display-org.html b/ldap/clients/dsgw/admhtml/display-org.html
index dfdaa804..ced8bf92 100644
--- a/ldap/clients/dsgw/admhtml/display-org.html
+++ b/ldap/clients/dsgw/admhtml/display-org.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/display-orgperson.html b/ldap/clients/dsgw/admhtml/display-orgperson.html
index 44013608..709a3de1 100644
--- a/ldap/clients/dsgw/admhtml/display-orgperson.html
+++ b/ldap/clients/dsgw/admhtml/display-orgperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/display-orgunit.html b/ldap/clients/dsgw/admhtml/display-orgunit.html
index 0f770fde..32826cb9 100644
--- a/ldap/clients/dsgw/admhtml/display-orgunit.html
+++ b/ldap/clients/dsgw/admhtml/display-orgunit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/display-person.html b/ldap/clients/dsgw/admhtml/display-person.html
index 2b08d849..ae4c9026 100644
--- a/ldap/clients/dsgw/admhtml/display-person.html
+++ b/ldap/clients/dsgw/admhtml/display-person.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/display-umperson.html b/ldap/clients/dsgw/admhtml/display-umperson.html
index 8601695a..48caef0d 100644
--- a/ldap/clients/dsgw/admhtml/display-umperson.html
+++ b/ldap/clients/dsgw/admhtml/display-umperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/dsconfig.html b/ldap/clients/dsgw/admhtml/dsconfig.html
index 466fe495..7fcafef9 100644
--- a/ldap/clients/dsgw/admhtml/dsconfig.html
+++ b/ldap/clients/dsgw/admhtml/dsconfig.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/dscrgroup.html b/ldap/clients/dsgw/admhtml/dscrgroup.html
index dc2d0bcf..ef9e8177 100644
--- a/ldap/clients/dsgw/admhtml/dscrgroup.html
+++ b/ldap/clients/dsgw/admhtml/dscrgroup.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/dscrou.html b/ldap/clients/dsgw/admhtml/dscrou.html
index c37b80c5..8f070848 100644
--- a/ldap/clients/dsgw/admhtml/dscrou.html
+++ b/ldap/clients/dsgw/admhtml/dscrou.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/dscruser.html b/ldap/clients/dsgw/admhtml/dscruser.html
index 962cd0bb..3d109a27 100644
--- a/ldap/clients/dsgw/admhtml/dscruser.html
+++ b/ldap/clients/dsgw/admhtml/dscruser.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/dsexpldif.html b/ldap/clients/dsgw/admhtml/dsexpldif.html
index 7225b39f..0ad8a484 100644
--- a/ldap/clients/dsgw/admhtml/dsexpldif.html
+++ b/ldap/clients/dsgw/admhtml/dsexpldif.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/dsimpldif.html b/ldap/clients/dsgw/admhtml/dsimpldif.html
index 915de5a2..d685c4d3 100644
--- a/ldap/clients/dsgw/admhtml/dsimpldif.html
+++ b/ldap/clients/dsgw/admhtml/dsimpldif.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/dslsgroups.html b/ldap/clients/dsgw/admhtml/dslsgroups.html
index 58ce73d6..b76ba9da 100644
--- a/ldap/clients/dsgw/admhtml/dslsgroups.html
+++ b/ldap/clients/dsgw/admhtml/dslsgroups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/dslsous.html b/ldap/clients/dsgw/admhtml/dslsous.html
index 8a2e8691..3bc6229c 100644
--- a/ldap/clients/dsgw/admhtml/dslsous.html
+++ b/ldap/clients/dsgw/admhtml/dslsous.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/dslsusers.html b/ldap/clients/dsgw/admhtml/dslsusers.html
index 58f6dd1a..ce2a4eb3 100644
--- a/ldap/clients/dsgw/admhtml/dslsusers.html
+++ b/ldap/clients/dsgw/admhtml/dslsusers.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/edit-passwd.html b/ldap/clients/dsgw/admhtml/edit-passwd.html
index 3cd8534f..1b7b2449 100644
--- a/ldap/clients/dsgw/admhtml/edit-passwd.html
+++ b/ldap/clients/dsgw/admhtml/edit-passwd.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/index.lst b/ldap/clients/dsgw/admhtml/index.lst
index 0a95fbc3..362dabfb 100644
--- a/ldap/clients/dsgw/admhtml/index.lst
+++ b/ldap/clients/dsgw/admhtml/index.lst
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-Anything.html b/ldap/clients/dsgw/admhtml/list-Anything.html
index db16c455..785cdce8 100644
--- a/ldap/clients/dsgw/admhtml/list-Anything.html
+++ b/ldap/clients/dsgw/admhtml/list-Anything.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-Auth.html b/ldap/clients/dsgw/admhtml/list-Auth.html
index 8eeffbd6..5979820a 100644
--- a/ldap/clients/dsgw/admhtml/list-Auth.html
+++ b/ldap/clients/dsgw/admhtml/list-Auth.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-Groups-report.html b/ldap/clients/dsgw/admhtml/list-Groups-report.html
index 00dc9efa..32a91c98 100644
--- a/ldap/clients/dsgw/admhtml/list-Groups-report.html
+++ b/ldap/clients/dsgw/admhtml/list-Groups-report.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-Groups-rm.html b/ldap/clients/dsgw/admhtml/list-Groups-rm.html
index 4bbd8289..b7ff1a57 100644
--- a/ldap/clients/dsgw/admhtml/list-Groups-rm.html
+++ b/ldap/clients/dsgw/admhtml/list-Groups-rm.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-Groups.html b/ldap/clients/dsgw/admhtml/list-Groups.html
index 9ce030ea..2f18f8fa 100644
--- a/ldap/clients/dsgw/admhtml/list-Groups.html
+++ b/ldap/clients/dsgw/admhtml/list-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-Org-Units.html b/ldap/clients/dsgw/admhtml/list-Org-Units.html
index 7445d342..a1276246 100644
--- a/ldap/clients/dsgw/admhtml/list-Org-Units.html
+++ b/ldap/clients/dsgw/admhtml/list-Org-Units.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-OrgUnits-report.html b/ldap/clients/dsgw/admhtml/list-OrgUnits-report.html
index 993c4f1a..82de6f60 100644
--- a/ldap/clients/dsgw/admhtml/list-OrgUnits-report.html
+++ b/ldap/clients/dsgw/admhtml/list-OrgUnits-report.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-OrgUnits.html b/ldap/clients/dsgw/admhtml/list-OrgUnits.html
index 7445d342..a1276246 100644
--- a/ldap/clients/dsgw/admhtml/list-OrgUnits.html
+++ b/ldap/clients/dsgw/admhtml/list-OrgUnits.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-Organizations.html b/ldap/clients/dsgw/admhtml/list-Organizations.html
index 58d23592..b296ba06 100644
--- a/ldap/clients/dsgw/admhtml/list-Organizations.html
+++ b/ldap/clients/dsgw/admhtml/list-Organizations.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-Ous-rm.html b/ldap/clients/dsgw/admhtml/list-Ous-rm.html
index 07e511ae..b7918dfe 100644
--- a/ldap/clients/dsgw/admhtml/list-Ous-rm.html
+++ b/ldap/clients/dsgw/admhtml/list-Ous-rm.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-People-report.html b/ldap/clients/dsgw/admhtml/list-People-report.html
index e8280ef4..30518d8f 100644
--- a/ldap/clients/dsgw/admhtml/list-People-report.html
+++ b/ldap/clients/dsgw/admhtml/list-People-report.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-People-rm.html b/ldap/clients/dsgw/admhtml/list-People-rm.html
index 86f82ab3..155218cc 100644
--- a/ldap/clients/dsgw/admhtml/list-People-rm.html
+++ b/ldap/clients/dsgw/admhtml/list-People-rm.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-People.html b/ldap/clients/dsgw/admhtml/list-People.html
index 5639db9d..a25abe92 100644
--- a/ldap/clients/dsgw/admhtml/list-People.html
+++ b/ldap/clients/dsgw/admhtml/list-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-fa-Groups.html b/ldap/clients/dsgw/admhtml/list-fa-Groups.html
index fe98e0ac..018af5b5 100644
--- a/ldap/clients/dsgw/admhtml/list-fa-Groups.html
+++ b/ldap/clients/dsgw/admhtml/list-fa-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-fa-People.html b/ldap/clients/dsgw/admhtml/list-fa-People.html
index fe98e0ac..018af5b5 100644
--- a/ldap/clients/dsgw/admhtml/list-fa-People.html
+++ b/ldap/clients/dsgw/admhtml/list-fa-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-fa_people.html b/ldap/clients/dsgw/admhtml/list-fa_people.html
index fe98e0ac..018af5b5 100644
--- a/ldap/clients/dsgw/admhtml/list-fa_people.html
+++ b/ldap/clients/dsgw/admhtml/list-fa_people.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/admhtml/list-urlsearch.html b/ldap/clients/dsgw/admhtml/list-urlsearch.html
index b3f6fbb6..6c034d1b 100644
--- a/ldap/clients/dsgw/admhtml/list-urlsearch.html
+++ b/ldap/clients/dsgw/admhtml/list-urlsearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/auth.c b/ldap/clients/dsgw/auth.c
index 9e63e0bb..a2f4156d 100644
--- a/ldap/clients/dsgw/auth.c
+++ b/ldap/clients/dsgw/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/clients/dsgw/cgiutil.c b/ldap/clients/dsgw/cgiutil.c
index 8cbac44b..2d021648 100644
--- a/ldap/clients/dsgw/cgiutil.c
+++ b/ldap/clients/dsgw/cgiutil.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/ckdel.c b/ldap/clients/dsgw/ckdel.c
index ac78a39c..fa785f4d 100644
--- a/ldap/clients/dsgw/ckdel.c
+++ b/ldap/clients/dsgw/ckdel.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/ckdump.c b/ldap/clients/dsgw/ckdump.c
index 51647ce5..5975ed5a 100644
--- a/ldap/clients/dsgw/ckdump.c
+++ b/ldap/clients/dsgw/ckdump.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/ckget.c b/ldap/clients/dsgw/ckget.c
index 97ed0447..6a01aabd 100644
--- a/ldap/clients/dsgw/ckget.c
+++ b/ldap/clients/dsgw/ckget.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/ckpurge.c b/ldap/clients/dsgw/ckpurge.c
index 501439ac..cc40037c 100644
--- a/ldap/clients/dsgw/ckpurge.c
+++ b/ldap/clients/dsgw/ckpurge.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/ckput.c b/ldap/clients/dsgw/ckput.c
index bf8c9c20..ebf5c2cc 100644
--- a/ldap/clients/dsgw/ckput.c
+++ b/ldap/clients/dsgw/ckput.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/collate.c b/ldap/clients/dsgw/collate.c
index 7d98ce13..66146c36 100644
--- a/ldap/clients/dsgw/collate.c
+++ b/ldap/clients/dsgw/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/clients/dsgw/config.c b/ldap/clients/dsgw/config.c
index bfa91a14..3cd0e73d 100644
--- a/ldap/clients/dsgw/config.c
+++ b/ldap/clients/dsgw/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/clients/dsgw/config/Makefile b/ldap/clients/dsgw/config/Makefile
index 6b3a4a76..c4080b90 100644
--- a/ldap/clients/dsgw/config/Makefile
+++ b/ldap/clients/dsgw/config/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/clients/dsgw/config/authPassword.html b/ldap/clients/dsgw/config/authPassword.html
index 8b4b4a36..2b8eecfd 100644
--- a/ldap/clients/dsgw/config/authPassword.html
+++ b/ldap/clients/dsgw/config/authPassword.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/authSearch.html b/ldap/clients/dsgw/config/authSearch.html
index 31599783..ca7bbb42 100644
--- a/ldap/clients/dsgw/config/authSearch.html
+++ b/ldap/clients/dsgw/config/authSearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/csearch.html b/ldap/clients/dsgw/config/csearch.html
index ead4b365..a417f2e1 100644
--- a/ldap/clients/dsgw/config/csearch.html
+++ b/ldap/clients/dsgw/config/csearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/csearchAttr.html b/ldap/clients/dsgw/config/csearchAttr.html
index 9c34dc44..f64c9e9b 100644
--- a/ldap/clients/dsgw/config/csearchAttr.html
+++ b/ldap/clients/dsgw/config/csearchAttr.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/csearchBase.html b/ldap/clients/dsgw/config/csearchBase.html
index 336da8a3..a33e7379 100644
--- a/ldap/clients/dsgw/config/csearchBase.html
+++ b/ldap/clients/dsgw/config/csearchBase.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/csearchMatch.html b/ldap/clients/dsgw/config/csearchMatch.html
index 162085d7..605db6ca 100644
--- a/ldap/clients/dsgw/config/csearchMatch.html
+++ b/ldap/clients/dsgw/config/csearchMatch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/csearchString.html b/ldap/clients/dsgw/config/csearchString.html
index 9d011858..4b41be6d 100644
--- a/ldap/clients/dsgw/config/csearchString.html
+++ b/ldap/clients/dsgw/config/csearchString.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/csearchType.html b/ldap/clients/dsgw/config/csearchType.html
index af792f01..0cef8b56 100644
--- a/ldap/clients/dsgw/config/csearchType.html
+++ b/ldap/clients/dsgw/config/csearchType.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/authPassword.html b/ldap/clients/dsgw/config/de/authPassword.html
index 2843ee21..165d9769 100644
--- a/ldap/clients/dsgw/config/de/authPassword.html
+++ b/ldap/clients/dsgw/config/de/authPassword.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/authSearch.html b/ldap/clients/dsgw/config/de/authSearch.html
index 6ddb2017..5deb8efd 100644
--- a/ldap/clients/dsgw/config/de/authSearch.html
+++ b/ldap/clients/dsgw/config/de/authSearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/csearchAttr.html b/ldap/clients/dsgw/config/de/csearchAttr.html
index 0505d0b1..e99a4b37 100644
--- a/ldap/clients/dsgw/config/de/csearchAttr.html
+++ b/ldap/clients/dsgw/config/de/csearchAttr.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/csearchBase.html b/ldap/clients/dsgw/config/de/csearchBase.html
index e6774542..b4554ee0 100644
--- a/ldap/clients/dsgw/config/de/csearchBase.html
+++ b/ldap/clients/dsgw/config/de/csearchBase.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/csearchString.html b/ldap/clients/dsgw/config/de/csearchString.html
index 1fe6fdf0..a5f9b989 100644
--- a/ldap/clients/dsgw/config/de/csearchString.html
+++ b/ldap/clients/dsgw/config/de/csearchString.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/csearchType.html b/ldap/clients/dsgw/config/de/csearchType.html
index ddfc65a2..b617baf3 100644
--- a/ldap/clients/dsgw/config/de/csearchType.html
+++ b/ldap/clients/dsgw/config/de/csearchType.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-country.html b/ldap/clients/dsgw/config/de/display-country.html
index 201a6b08..1d7e5530 100644
--- a/ldap/clients/dsgw/config/de/display-country.html
+++ b/ldap/clients/dsgw/config/de/display-country.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-dnedit.html b/ldap/clients/dsgw/config/de/display-dnedit.html
index 649647e4..c9f816b1 100644
--- a/ldap/clients/dsgw/config/de/display-dnedit.html
+++ b/ldap/clients/dsgw/config/de/display-dnedit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-dneditpeople.html b/ldap/clients/dsgw/config/de/display-dneditpeople.html
index da13e081..a22bd64e 100644
--- a/ldap/clients/dsgw/config/de/display-dneditpeople.html
+++ b/ldap/clients/dsgw/config/de/display-dneditpeople.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-group.html b/ldap/clients/dsgw/config/de/display-group.html
index 52bcb043..c56efc3a 100644
--- a/ldap/clients/dsgw/config/de/display-group.html
+++ b/ldap/clients/dsgw/config/de/display-group.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-groupun.html b/ldap/clients/dsgw/config/de/display-groupun.html
index 1ae934a8..edf523dc 100644
--- a/ldap/clients/dsgw/config/de/display-groupun.html
+++ b/ldap/clients/dsgw/config/de/display-groupun.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-mailgroup.html b/ldap/clients/dsgw/config/de/display-mailgroup.html
index 336dd12d..76a95284 100644
--- a/ldap/clients/dsgw/config/de/display-mailgroup.html
+++ b/ldap/clients/dsgw/config/de/display-mailgroup.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-ntgroup.html b/ldap/clients/dsgw/config/de/display-ntgroup.html
index 003cca78..d42b7ac0 100644
--- a/ldap/clients/dsgw/config/de/display-ntgroup.html
+++ b/ldap/clients/dsgw/config/de/display-ntgroup.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-ntperson.html b/ldap/clients/dsgw/config/de/display-ntperson.html
index 9765853a..8a8a9741 100644
--- a/ldap/clients/dsgw/config/de/display-ntperson.html
+++ b/ldap/clients/dsgw/config/de/display-ntperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-org.html b/ldap/clients/dsgw/config/de/display-org.html
index 32b51442..94fe6dae 100644
--- a/ldap/clients/dsgw/config/de/display-org.html
+++ b/ldap/clients/dsgw/config/de/display-org.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-orgperson.html b/ldap/clients/dsgw/config/de/display-orgperson.html
index 1e524d75..1e745cc5 100644
--- a/ldap/clients/dsgw/config/de/display-orgperson.html
+++ b/ldap/clients/dsgw/config/de/display-orgperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-orgunit.html b/ldap/clients/dsgw/config/de/display-orgunit.html
index 5d5f529f..d91afec1 100644
--- a/ldap/clients/dsgw/config/de/display-orgunit.html
+++ b/ldap/clients/dsgw/config/de/display-orgunit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-person.html b/ldap/clients/dsgw/config/de/display-person.html
index 145635e7..1d5b9f43 100644
--- a/ldap/clients/dsgw/config/de/display-person.html
+++ b/ldap/clients/dsgw/config/de/display-person.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/display-umperson.html b/ldap/clients/dsgw/config/de/display-umperson.html
index ec8d3566..b5fb42c1 100644
--- a/ldap/clients/dsgw/config/de/display-umperson.html
+++ b/ldap/clients/dsgw/config/de/display-umperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/dsgw-l10n.conf b/ldap/clients/dsgw/config/de/dsgw-l10n.conf
index 24081a57..3155f833 100644
--- a/ldap/clients/dsgw/config/de/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/de/dsgw-l10n.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/dsgw.conf b/ldap/clients/dsgw/config/de/dsgw.conf
index 7022f1db..555de719 100644
--- a/ldap/clients/dsgw/config/de/dsgw.conf
+++ b/ldap/clients/dsgw/config/de/dsgw.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/dsgw.tmpl b/ldap/clients/dsgw/config/de/dsgw.tmpl
index ac2fd8be..70668120 100644
--- a/ldap/clients/dsgw/config/de/dsgw.tmpl
+++ b/ldap/clients/dsgw/config/de/dsgw.tmpl
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/dsgw_adm.conf b/ldap/clients/dsgw/config/de/dsgw_adm.conf
index 66a7db0e..d1390375 100644
--- a/ldap/clients/dsgw/config/de/dsgw_adm.conf
+++ b/ldap/clients/dsgw/config/de/dsgw_adm.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/dsgwfilter.conf b/ldap/clients/dsgw/config/de/dsgwfilter.conf
index f94a5ddd..936d99d3 100644
--- a/ldap/clients/dsgw/config/de/dsgwfilter.conf
+++ b/ldap/clients/dsgw/config/de/dsgwfilter.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/dsgwfilter_adm.conf b/ldap/clients/dsgw/config/de/dsgwfilter_adm.conf
index de18c0d1..b69ac1fe 100644
--- a/ldap/clients/dsgw/config/de/dsgwfilter_adm.conf
+++ b/ldap/clients/dsgw/config/de/dsgwfilter_adm.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/dsgwsearchprefs.conf b/ldap/clients/dsgw/config/de/dsgwsearchprefs.conf
index 441bc612..bb58da50 100644
--- a/ldap/clients/dsgw/config/de/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/config/de/dsgwsearchprefs.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/edit-passwd.html b/ldap/clients/dsgw/config/de/edit-passwd.html
index b7af9b89..984dbf6b 100644
--- a/ldap/clients/dsgw/config/de/edit-passwd.html
+++ b/ldap/clients/dsgw/config/de/edit-passwd.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/list-Anything.html b/ldap/clients/dsgw/config/de/list-Anything.html
index 8ac6c389..3a34bdd9 100644
--- a/ldap/clients/dsgw/config/de/list-Anything.html
+++ b/ldap/clients/dsgw/config/de/list-Anything.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/list-Auth.html b/ldap/clients/dsgw/config/de/list-Auth.html
index 5823afc7..ac0063a4 100644
--- a/ldap/clients/dsgw/config/de/list-Auth.html
+++ b/ldap/clients/dsgw/config/de/list-Auth.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/list-Groups.html b/ldap/clients/dsgw/config/de/list-Groups.html
index 749630d5..db35320f 100644
--- a/ldap/clients/dsgw/config/de/list-Groups.html
+++ b/ldap/clients/dsgw/config/de/list-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/list-NT-Groups.html b/ldap/clients/dsgw/config/de/list-NT-Groups.html
index b9e4fb40..f554236f 100644
--- a/ldap/clients/dsgw/config/de/list-NT-Groups.html
+++ b/ldap/clients/dsgw/config/de/list-NT-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/list-NT-People.html b/ldap/clients/dsgw/config/de/list-NT-People.html
index 62fdb322..74493fee 100644
--- a/ldap/clients/dsgw/config/de/list-NT-People.html
+++ b/ldap/clients/dsgw/config/de/list-NT-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/list-Org-Units.html b/ldap/clients/dsgw/config/de/list-Org-Units.html
index 8db5e801..9ff5e0c8 100644
--- a/ldap/clients/dsgw/config/de/list-Org-Units.html
+++ b/ldap/clients/dsgw/config/de/list-Org-Units.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/list-Organizations.html b/ldap/clients/dsgw/config/de/list-Organizations.html
index 159a114e..556f22ac 100644
--- a/ldap/clients/dsgw/config/de/list-Organizations.html
+++ b/ldap/clients/dsgw/config/de/list-Organizations.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/list-People.html b/ldap/clients/dsgw/config/de/list-People.html
index 5b18201f..c651a330 100644
--- a/ldap/clients/dsgw/config/de/list-People.html
+++ b/ldap/clients/dsgw/config/de/list-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/list-fa-Groups.html b/ldap/clients/dsgw/config/de/list-fa-Groups.html
index a950b8c5..8a942aab 100644
--- a/ldap/clients/dsgw/config/de/list-fa-Groups.html
+++ b/ldap/clients/dsgw/config/de/list-fa-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/list-fa-People.html b/ldap/clients/dsgw/config/de/list-fa-People.html
index a950b8c5..8a942aab 100644
--- a/ldap/clients/dsgw/config/de/list-fa-People.html
+++ b/ldap/clients/dsgw/config/de/list-fa-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/list-urlsearch.html b/ldap/clients/dsgw/config/de/list-urlsearch.html
index be65183d..0e2f0741 100644
--- a/ldap/clients/dsgw/config/de/list-urlsearch.html
+++ b/ldap/clients/dsgw/config/de/list-urlsearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/newentry.html b/ldap/clients/dsgw/config/de/newentry.html
index 3efee250..a92b731e 100644
--- a/ldap/clients/dsgw/config/de/newentry.html
+++ b/ldap/clients/dsgw/config/de/newentry.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/newentryName.html b/ldap/clients/dsgw/config/de/newentryName.html
index 150e1907..850fbb6a 100644
--- a/ldap/clients/dsgw/config/de/newentryName.html
+++ b/ldap/clients/dsgw/config/de/newentryName.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/newentryType.html b/ldap/clients/dsgw/config/de/newentryType.html
index 111bf489..f9c82f35 100644
--- a/ldap/clients/dsgw/config/de/newentryType.html
+++ b/ldap/clients/dsgw/config/de/newentryType.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/search.html b/ldap/clients/dsgw/config/de/search.html
index a47ec713..e10db0a4 100644
--- a/ldap/clients/dsgw/config/de/search.html
+++ b/ldap/clients/dsgw/config/de/search.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/de/searchString.html b/ldap/clients/dsgw/config/de/searchString.html
index 6d8aeec0..76697346 100644
--- a/ldap/clients/dsgw/config/de/searchString.html
+++ b/ldap/clients/dsgw/config/de/searchString.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-country.html b/ldap/clients/dsgw/config/display-country.html
index aa91eb62..552ab5b8 100644
--- a/ldap/clients/dsgw/config/display-country.html
+++ b/ldap/clients/dsgw/config/display-country.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-dc.html b/ldap/clients/dsgw/config/display-dc.html
index 40a2a9d4..c926e775 100644
--- a/ldap/clients/dsgw/config/display-dc.html
+++ b/ldap/clients/dsgw/config/display-dc.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-dnedit.html b/ldap/clients/dsgw/config/display-dnedit.html
index f2599b72..46a3863d 100644
--- a/ldap/clients/dsgw/config/display-dnedit.html
+++ b/ldap/clients/dsgw/config/display-dnedit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-dneditpeople.html b/ldap/clients/dsgw/config/display-dneditpeople.html
index 34c9e3d9..69b6bfad 100644
--- a/ldap/clients/dsgw/config/display-dneditpeople.html
+++ b/ldap/clients/dsgw/config/display-dneditpeople.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-group.html b/ldap/clients/dsgw/config/display-group.html
index c3cbd464..ec90d6ea 100644
--- a/ldap/clients/dsgw/config/display-group.html
+++ b/ldap/clients/dsgw/config/display-group.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-groupun.html b/ldap/clients/dsgw/config/display-groupun.html
index 45f27280..e45cacdf 100644
--- a/ldap/clients/dsgw/config/display-groupun.html
+++ b/ldap/clients/dsgw/config/display-groupun.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-ntgroup.html b/ldap/clients/dsgw/config/display-ntgroup.html
index bd52179f..cbf6f782 100644
--- a/ldap/clients/dsgw/config/display-ntgroup.html
+++ b/ldap/clients/dsgw/config/display-ntgroup.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-ntperson.html b/ldap/clients/dsgw/config/display-ntperson.html
index 2decde10..ea112ebf 100644
--- a/ldap/clients/dsgw/config/display-ntperson.html
+++ b/ldap/clients/dsgw/config/display-ntperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-org.html b/ldap/clients/dsgw/config/display-org.html
index 99114f35..84ccb72f 100644
--- a/ldap/clients/dsgw/config/display-org.html
+++ b/ldap/clients/dsgw/config/display-org.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-orgperson.html b/ldap/clients/dsgw/config/display-orgperson.html
index 3df1b9e0..b248e46d 100644
--- a/ldap/clients/dsgw/config/display-orgperson.html
+++ b/ldap/clients/dsgw/config/display-orgperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-orgunit.html b/ldap/clients/dsgw/config/display-orgunit.html
index d2511b60..3d04ee20 100644
--- a/ldap/clients/dsgw/config/display-orgunit.html
+++ b/ldap/clients/dsgw/config/display-orgunit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/display-person.html b/ldap/clients/dsgw/config/display-person.html
index 1978da6d..fc481b31 100644
--- a/ldap/clients/dsgw/config/display-person.html
+++ b/ldap/clients/dsgw/config/display-person.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/dsgw-l10n.conf b/ldap/clients/dsgw/config/dsgw-l10n.conf
index 24081a57..3155f833 100644
--- a/ldap/clients/dsgw/config/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/dsgw-l10n.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/dsgw.tmpl b/ldap/clients/dsgw/config/dsgw.tmpl
index 1b75d1b9..86cbfe28 100644
--- a/ldap/clients/dsgw/config/dsgw.tmpl
+++ b/ldap/clients/dsgw/config/dsgw.tmpl
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/dsgw_adm.conf b/ldap/clients/dsgw/config/dsgw_adm.conf
index 6160ae06..409d0cec 100644
--- a/ldap/clients/dsgw/config/dsgw_adm.conf
+++ b/ldap/clients/dsgw/config/dsgw_adm.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/dsgwfilter.conf b/ldap/clients/dsgw/config/dsgwfilter.conf
index 75c4de86..e62ed85d 100644
--- a/ldap/clients/dsgw/config/dsgwfilter.conf
+++ b/ldap/clients/dsgw/config/dsgwfilter.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/dsgwfilter_adm.conf b/ldap/clients/dsgw/config/dsgwfilter_adm.conf
index 7d67d6d6..9d6c9fb0 100644
--- a/ldap/clients/dsgw/config/dsgwfilter_adm.conf
+++ b/ldap/clients/dsgw/config/dsgwfilter_adm.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/dsgwsearchprefs.conf b/ldap/clients/dsgw/config/dsgwsearchprefs.conf
index cc211ab3..6321a34a 100644
--- a/ldap/clients/dsgw/config/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/config/dsgwsearchprefs.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/edit-passwd.html b/ldap/clients/dsgw/config/edit-passwd.html
index a60339db..8f043587 100644
--- a/ldap/clients/dsgw/config/edit-passwd.html
+++ b/ldap/clients/dsgw/config/edit-passwd.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/en-us/dsgw-l10n.conf b/ldap/clients/dsgw/config/en-us/dsgw-l10n.conf
index 24081a57..3155f833 100644
--- a/ldap/clients/dsgw/config/en-us/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/en-us/dsgw-l10n.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/en-us/dsgwcollate.conf b/ldap/clients/dsgw/config/en-us/dsgwcollate.conf
index 69c070fe..5c75591b 100644
--- a/ldap/clients/dsgw/config/en-us/dsgwcollate.conf
+++ b/ldap/clients/dsgw/config/en-us/dsgwcollate.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/en/dsgw-l10n.conf b/ldap/clients/dsgw/config/en/dsgw-l10n.conf
index 24081a57..3155f833 100644
--- a/ldap/clients/dsgw/config/en/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/en/dsgw-l10n.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/en/dsgwcollate.conf b/ldap/clients/dsgw/config/en/dsgwcollate.conf
index c8532930..376297b6 100644
--- a/ldap/clients/dsgw/config/en/dsgwcollate.conf
+++ b/ldap/clients/dsgw/config/en/dsgwcollate.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/authPassword.html b/ldap/clients/dsgw/config/es/authPassword.html
index 07e15e6b..684b3043 100644
--- a/ldap/clients/dsgw/config/es/authPassword.html
+++ b/ldap/clients/dsgw/config/es/authPassword.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/authSearch.html b/ldap/clients/dsgw/config/es/authSearch.html
index e356726f..4e08ff83 100644
--- a/ldap/clients/dsgw/config/es/authSearch.html
+++ b/ldap/clients/dsgw/config/es/authSearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/csearch.html b/ldap/clients/dsgw/config/es/csearch.html
index 5da1df96..3ef2fb0a 100644
--- a/ldap/clients/dsgw/config/es/csearch.html
+++ b/ldap/clients/dsgw/config/es/csearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/csearchAttr.html b/ldap/clients/dsgw/config/es/csearchAttr.html
index a8455fbc..f3361031 100644
--- a/ldap/clients/dsgw/config/es/csearchAttr.html
+++ b/ldap/clients/dsgw/config/es/csearchAttr.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/csearchBase.html b/ldap/clients/dsgw/config/es/csearchBase.html
index 91bfd69e..5efcc649 100644
--- a/ldap/clients/dsgw/config/es/csearchBase.html
+++ b/ldap/clients/dsgw/config/es/csearchBase.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/csearchString.html b/ldap/clients/dsgw/config/es/csearchString.html
index f6f1e65b..df3224f0 100644
--- a/ldap/clients/dsgw/config/es/csearchString.html
+++ b/ldap/clients/dsgw/config/es/csearchString.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/csearchType.html b/ldap/clients/dsgw/config/es/csearchType.html
index d2cc1a52..49d25470 100644
--- a/ldap/clients/dsgw/config/es/csearchType.html
+++ b/ldap/clients/dsgw/config/es/csearchType.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/display-country.html b/ldap/clients/dsgw/config/es/display-country.html
index 1d1880e8..8a269a39 100644
--- a/ldap/clients/dsgw/config/es/display-country.html
+++ b/ldap/clients/dsgw/config/es/display-country.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/display-dnedit.html b/ldap/clients/dsgw/config/es/display-dnedit.html
index fdfdeef9..b3c6dc52 100644
--- a/ldap/clients/dsgw/config/es/display-dnedit.html
+++ b/ldap/clients/dsgw/config/es/display-dnedit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/display-dneditpeople.html b/ldap/clients/dsgw/config/es/display-dneditpeople.html
index be951e4a..9e9e3c64 100644
--- a/ldap/clients/dsgw/config/es/display-dneditpeople.html
+++ b/ldap/clients/dsgw/config/es/display-dneditpeople.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/display-group.html b/ldap/clients/dsgw/config/es/display-group.html
index b40b38d8..07717fcf 100644
--- a/ldap/clients/dsgw/config/es/display-group.html
+++ b/ldap/clients/dsgw/config/es/display-group.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/display-groupun.html b/ldap/clients/dsgw/config/es/display-groupun.html
index 8802aa4b..123fe1f2 100644
--- a/ldap/clients/dsgw/config/es/display-groupun.html
+++ b/ldap/clients/dsgw/config/es/display-groupun.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/display-ntgroup.html b/ldap/clients/dsgw/config/es/display-ntgroup.html
index 92e7ad0e..dc6f0bc3 100644
--- a/ldap/clients/dsgw/config/es/display-ntgroup.html
+++ b/ldap/clients/dsgw/config/es/display-ntgroup.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/display-ntperson.html b/ldap/clients/dsgw/config/es/display-ntperson.html
index 884d95b3..6215a705 100644
--- a/ldap/clients/dsgw/config/es/display-ntperson.html
+++ b/ldap/clients/dsgw/config/es/display-ntperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/display-org.html b/ldap/clients/dsgw/config/es/display-org.html
index 10100482..1586425e 100644
--- a/ldap/clients/dsgw/config/es/display-org.html
+++ b/ldap/clients/dsgw/config/es/display-org.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/display-orgperson.html b/ldap/clients/dsgw/config/es/display-orgperson.html
index c8e66392..d38e863d 100644
--- a/ldap/clients/dsgw/config/es/display-orgperson.html
+++ b/ldap/clients/dsgw/config/es/display-orgperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/display-orgunit.html b/ldap/clients/dsgw/config/es/display-orgunit.html
index 8c129598..003340c5 100644
--- a/ldap/clients/dsgw/config/es/display-orgunit.html
+++ b/ldap/clients/dsgw/config/es/display-orgunit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/display-person.html b/ldap/clients/dsgw/config/es/display-person.html
index 4cf5bc5a..500a9d76 100644
--- a/ldap/clients/dsgw/config/es/display-person.html
+++ b/ldap/clients/dsgw/config/es/display-person.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/dsgw-l10n.conf b/ldap/clients/dsgw/config/es/dsgw-l10n.conf
index 24081a57..3155f833 100644
--- a/ldap/clients/dsgw/config/es/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/es/dsgw-l10n.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/dsgw.tmpl b/ldap/clients/dsgw/config/es/dsgw.tmpl
index 2910ac51..dad6b677 100644
--- a/ldap/clients/dsgw/config/es/dsgw.tmpl
+++ b/ldap/clients/dsgw/config/es/dsgw.tmpl
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/dsgw_adm.conf b/ldap/clients/dsgw/config/es/dsgw_adm.conf
index d15c5173..0ca5940b 100644
--- a/ldap/clients/dsgw/config/es/dsgw_adm.conf
+++ b/ldap/clients/dsgw/config/es/dsgw_adm.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/dsgwfilter.conf b/ldap/clients/dsgw/config/es/dsgwfilter.conf
index 392acd52..d2e069f4 100644
--- a/ldap/clients/dsgw/config/es/dsgwfilter.conf
+++ b/ldap/clients/dsgw/config/es/dsgwfilter.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/dsgwfilter_adm.conf b/ldap/clients/dsgw/config/es/dsgwfilter_adm.conf
index b8e876e7..95bca879 100644
--- a/ldap/clients/dsgw/config/es/dsgwfilter_adm.conf
+++ b/ldap/clients/dsgw/config/es/dsgwfilter_adm.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/dsgwsearchprefs.conf b/ldap/clients/dsgw/config/es/dsgwsearchprefs.conf
index 54fbc5ac..e63d3255 100644
--- a/ldap/clients/dsgw/config/es/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/config/es/dsgwsearchprefs.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/edit-passwd.html b/ldap/clients/dsgw/config/es/edit-passwd.html
index 33b07d61..8341a7d4 100644
--- a/ldap/clients/dsgw/config/es/edit-passwd.html
+++ b/ldap/clients/dsgw/config/es/edit-passwd.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/list-Anything.html b/ldap/clients/dsgw/config/es/list-Anything.html
index f24175aa..5b1b402b 100644
--- a/ldap/clients/dsgw/config/es/list-Anything.html
+++ b/ldap/clients/dsgw/config/es/list-Anything.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/list-Auth.html b/ldap/clients/dsgw/config/es/list-Auth.html
index dde47c04..bd3c091f 100644
--- a/ldap/clients/dsgw/config/es/list-Auth.html
+++ b/ldap/clients/dsgw/config/es/list-Auth.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/list-Groups.html b/ldap/clients/dsgw/config/es/list-Groups.html
index 8f22dbfb..cc1f591f 100644
--- a/ldap/clients/dsgw/config/es/list-Groups.html
+++ b/ldap/clients/dsgw/config/es/list-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/list-NT-Groups.html b/ldap/clients/dsgw/config/es/list-NT-Groups.html
index c292482b..3c039c2d 100644
--- a/ldap/clients/dsgw/config/es/list-NT-Groups.html
+++ b/ldap/clients/dsgw/config/es/list-NT-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/list-NT-People.html b/ldap/clients/dsgw/config/es/list-NT-People.html
index e5087a64..ea93641c 100644
--- a/ldap/clients/dsgw/config/es/list-NT-People.html
+++ b/ldap/clients/dsgw/config/es/list-NT-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/list-Org-Units.html b/ldap/clients/dsgw/config/es/list-Org-Units.html
index 6cd3b2f9..649a49a8 100644
--- a/ldap/clients/dsgw/config/es/list-Org-Units.html
+++ b/ldap/clients/dsgw/config/es/list-Org-Units.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/list-Organizations.html b/ldap/clients/dsgw/config/es/list-Organizations.html
index 70dc201d..cc49d3d5 100644
--- a/ldap/clients/dsgw/config/es/list-Organizations.html
+++ b/ldap/clients/dsgw/config/es/list-Organizations.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/list-People.html b/ldap/clients/dsgw/config/es/list-People.html
index fe8f9dfa..4b85c3e4 100644
--- a/ldap/clients/dsgw/config/es/list-People.html
+++ b/ldap/clients/dsgw/config/es/list-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/list-fa-Groups.html b/ldap/clients/dsgw/config/es/list-fa-Groups.html
index 4afecf33..d2fef48f 100644
--- a/ldap/clients/dsgw/config/es/list-fa-Groups.html
+++ b/ldap/clients/dsgw/config/es/list-fa-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/list-fa-People.html b/ldap/clients/dsgw/config/es/list-fa-People.html
index e567831c..f36d2227 100644
--- a/ldap/clients/dsgw/config/es/list-fa-People.html
+++ b/ldap/clients/dsgw/config/es/list-fa-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/list-urlsearch.html b/ldap/clients/dsgw/config/es/list-urlsearch.html
index 174e5a4a..a4b71462 100644
--- a/ldap/clients/dsgw/config/es/list-urlsearch.html
+++ b/ldap/clients/dsgw/config/es/list-urlsearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/newentry.html b/ldap/clients/dsgw/config/es/newentry.html
index be00c711..751b2f75 100644
--- a/ldap/clients/dsgw/config/es/newentry.html
+++ b/ldap/clients/dsgw/config/es/newentry.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/newentryName.html b/ldap/clients/dsgw/config/es/newentryName.html
index 85146395..672c9a06 100644
--- a/ldap/clients/dsgw/config/es/newentryName.html
+++ b/ldap/clients/dsgw/config/es/newentryName.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/newentryType.html b/ldap/clients/dsgw/config/es/newentryType.html
index c0331029..67e6a7a9 100644
--- a/ldap/clients/dsgw/config/es/newentryType.html
+++ b/ldap/clients/dsgw/config/es/newentryType.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/ns-license-schema.conf b/ldap/clients/dsgw/config/es/ns-license-schema.conf
index a966b724..bf895254 100644
--- a/ldap/clients/dsgw/config/es/ns-license-schema.conf
+++ b/ldap/clients/dsgw/config/es/ns-license-schema.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/search.html b/ldap/clients/dsgw/config/es/search.html
index 09de819e..62801e3e 100644
--- a/ldap/clients/dsgw/config/es/search.html
+++ b/ldap/clients/dsgw/config/es/search.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/es/searchString.html b/ldap/clients/dsgw/config/es/searchString.html
index 4adb5717..ab5df975 100644
--- a/ldap/clients/dsgw/config/es/searchString.html
+++ b/ldap/clients/dsgw/config/es/searchString.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/authPassword.html b/ldap/clients/dsgw/config/fr/authPassword.html
index d8955487..aee3597a 100644
--- a/ldap/clients/dsgw/config/fr/authPassword.html
+++ b/ldap/clients/dsgw/config/fr/authPassword.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/authSearch.html b/ldap/clients/dsgw/config/fr/authSearch.html
index a18872e3..a3e7d296 100644
--- a/ldap/clients/dsgw/config/fr/authSearch.html
+++ b/ldap/clients/dsgw/config/fr/authSearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/csearch.html b/ldap/clients/dsgw/config/fr/csearch.html
index 86141910..0efccd2f 100644
--- a/ldap/clients/dsgw/config/fr/csearch.html
+++ b/ldap/clients/dsgw/config/fr/csearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/csearchAttr.html b/ldap/clients/dsgw/config/fr/csearchAttr.html
index 70ebc9ea..769c202d 100644
--- a/ldap/clients/dsgw/config/fr/csearchAttr.html
+++ b/ldap/clients/dsgw/config/fr/csearchAttr.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/csearchBase.html b/ldap/clients/dsgw/config/fr/csearchBase.html
index 0fd13493..03c550d7 100644
--- a/ldap/clients/dsgw/config/fr/csearchBase.html
+++ b/ldap/clients/dsgw/config/fr/csearchBase.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/csearchString.html b/ldap/clients/dsgw/config/fr/csearchString.html
index 26ab10ff..c1353e7e 100644
--- a/ldap/clients/dsgw/config/fr/csearchString.html
+++ b/ldap/clients/dsgw/config/fr/csearchString.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/csearchType.html b/ldap/clients/dsgw/config/fr/csearchType.html
index 981ac373..479d8923 100644
--- a/ldap/clients/dsgw/config/fr/csearchType.html
+++ b/ldap/clients/dsgw/config/fr/csearchType.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-country.html b/ldap/clients/dsgw/config/fr/display-country.html
index c51c99f6..4ac80e36 100644
--- a/ldap/clients/dsgw/config/fr/display-country.html
+++ b/ldap/clients/dsgw/config/fr/display-country.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-dnedit.html b/ldap/clients/dsgw/config/fr/display-dnedit.html
index 6b9631cf..8b223504 100644
--- a/ldap/clients/dsgw/config/fr/display-dnedit.html
+++ b/ldap/clients/dsgw/config/fr/display-dnedit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-dneditpeople.html b/ldap/clients/dsgw/config/fr/display-dneditpeople.html
index 53f41783..1d639e4c 100644
--- a/ldap/clients/dsgw/config/fr/display-dneditpeople.html
+++ b/ldap/clients/dsgw/config/fr/display-dneditpeople.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-group.html b/ldap/clients/dsgw/config/fr/display-group.html
index d4bf0f66..111b5bd0 100644
--- a/ldap/clients/dsgw/config/fr/display-group.html
+++ b/ldap/clients/dsgw/config/fr/display-group.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-groupun.html b/ldap/clients/dsgw/config/fr/display-groupun.html
index 7b71d79d..5b370398 100644
--- a/ldap/clients/dsgw/config/fr/display-groupun.html
+++ b/ldap/clients/dsgw/config/fr/display-groupun.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-mailgroup.html b/ldap/clients/dsgw/config/fr/display-mailgroup.html
index 8b63ac3b..1e5b62dc 100644
--- a/ldap/clients/dsgw/config/fr/display-mailgroup.html
+++ b/ldap/clients/dsgw/config/fr/display-mailgroup.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-ntgroup.html b/ldap/clients/dsgw/config/fr/display-ntgroup.html
index bdbdecfc..796975df 100644
--- a/ldap/clients/dsgw/config/fr/display-ntgroup.html
+++ b/ldap/clients/dsgw/config/fr/display-ntgroup.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-ntperson.html b/ldap/clients/dsgw/config/fr/display-ntperson.html
index 964d1c37..7e3ce3ca 100644
--- a/ldap/clients/dsgw/config/fr/display-ntperson.html
+++ b/ldap/clients/dsgw/config/fr/display-ntperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-org.html b/ldap/clients/dsgw/config/fr/display-org.html
index 7948bc2b..a722375d 100644
--- a/ldap/clients/dsgw/config/fr/display-org.html
+++ b/ldap/clients/dsgw/config/fr/display-org.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-orgperson.html b/ldap/clients/dsgw/config/fr/display-orgperson.html
index 1fee6f74..3e428729 100644
--- a/ldap/clients/dsgw/config/fr/display-orgperson.html
+++ b/ldap/clients/dsgw/config/fr/display-orgperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-orgunit.html b/ldap/clients/dsgw/config/fr/display-orgunit.html
index 908e8f6a..f846fb97 100644
--- a/ldap/clients/dsgw/config/fr/display-orgunit.html
+++ b/ldap/clients/dsgw/config/fr/display-orgunit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-person.html b/ldap/clients/dsgw/config/fr/display-person.html
index faae2301..38df0916 100644
--- a/ldap/clients/dsgw/config/fr/display-person.html
+++ b/ldap/clients/dsgw/config/fr/display-person.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/display-umperson.html b/ldap/clients/dsgw/config/fr/display-umperson.html
index af2cebba..62309797 100644
--- a/ldap/clients/dsgw/config/fr/display-umperson.html
+++ b/ldap/clients/dsgw/config/fr/display-umperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/dsgw-l10n.conf b/ldap/clients/dsgw/config/fr/dsgw-l10n.conf
index 24081a57..3155f833 100644
--- a/ldap/clients/dsgw/config/fr/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/fr/dsgw-l10n.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/dsgw.conf b/ldap/clients/dsgw/config/fr/dsgw.conf
index 4e8f6231..acb108a1 100644
--- a/ldap/clients/dsgw/config/fr/dsgw.conf
+++ b/ldap/clients/dsgw/config/fr/dsgw.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/dsgw.tmpl b/ldap/clients/dsgw/config/fr/dsgw.tmpl
index 7d270137..9d3da733 100644
--- a/ldap/clients/dsgw/config/fr/dsgw.tmpl
+++ b/ldap/clients/dsgw/config/fr/dsgw.tmpl
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/dsgw_adm.conf b/ldap/clients/dsgw/config/fr/dsgw_adm.conf
index 7b03e289..8c3e8e80 100644
--- a/ldap/clients/dsgw/config/fr/dsgw_adm.conf
+++ b/ldap/clients/dsgw/config/fr/dsgw_adm.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/dsgwfilter.conf b/ldap/clients/dsgw/config/fr/dsgwfilter.conf
index f58043b1..0361cda4 100644
--- a/ldap/clients/dsgw/config/fr/dsgwfilter.conf
+++ b/ldap/clients/dsgw/config/fr/dsgwfilter.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/dsgwfilter_adm.conf b/ldap/clients/dsgw/config/fr/dsgwfilter_adm.conf
index 2da34048..dc4ed8a3 100644
--- a/ldap/clients/dsgw/config/fr/dsgwfilter_adm.conf
+++ b/ldap/clients/dsgw/config/fr/dsgwfilter_adm.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/dsgwsearchprefs.conf b/ldap/clients/dsgw/config/fr/dsgwsearchprefs.conf
index c696c685..29258f8d 100644
--- a/ldap/clients/dsgw/config/fr/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/config/fr/dsgwsearchprefs.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/edit-passwd.html b/ldap/clients/dsgw/config/fr/edit-passwd.html
index a21b92ac..ea0ae2db 100644
--- a/ldap/clients/dsgw/config/fr/edit-passwd.html
+++ b/ldap/clients/dsgw/config/fr/edit-passwd.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/list-Anything.html b/ldap/clients/dsgw/config/fr/list-Anything.html
index 0b08b3a7..233acb61 100644
--- a/ldap/clients/dsgw/config/fr/list-Anything.html
+++ b/ldap/clients/dsgw/config/fr/list-Anything.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/list-Auth.html b/ldap/clients/dsgw/config/fr/list-Auth.html
index be3606e2..43039090 100644
--- a/ldap/clients/dsgw/config/fr/list-Auth.html
+++ b/ldap/clients/dsgw/config/fr/list-Auth.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/list-Groups.html b/ldap/clients/dsgw/config/fr/list-Groups.html
index 13ae1bed..46f38742 100644
--- a/ldap/clients/dsgw/config/fr/list-Groups.html
+++ b/ldap/clients/dsgw/config/fr/list-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/list-NT-Groups.html b/ldap/clients/dsgw/config/fr/list-NT-Groups.html
index 8bcacc78..5f41c62a 100644
--- a/ldap/clients/dsgw/config/fr/list-NT-Groups.html
+++ b/ldap/clients/dsgw/config/fr/list-NT-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/list-NT-People.html b/ldap/clients/dsgw/config/fr/list-NT-People.html
index 2c721fc1..ce98289d 100644
--- a/ldap/clients/dsgw/config/fr/list-NT-People.html
+++ b/ldap/clients/dsgw/config/fr/list-NT-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/list-Org-Units.html b/ldap/clients/dsgw/config/fr/list-Org-Units.html
index 7dfa684b..69ce0cda 100644
--- a/ldap/clients/dsgw/config/fr/list-Org-Units.html
+++ b/ldap/clients/dsgw/config/fr/list-Org-Units.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/list-Organizations.html b/ldap/clients/dsgw/config/fr/list-Organizations.html
index 3aca8399..c79cdd6a 100644
--- a/ldap/clients/dsgw/config/fr/list-Organizations.html
+++ b/ldap/clients/dsgw/config/fr/list-Organizations.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/list-People.html b/ldap/clients/dsgw/config/fr/list-People.html
index 7ac2760b..10a7809e 100644
--- a/ldap/clients/dsgw/config/fr/list-People.html
+++ b/ldap/clients/dsgw/config/fr/list-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/list-fa-Groups.html b/ldap/clients/dsgw/config/fr/list-fa-Groups.html
index d69f2fd5..2977c23a 100644
--- a/ldap/clients/dsgw/config/fr/list-fa-Groups.html
+++ b/ldap/clients/dsgw/config/fr/list-fa-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/list-fa-People.html b/ldap/clients/dsgw/config/fr/list-fa-People.html
index d69f2fd5..2977c23a 100644
--- a/ldap/clients/dsgw/config/fr/list-fa-People.html
+++ b/ldap/clients/dsgw/config/fr/list-fa-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/list-urlsearch.html b/ldap/clients/dsgw/config/fr/list-urlsearch.html
index a8f185c5..e221e529 100644
--- a/ldap/clients/dsgw/config/fr/list-urlsearch.html
+++ b/ldap/clients/dsgw/config/fr/list-urlsearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/newentry.html b/ldap/clients/dsgw/config/fr/newentry.html
index 1e6c072f..c7d2d962 100644
--- a/ldap/clients/dsgw/config/fr/newentry.html
+++ b/ldap/clients/dsgw/config/fr/newentry.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/newentryName.html b/ldap/clients/dsgw/config/fr/newentryName.html
index 6e814c86..15b15fb7 100644
--- a/ldap/clients/dsgw/config/fr/newentryName.html
+++ b/ldap/clients/dsgw/config/fr/newentryName.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/newentryType.html b/ldap/clients/dsgw/config/fr/newentryType.html
index 68e2c338..935edbc9 100644
--- a/ldap/clients/dsgw/config/fr/newentryType.html
+++ b/ldap/clients/dsgw/config/fr/newentryType.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/search.html b/ldap/clients/dsgw/config/fr/search.html
index 97b313a9..c8575c45 100644
--- a/ldap/clients/dsgw/config/fr/search.html
+++ b/ldap/clients/dsgw/config/fr/search.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/fr/searchString.html b/ldap/clients/dsgw/config/fr/searchString.html
index 2a6ed4e4..00b94cfa 100644
--- a/ldap/clients/dsgw/config/fr/searchString.html
+++ b/ldap/clients/dsgw/config/fr/searchString.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/authPassword.html b/ldap/clients/dsgw/config/ja/authPassword.html
index de6ff4c7..11dabdc8 100644
--- a/ldap/clients/dsgw/config/ja/authPassword.html
+++ b/ldap/clients/dsgw/config/ja/authPassword.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/authSearch.html b/ldap/clients/dsgw/config/ja/authSearch.html
index 97d67ac3..635ffaec 100644
--- a/ldap/clients/dsgw/config/ja/authSearch.html
+++ b/ldap/clients/dsgw/config/ja/authSearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/csearch.html b/ldap/clients/dsgw/config/ja/csearch.html
index 44f178cb..7fb509f8 100644
--- a/ldap/clients/dsgw/config/ja/csearch.html
+++ b/ldap/clients/dsgw/config/ja/csearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/csearchAttr.html b/ldap/clients/dsgw/config/ja/csearchAttr.html
index 99360814..6c9d4f67 100644
--- a/ldap/clients/dsgw/config/ja/csearchAttr.html
+++ b/ldap/clients/dsgw/config/ja/csearchAttr.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/csearchBase.html b/ldap/clients/dsgw/config/ja/csearchBase.html
index 096329f4..0abfb02c 100644
--- a/ldap/clients/dsgw/config/ja/csearchBase.html
+++ b/ldap/clients/dsgw/config/ja/csearchBase.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/csearchString.html b/ldap/clients/dsgw/config/ja/csearchString.html
index 04993ae9..06e39aa1 100644
--- a/ldap/clients/dsgw/config/ja/csearchString.html
+++ b/ldap/clients/dsgw/config/ja/csearchString.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/csearchType.html b/ldap/clients/dsgw/config/ja/csearchType.html
index 2e5661fd..f8364407 100644
--- a/ldap/clients/dsgw/config/ja/csearchType.html
+++ b/ldap/clients/dsgw/config/ja/csearchType.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-country.html b/ldap/clients/dsgw/config/ja/display-country.html
index b2f10912..ed111e5d 100644
--- a/ldap/clients/dsgw/config/ja/display-country.html
+++ b/ldap/clients/dsgw/config/ja/display-country.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-dnedit.html b/ldap/clients/dsgw/config/ja/display-dnedit.html
index 8cb70664..abf96edb 100644
--- a/ldap/clients/dsgw/config/ja/display-dnedit.html
+++ b/ldap/clients/dsgw/config/ja/display-dnedit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-dneditpeople.html b/ldap/clients/dsgw/config/ja/display-dneditpeople.html
index d791728e..a04e5f2e 100644
--- a/ldap/clients/dsgw/config/ja/display-dneditpeople.html
+++ b/ldap/clients/dsgw/config/ja/display-dneditpeople.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-group.html b/ldap/clients/dsgw/config/ja/display-group.html
index 3413095c..86ac39a4 100644
--- a/ldap/clients/dsgw/config/ja/display-group.html
+++ b/ldap/clients/dsgw/config/ja/display-group.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-groupun.html b/ldap/clients/dsgw/config/ja/display-groupun.html
index 7e28fded..6c8817d6 100644
--- a/ldap/clients/dsgw/config/ja/display-groupun.html
+++ b/ldap/clients/dsgw/config/ja/display-groupun.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-mailgroup.html b/ldap/clients/dsgw/config/ja/display-mailgroup.html
index dbd0b26c..6cf4b058 100644
--- a/ldap/clients/dsgw/config/ja/display-mailgroup.html
+++ b/ldap/clients/dsgw/config/ja/display-mailgroup.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-ntgroup.html b/ldap/clients/dsgw/config/ja/display-ntgroup.html
index 06b27a96..b16850fd 100644
--- a/ldap/clients/dsgw/config/ja/display-ntgroup.html
+++ b/ldap/clients/dsgw/config/ja/display-ntgroup.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-ntperson.html b/ldap/clients/dsgw/config/ja/display-ntperson.html
index 5abe51c2..bb9943b7 100644
--- a/ldap/clients/dsgw/config/ja/display-ntperson.html
+++ b/ldap/clients/dsgw/config/ja/display-ntperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-org.html b/ldap/clients/dsgw/config/ja/display-org.html
index fc4d1056..5b1bf8d9 100644
--- a/ldap/clients/dsgw/config/ja/display-org.html
+++ b/ldap/clients/dsgw/config/ja/display-org.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-orgperson.html b/ldap/clients/dsgw/config/ja/display-orgperson.html
index 20d00977..4f3f173e 100644
--- a/ldap/clients/dsgw/config/ja/display-orgperson.html
+++ b/ldap/clients/dsgw/config/ja/display-orgperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-orgunit.html b/ldap/clients/dsgw/config/ja/display-orgunit.html
index 4823ba54..c85aa27c 100644
--- a/ldap/clients/dsgw/config/ja/display-orgunit.html
+++ b/ldap/clients/dsgw/config/ja/display-orgunit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-person.html b/ldap/clients/dsgw/config/ja/display-person.html
index ecbb35ac..38d16db6 100644
--- a/ldap/clients/dsgw/config/ja/display-person.html
+++ b/ldap/clients/dsgw/config/ja/display-person.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/display-umperson.html b/ldap/clients/dsgw/config/ja/display-umperson.html
index 28054259..1c28a703 100644
--- a/ldap/clients/dsgw/config/ja/display-umperson.html
+++ b/ldap/clients/dsgw/config/ja/display-umperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/dsgw-l10n.conf b/ldap/clients/dsgw/config/ja/dsgw-l10n.conf
index 24081a57..3155f833 100644
--- a/ldap/clients/dsgw/config/ja/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/ja/dsgw-l10n.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/dsgw.conf b/ldap/clients/dsgw/config/ja/dsgw.conf
index 3a224e2e..bc6851f5 100644
--- a/ldap/clients/dsgw/config/ja/dsgw.conf
+++ b/ldap/clients/dsgw/config/ja/dsgw.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/dsgw.tmpl b/ldap/clients/dsgw/config/ja/dsgw.tmpl
index a164655b..8d4b034f 100644
--- a/ldap/clients/dsgw/config/ja/dsgw.tmpl
+++ b/ldap/clients/dsgw/config/ja/dsgw.tmpl
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/dsgw_adm.conf b/ldap/clients/dsgw/config/ja/dsgw_adm.conf
index 3b9c79b8..94aa2a95 100644
--- a/ldap/clients/dsgw/config/ja/dsgw_adm.conf
+++ b/ldap/clients/dsgw/config/ja/dsgw_adm.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/dsgwcharset.conf b/ldap/clients/dsgw/config/ja/dsgwcharset.conf
index 4378b33b..17e7c53a 100644
--- a/ldap/clients/dsgw/config/ja/dsgwcharset.conf
+++ b/ldap/clients/dsgw/config/ja/dsgwcharset.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/dsgwcollate.conf b/ldap/clients/dsgw/config/ja/dsgwcollate.conf
index 158d6f0c..d6e45c4a 100644
--- a/ldap/clients/dsgw/config/ja/dsgwcollate.conf
+++ b/ldap/clients/dsgw/config/ja/dsgwcollate.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/dsgwfilter.conf b/ldap/clients/dsgw/config/ja/dsgwfilter.conf
index 5f3c3aef..0fc05787 100644
--- a/ldap/clients/dsgw/config/ja/dsgwfilter.conf
+++ b/ldap/clients/dsgw/config/ja/dsgwfilter.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/dsgwfilter_adm.conf b/ldap/clients/dsgw/config/ja/dsgwfilter_adm.conf
index 26a130a1..9900d840 100644
--- a/ldap/clients/dsgw/config/ja/dsgwfilter_adm.conf
+++ b/ldap/clients/dsgw/config/ja/dsgwfilter_adm.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/dsgwsearchprefs.conf b/ldap/clients/dsgw/config/ja/dsgwsearchprefs.conf
index 5cfb1e49..93c53782 100644
--- a/ldap/clients/dsgw/config/ja/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/config/ja/dsgwsearchprefs.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/edit-passwd.html b/ldap/clients/dsgw/config/ja/edit-passwd.html
index d939210b..5193f6fd 100644
--- a/ldap/clients/dsgw/config/ja/edit-passwd.html
+++ b/ldap/clients/dsgw/config/ja/edit-passwd.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/list-Anything.html b/ldap/clients/dsgw/config/ja/list-Anything.html
index eb55a687..476916ab 100644
--- a/ldap/clients/dsgw/config/ja/list-Anything.html
+++ b/ldap/clients/dsgw/config/ja/list-Anything.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/list-Auth.html b/ldap/clients/dsgw/config/ja/list-Auth.html
index 3f5ca140..5c0b22ae 100644
--- a/ldap/clients/dsgw/config/ja/list-Auth.html
+++ b/ldap/clients/dsgw/config/ja/list-Auth.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/list-Groups.html b/ldap/clients/dsgw/config/ja/list-Groups.html
index a22a18ce..2ffcfc64 100644
--- a/ldap/clients/dsgw/config/ja/list-Groups.html
+++ b/ldap/clients/dsgw/config/ja/list-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/list-NT-Groups.html b/ldap/clients/dsgw/config/ja/list-NT-Groups.html
index 3c0a90df..b81084c3 100644
--- a/ldap/clients/dsgw/config/ja/list-NT-Groups.html
+++ b/ldap/clients/dsgw/config/ja/list-NT-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/list-NT-People.html b/ldap/clients/dsgw/config/ja/list-NT-People.html
index 297f3085..cb44d916 100644
--- a/ldap/clients/dsgw/config/ja/list-NT-People.html
+++ b/ldap/clients/dsgw/config/ja/list-NT-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/list-Org-Units.html b/ldap/clients/dsgw/config/ja/list-Org-Units.html
index f5483e6a..aebc2925 100644
--- a/ldap/clients/dsgw/config/ja/list-Org-Units.html
+++ b/ldap/clients/dsgw/config/ja/list-Org-Units.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/list-Organizations.html b/ldap/clients/dsgw/config/ja/list-Organizations.html
index 2e163108..20338bb1 100644
--- a/ldap/clients/dsgw/config/ja/list-Organizations.html
+++ b/ldap/clients/dsgw/config/ja/list-Organizations.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/list-People.html b/ldap/clients/dsgw/config/ja/list-People.html
index 382f8a21..eea60297 100644
--- a/ldap/clients/dsgw/config/ja/list-People.html
+++ b/ldap/clients/dsgw/config/ja/list-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/list-fa-Groups.html b/ldap/clients/dsgw/config/ja/list-fa-Groups.html
index e567831c..f36d2227 100644
--- a/ldap/clients/dsgw/config/ja/list-fa-Groups.html
+++ b/ldap/clients/dsgw/config/ja/list-fa-Groups.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/list-fa-People.html b/ldap/clients/dsgw/config/ja/list-fa-People.html
index e567831c..f36d2227 100644
--- a/ldap/clients/dsgw/config/ja/list-fa-People.html
+++ b/ldap/clients/dsgw/config/ja/list-fa-People.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/list-urlsearch.html b/ldap/clients/dsgw/config/ja/list-urlsearch.html
index 630774c3..2f3ce380 100644
--- a/ldap/clients/dsgw/config/ja/list-urlsearch.html
+++ b/ldap/clients/dsgw/config/ja/list-urlsearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/newentry.html b/ldap/clients/dsgw/config/ja/newentry.html
index c0eac9ce..8fc5d7b6 100644
--- a/ldap/clients/dsgw/config/ja/newentry.html
+++ b/ldap/clients/dsgw/config/ja/newentry.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/newentryName.html b/ldap/clients/dsgw/config/ja/newentryName.html
index 2c5f8aae..569bb185 100644
--- a/ldap/clients/dsgw/config/ja/newentryName.html
+++ b/ldap/clients/dsgw/config/ja/newentryName.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/newentryType.html b/ldap/clients/dsgw/config/ja/newentryType.html
index d65ecbe1..6d3043c7 100644
--- a/ldap/clients/dsgw/config/ja/newentryType.html
+++ b/ldap/clients/dsgw/config/ja/newentryType.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/search.html b/ldap/clients/dsgw/config/ja/search.html
index 32efbe34..acce9398 100644
--- a/ldap/clients/dsgw/config/ja/search.html
+++ b/ldap/clients/dsgw/config/ja/search.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ja/searchString.html b/ldap/clients/dsgw/config/ja/searchString.html
index cf399e1c..12546dfe 100644
--- a/ldap/clients/dsgw/config/ja/searchString.html
+++ b/ldap/clients/dsgw/config/ja/searchString.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ko/dsgw-l10n.conf b/ldap/clients/dsgw/config/ko/dsgw-l10n.conf
index 24081a57..3155f833 100644
--- a/ldap/clients/dsgw/config/ko/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/ko/dsgw-l10n.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ko/dsgwcharset.conf b/ldap/clients/dsgw/config/ko/dsgwcharset.conf
index 10ee984b..85edff82 100644
--- a/ldap/clients/dsgw/config/ko/dsgwcharset.conf
+++ b/ldap/clients/dsgw/config/ko/dsgwcharset.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/list-Anything.html b/ldap/clients/dsgw/config/list-Anything.html
index d779dfb1..738787f3 100644
--- a/ldap/clients/dsgw/config/list-Anything.html
+++ b/ldap/clients/dsgw/config/list-Anything.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/list-Auth.html b/ldap/clients/dsgw/config/list-Auth.html
index fc56f4f0..78f043b5 100644
--- a/ldap/clients/dsgw/config/list-Auth.html
+++ b/ldap/clients/dsgw/config/list-Auth.html
@@ -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/clients/dsgw/config/list-Domaincomponent.html b/ldap/clients/dsgw/config/list-Domaincomponent.html
index fe72ef77..6bdaa736 100644
--- a/ldap/clients/dsgw/config/list-Domaincomponent.html
+++ b/ldap/clients/dsgw/config/list-Domaincomponent.html
@@ -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/clients/dsgw/config/list-Groups.html b/ldap/clients/dsgw/config/list-Groups.html
index edf357b1..18389c28 100644
--- a/ldap/clients/dsgw/config/list-Groups.html
+++ b/ldap/clients/dsgw/config/list-Groups.html
@@ -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/clients/dsgw/config/list-NT-Groups.html b/ldap/clients/dsgw/config/list-NT-Groups.html
index 5b2dba9d..2631a000 100644
--- a/ldap/clients/dsgw/config/list-NT-Groups.html
+++ b/ldap/clients/dsgw/config/list-NT-Groups.html
@@ -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/clients/dsgw/config/list-NT-People.html b/ldap/clients/dsgw/config/list-NT-People.html
index 14828b9e..16e416b7 100644
--- a/ldap/clients/dsgw/config/list-NT-People.html
+++ b/ldap/clients/dsgw/config/list-NT-People.html
@@ -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/clients/dsgw/config/list-Org-Units.html b/ldap/clients/dsgw/config/list-Org-Units.html
index 0baa3c49..c52070e3 100644
--- a/ldap/clients/dsgw/config/list-Org-Units.html
+++ b/ldap/clients/dsgw/config/list-Org-Units.html
@@ -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/clients/dsgw/config/list-Organizations.html b/ldap/clients/dsgw/config/list-Organizations.html
index 3687db65..b7eeb4f5 100644
--- a/ldap/clients/dsgw/config/list-Organizations.html
+++ b/ldap/clients/dsgw/config/list-Organizations.html
@@ -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/clients/dsgw/config/list-People.html b/ldap/clients/dsgw/config/list-People.html
index ae6a1be3..6484296e 100644
--- a/ldap/clients/dsgw/config/list-People.html
+++ b/ldap/clients/dsgw/config/list-People.html
@@ -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/clients/dsgw/config/list-fa-Groups.html b/ldap/clients/dsgw/config/list-fa-Groups.html
index f8cbead3..fd384c48 100644
--- a/ldap/clients/dsgw/config/list-fa-Groups.html
+++ b/ldap/clients/dsgw/config/list-fa-Groups.html
@@ -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/clients/dsgw/config/list-fa-People.html b/ldap/clients/dsgw/config/list-fa-People.html
index f8cbead3..fd384c48 100644
--- a/ldap/clients/dsgw/config/list-fa-People.html
+++ b/ldap/clients/dsgw/config/list-fa-People.html
@@ -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/clients/dsgw/config/list-urlsearch.html b/ldap/clients/dsgw/config/list-urlsearch.html
index fee1ba74..34bd64da 100644
--- a/ldap/clients/dsgw/config/list-urlsearch.html
+++ b/ldap/clients/dsgw/config/list-urlsearch.html
@@ -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/clients/dsgw/config/newentry.html b/ldap/clients/dsgw/config/newentry.html
index 4b7cc2ea..fdc17ce6 100644
--- a/ldap/clients/dsgw/config/newentry.html
+++ b/ldap/clients/dsgw/config/newentry.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/newentryName.html b/ldap/clients/dsgw/config/newentryName.html
index bb6e8a07..71ca3519 100644
--- a/ldap/clients/dsgw/config/newentryName.html
+++ b/ldap/clients/dsgw/config/newentryName.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/newentryType.html b/ldap/clients/dsgw/config/newentryType.html
index 9a4b4457..7790efe1 100644
--- a/ldap/clients/dsgw/config/newentryType.html
+++ b/ldap/clients/dsgw/config/newentryType.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/ns-license-schema.conf b/ldap/clients/dsgw/config/ns-license-schema.conf
index a966b724..bf895254 100644
--- a/ldap/clients/dsgw/config/ns-license-schema.conf
+++ b/ldap/clients/dsgw/config/ns-license-schema.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/search.html b/ldap/clients/dsgw/config/search.html
index ffc36765..390aaad8 100644
--- a/ldap/clients/dsgw/config/search.html
+++ b/ldap/clients/dsgw/config/search.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/searchString.html b/ldap/clients/dsgw/config/searchString.html
index e0746663..a9bed05b 100644
--- a/ldap/clients/dsgw/config/searchString.html
+++ b/ldap/clients/dsgw/config/searchString.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/zh/dsgw-l10n.conf b/ldap/clients/dsgw/config/zh/dsgw-l10n.conf
index 24081a57..3155f833 100644
--- a/ldap/clients/dsgw/config/zh/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/zh/dsgw-l10n.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/config/zh/dsgwcharset.conf b/ldap/clients/dsgw/config/zh/dsgwcharset.conf
index bca3bda1..2cef263f 100644
--- a/ldap/clients/dsgw/config/zh/dsgwcharset.conf
+++ b/ldap/clients/dsgw/config/zh/dsgwcharset.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/cookie.c b/ldap/clients/dsgw/cookie.c
index 0d938550..028dd1a9 100644
--- a/ldap/clients/dsgw/cookie.c
+++ b/ldap/clients/dsgw/cookie.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/csearch.c b/ldap/clients/dsgw/csearch.c
index d3bfdccf..178b5e32 100644
--- a/ldap/clients/dsgw/csearch.c
+++ b/ldap/clients/dsgw/csearch.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/dbtdsgw.h b/ldap/clients/dsgw/dbtdsgw.h
index eea723a9..78546b64 100644
--- a/ldap/clients/dsgw/dbtdsgw.h
+++ b/ldap/clients/dsgw/dbtdsgw.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/clients/dsgw/dnedit.c b/ldap/clients/dsgw/dnedit.c
index 8925e1b3..2f320bd3 100644
--- a/ldap/clients/dsgw/dnedit.c
+++ b/ldap/clients/dsgw/dnedit.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/doauth.c b/ldap/clients/dsgw/doauth.c
index b8568467..68e714cd 100644
--- a/ldap/clients/dsgw/doauth.c
+++ b/ldap/clients/dsgw/doauth.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/domodify.c b/ldap/clients/dsgw/domodify.c
index 00aef897..64daac86 100644
--- a/ldap/clients/dsgw/domodify.c
+++ b/ldap/clients/dsgw/domodify.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/dosearch.c b/ldap/clients/dsgw/dosearch.c
index 33ef4f5f..5fbbd292 100644
--- a/ldap/clients/dsgw/dosearch.c
+++ b/ldap/clients/dsgw/dosearch.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/dsconfig.c b/ldap/clients/dsgw/dsconfig.c
index 5b69cab3..2aef34fb 100644
--- a/ldap/clients/dsgw/dsconfig.c
+++ b/ldap/clients/dsgw/dsconfig.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/dsexpldif.c b/ldap/clients/dsgw/dsexpldif.c
index 8a52b735..79c0cdf3 100644
--- a/ldap/clients/dsgw/dsexpldif.c
+++ b/ldap/clients/dsgw/dsexpldif.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/dsgw.h b/ldap/clients/dsgw/dsgw.h
index a3ee0fec..186a9344 100644
--- a/ldap/clients/dsgw/dsgw.h
+++ b/ldap/clients/dsgw/dsgw.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/clients/dsgw/dsgw_include.mk b/ldap/clients/dsgw/dsgw_include.mk
index 92bee491..66d6d43d 100644
--- a/ldap/clients/dsgw/dsgw_include.mk
+++ b/ldap/clients/dsgw/dsgw_include.mk
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/dsgwutil.c b/ldap/clients/dsgw/dsgwutil.c
index 8853e1f0..afb16f74 100644
--- a/ldap/clients/dsgw/dsgwutil.c
+++ b/ldap/clients/dsgw/dsgwutil.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/dsimpldif.c b/ldap/clients/dsgw/dsimpldif.c
index 11705f4a..cceb7083 100644
--- a/ldap/clients/dsgw/dsimpldif.c
+++ b/ldap/clients/dsgw/dsimpldif.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/edit.c b/ldap/clients/dsgw/edit.c
index a2228841..3f49aade 100644
--- a/ldap/clients/dsgw/edit.c
+++ b/ldap/clients/dsgw/edit.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/emitauth.c b/ldap/clients/dsgw/emitauth.c
index 66ebafd5..5a2b4075 100644
--- a/ldap/clients/dsgw/emitauth.c
+++ b/ldap/clients/dsgw/emitauth.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/emitf.c b/ldap/clients/dsgw/emitf.c
index 67ce54fa..a1f85dde 100644
--- a/ldap/clients/dsgw/emitf.c
+++ b/ldap/clients/dsgw/emitf.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/entrydisplay.c b/ldap/clients/dsgw/entrydisplay.c
index 76a0cb54..33b62e11 100644
--- a/ldap/clients/dsgw/entrydisplay.c
+++ b/ldap/clients/dsgw/entrydisplay.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/error.c b/ldap/clients/dsgw/error.c
index ecd783c3..79c33c06 100644
--- a/ldap/clients/dsgw/error.c
+++ b/ldap/clients/dsgw/error.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/genscreen.c b/ldap/clients/dsgw/genscreen.c
index 30a80912..98f0bf3a 100644
--- a/ldap/clients/dsgw/genscreen.c
+++ b/ldap/clients/dsgw/genscreen.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/getopt.c b/ldap/clients/dsgw/getopt.c
index 08539c0a..4f73d452 100644
--- a/ldap/clients/dsgw/getopt.c
+++ b/ldap/clients/dsgw/getopt.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/Makefile b/ldap/clients/dsgw/html/Makefile
index b70a1455..b46190ee 100644
--- a/ldap/clients/dsgw/html/Makefile
+++ b/ldap/clients/dsgw/html/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/clients/dsgw/html/alert.html b/ldap/clients/dsgw/html/alert.html
index de757250..d15c4148 100644
--- a/ldap/clients/dsgw/html/alert.html
+++ b/ldap/clients/dsgw/html/alert.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/auth.html b/ldap/clients/dsgw/html/auth.html
index a533ffaa..1fee031f 100644
--- a/ldap/clients/dsgw/html/auth.html
+++ b/ldap/clients/dsgw/html/auth.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/authroot.html b/ldap/clients/dsgw/html/authroot.html
index 8329a3ca..19dc0a85 100644
--- a/ldap/clients/dsgw/html/authroot.html
+++ b/ldap/clients/dsgw/html/authroot.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/authtitle.html b/ldap/clients/dsgw/html/authtitle.html
index f2a510d9..6ad0255b 100644
--- a/ldap/clients/dsgw/html/authtitle.html
+++ b/ldap/clients/dsgw/html/authtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/confirm.html b/ldap/clients/dsgw/html/confirm.html
index 77d1631c..762f56c7 100644
--- a/ldap/clients/dsgw/html/confirm.html
+++ b/ldap/clients/dsgw/html/confirm.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/csearchtitle.html b/ldap/clients/dsgw/html/csearchtitle.html
index 93d052d5..e6a09d81 100644
--- a/ldap/clients/dsgw/html/csearchtitle.html
+++ b/ldap/clients/dsgw/html/csearchtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/de/auth.html b/ldap/clients/dsgw/html/de/auth.html
index 4d18cd8a..4d1e2029 100644
--- a/ldap/clients/dsgw/html/de/auth.html
+++ b/ldap/clients/dsgw/html/de/auth.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/de/authroot.html b/ldap/clients/dsgw/html/de/authroot.html
index 4d7160f5..eaca9350 100644
--- a/ldap/clients/dsgw/html/de/authroot.html
+++ b/ldap/clients/dsgw/html/de/authroot.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/de/authtitle.html b/ldap/clients/dsgw/html/de/authtitle.html
index 9c5aac27..09530ece 100644
--- a/ldap/clients/dsgw/html/de/authtitle.html
+++ b/ldap/clients/dsgw/html/de/authtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/de/csearchtitle.html b/ldap/clients/dsgw/html/de/csearchtitle.html
index ee172e37..eea02343 100644
--- a/ldap/clients/dsgw/html/de/csearchtitle.html
+++ b/ldap/clients/dsgw/html/de/csearchtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/de/eduser.html b/ldap/clients/dsgw/html/de/eduser.html
index 37c2f6b0..1ccdd7b9 100644
--- a/ldap/clients/dsgw/html/de/eduser.html
+++ b/ldap/clients/dsgw/html/de/eduser.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/de/greeting.html b/ldap/clients/dsgw/html/de/greeting.html
index 81a5d4bc..91203e12 100644
--- a/ldap/clients/dsgw/html/de/greeting.html
+++ b/ldap/clients/dsgw/html/de/greeting.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/de/index.html b/ldap/clients/dsgw/html/de/index.html
index 19e53f40..81dedd18 100644
--- a/ldap/clients/dsgw/html/de/index.html
+++ b/ldap/clients/dsgw/html/de/index.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/de/maintitle.html b/ldap/clients/dsgw/html/de/maintitle.html
index 10c4b0ed..df1b3037 100644
--- a/ldap/clients/dsgw/html/de/maintitle.html
+++ b/ldap/clients/dsgw/html/de/maintitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/de/newentrytitle.html b/ldap/clients/dsgw/html/de/newentrytitle.html
index 8e92b6d6..207714ab 100644
--- a/ldap/clients/dsgw/html/de/newentrytitle.html
+++ b/ldap/clients/dsgw/html/de/newentrytitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/de/searchtitle.html b/ldap/clients/dsgw/html/de/searchtitle.html
index b880c63d..1046fc75 100644
--- a/ldap/clients/dsgw/html/de/searchtitle.html
+++ b/ldap/clients/dsgw/html/de/searchtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/eduser.html b/ldap/clients/dsgw/html/eduser.html
index a2115661..7b412b98 100644
--- a/ldap/clients/dsgw/html/eduser.html
+++ b/ldap/clients/dsgw/html/eduser.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/emptyFrame.html b/ldap/clients/dsgw/html/emptyFrame.html
index 119281c1..ca3671b1 100644
--- a/ldap/clients/dsgw/html/emptyFrame.html
+++ b/ldap/clients/dsgw/html/emptyFrame.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/es/auth.html b/ldap/clients/dsgw/html/es/auth.html
index 40dbc16d..604186f5 100644
--- a/ldap/clients/dsgw/html/es/auth.html
+++ b/ldap/clients/dsgw/html/es/auth.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/es/authroot.html b/ldap/clients/dsgw/html/es/authroot.html
index e8eaba7c..78dfc389 100644
--- a/ldap/clients/dsgw/html/es/authroot.html
+++ b/ldap/clients/dsgw/html/es/authroot.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/es/authtitle.html b/ldap/clients/dsgw/html/es/authtitle.html
index bf7080d3..a58e7a12 100644
--- a/ldap/clients/dsgw/html/es/authtitle.html
+++ b/ldap/clients/dsgw/html/es/authtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/es/csearchtitle.html b/ldap/clients/dsgw/html/es/csearchtitle.html
index 206853ba..d9f32a11 100644
--- a/ldap/clients/dsgw/html/es/csearchtitle.html
+++ b/ldap/clients/dsgw/html/es/csearchtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/es/eduser.html b/ldap/clients/dsgw/html/es/eduser.html
index 4035ccc8..3e50632d 100644
--- a/ldap/clients/dsgw/html/es/eduser.html
+++ b/ldap/clients/dsgw/html/es/eduser.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/es/greeting.html b/ldap/clients/dsgw/html/es/greeting.html
index cc2d91ee..f5cd7314 100644
--- a/ldap/clients/dsgw/html/es/greeting.html
+++ b/ldap/clients/dsgw/html/es/greeting.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/es/index.html b/ldap/clients/dsgw/html/es/index.html
index eb76d4bf..2ef8fdb0 100644
--- a/ldap/clients/dsgw/html/es/index.html
+++ b/ldap/clients/dsgw/html/es/index.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/es/maintitle.html b/ldap/clients/dsgw/html/es/maintitle.html
index df8d9572..b64a4ba2 100644
--- a/ldap/clients/dsgw/html/es/maintitle.html
+++ b/ldap/clients/dsgw/html/es/maintitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/es/newentrytitle.html b/ldap/clients/dsgw/html/es/newentrytitle.html
index 11fe853b..eb62d64c 100644
--- a/ldap/clients/dsgw/html/es/newentrytitle.html
+++ b/ldap/clients/dsgw/html/es/newentrytitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/es/searchtitle.html b/ldap/clients/dsgw/html/es/searchtitle.html
index 49bb8a16..308346ce 100644
--- a/ldap/clients/dsgw/html/es/searchtitle.html
+++ b/ldap/clients/dsgw/html/es/searchtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/fr/auth.html b/ldap/clients/dsgw/html/fr/auth.html
index 94c8c14d..1b720bb8 100644
--- a/ldap/clients/dsgw/html/fr/auth.html
+++ b/ldap/clients/dsgw/html/fr/auth.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/fr/authroot.html b/ldap/clients/dsgw/html/fr/authroot.html
index ba2b73ad..0f857a73 100644
--- a/ldap/clients/dsgw/html/fr/authroot.html
+++ b/ldap/clients/dsgw/html/fr/authroot.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/fr/authtitle.html b/ldap/clients/dsgw/html/fr/authtitle.html
index 025c3345..75ca9ee9 100644
--- a/ldap/clients/dsgw/html/fr/authtitle.html
+++ b/ldap/clients/dsgw/html/fr/authtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/fr/csearchtitle.html b/ldap/clients/dsgw/html/fr/csearchtitle.html
index 6ebe96e7..6fc5386a 100644
--- a/ldap/clients/dsgw/html/fr/csearchtitle.html
+++ b/ldap/clients/dsgw/html/fr/csearchtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/fr/eduser.html b/ldap/clients/dsgw/html/fr/eduser.html
index 87cd96ba..d674ee8a 100644
--- a/ldap/clients/dsgw/html/fr/eduser.html
+++ b/ldap/clients/dsgw/html/fr/eduser.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/fr/greeting.html b/ldap/clients/dsgw/html/fr/greeting.html
index c213cb31..ca4a478e 100644
--- a/ldap/clients/dsgw/html/fr/greeting.html
+++ b/ldap/clients/dsgw/html/fr/greeting.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/fr/index.html b/ldap/clients/dsgw/html/fr/index.html
index d7df2fcb..1d62471f 100644
--- a/ldap/clients/dsgw/html/fr/index.html
+++ b/ldap/clients/dsgw/html/fr/index.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/fr/maintitle.html b/ldap/clients/dsgw/html/fr/maintitle.html
index ee4be4aa..5944927c 100644
--- a/ldap/clients/dsgw/html/fr/maintitle.html
+++ b/ldap/clients/dsgw/html/fr/maintitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/fr/newentrytitle.html b/ldap/clients/dsgw/html/fr/newentrytitle.html
index 230c1e27..9298b6fe 100644
--- a/ldap/clients/dsgw/html/fr/newentrytitle.html
+++ b/ldap/clients/dsgw/html/fr/newentrytitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/fr/searchtitle.html b/ldap/clients/dsgw/html/fr/searchtitle.html
index 5fc7717d..28a54d32 100644
--- a/ldap/clients/dsgw/html/fr/searchtitle.html
+++ b/ldap/clients/dsgw/html/fr/searchtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/greeting.html b/ldap/clients/dsgw/html/greeting.html
index f7969c76..63c67df1 100644
--- a/ldap/clients/dsgw/html/greeting.html
+++ b/ldap/clients/dsgw/html/greeting.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/index.html b/ldap/clients/dsgw/html/index.html
index 8959fe32..0c880c7f 100644
--- a/ldap/clients/dsgw/html/index.html
+++ b/ldap/clients/dsgw/html/index.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/info/Makefile b/ldap/clients/dsgw/html/info/Makefile
index da1158f9..24e8ab8d 100644
--- a/ldap/clients/dsgw/html/info/Makefile
+++ b/ldap/clients/dsgw/html/info/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/clients/dsgw/html/info/infonav.html b/ldap/clients/dsgw/html/info/infonav.html
index b02d8dfb..6af1d346 100644
--- a/ldap/clients/dsgw/html/info/infonav.html
+++ b/ldap/clients/dsgw/html/info/infonav.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/ja/auth.html b/ldap/clients/dsgw/html/ja/auth.html
index 28544037..00984023 100644
--- a/ldap/clients/dsgw/html/ja/auth.html
+++ b/ldap/clients/dsgw/html/ja/auth.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/ja/authroot.html b/ldap/clients/dsgw/html/ja/authroot.html
index c292a9e6..52a00441 100644
--- a/ldap/clients/dsgw/html/ja/authroot.html
+++ b/ldap/clients/dsgw/html/ja/authroot.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/ja/authtitle.html b/ldap/clients/dsgw/html/ja/authtitle.html
index cc4c72a9..e7965188 100644
--- a/ldap/clients/dsgw/html/ja/authtitle.html
+++ b/ldap/clients/dsgw/html/ja/authtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/ja/csearchtitle.html b/ldap/clients/dsgw/html/ja/csearchtitle.html
index a3a9cb96..846156a1 100644
--- a/ldap/clients/dsgw/html/ja/csearchtitle.html
+++ b/ldap/clients/dsgw/html/ja/csearchtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/ja/eduser.html b/ldap/clients/dsgw/html/ja/eduser.html
index 0e4b6895..88d7fee1 100644
--- a/ldap/clients/dsgw/html/ja/eduser.html
+++ b/ldap/clients/dsgw/html/ja/eduser.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/ja/greeting.html b/ldap/clients/dsgw/html/ja/greeting.html
index 46e3076d..f6ada802 100644
--- a/ldap/clients/dsgw/html/ja/greeting.html
+++ b/ldap/clients/dsgw/html/ja/greeting.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/ja/index.html b/ldap/clients/dsgw/html/ja/index.html
index eb63b6e7..95c9753f 100644
--- a/ldap/clients/dsgw/html/ja/index.html
+++ b/ldap/clients/dsgw/html/ja/index.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/ja/maintitle.html b/ldap/clients/dsgw/html/ja/maintitle.html
index 06082892..9db18312 100644
--- a/ldap/clients/dsgw/html/ja/maintitle.html
+++ b/ldap/clients/dsgw/html/ja/maintitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/ja/newentrytitle.html b/ldap/clients/dsgw/html/ja/newentrytitle.html
index 80e044ac..4fa77755 100644
--- a/ldap/clients/dsgw/html/ja/newentrytitle.html
+++ b/ldap/clients/dsgw/html/ja/newentrytitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/ja/searchtitle.html b/ldap/clients/dsgw/html/ja/searchtitle.html
index af4588e4..55b1e1e0 100644
--- a/ldap/clients/dsgw/html/ja/searchtitle.html
+++ b/ldap/clients/dsgw/html/ja/searchtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/maintitle.html b/ldap/clients/dsgw/html/maintitle.html
index 8df31bd3..987c38b9 100644
--- a/ldap/clients/dsgw/html/maintitle.html
+++ b/ldap/clients/dsgw/html/maintitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/Makefile b/ldap/clients/dsgw/html/manual/Makefile
index 66f1f397..077f1b84 100644
--- a/ldap/clients/dsgw/html/manual/Makefile
+++ b/ldap/clients/dsgw/html/manual/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/clients/dsgw/html/manual/add.htm b/ldap/clients/dsgw/html/manual/add.htm
index 4a2a277b..b5332544 100644
--- a/ldap/clients/dsgw/html/manual/add.htm
+++ b/ldap/clients/dsgw/html/manual/add.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/attribut.htm b/ldap/clients/dsgw/html/manual/attribut.htm
index 1167d0f4..59d72b35 100644
--- a/ldap/clients/dsgw/html/manual/attribut.htm
+++ b/ldap/clients/dsgw/html/manual/attribut.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/auth.htm b/ldap/clients/dsgw/html/manual/auth.htm
index 20706795..b5f8c9e0 100644
--- a/ldap/clients/dsgw/html/manual/auth.htm
+++ b/ldap/clients/dsgw/html/manual/auth.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/contents.html b/ldap/clients/dsgw/html/manual/contents.html
index 87812064..35e2076c 100644
--- a/ldap/clients/dsgw/html/manual/contents.html
+++ b/ldap/clients/dsgw/html/manual/contents.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/dn.htm b/ldap/clients/dsgw/html/manual/dn.htm
index 8f27c4ff..1df3b771 100644
--- a/ldap/clients/dsgw/html/manual/dn.htm
+++ b/ldap/clients/dsgw/html/manual/dn.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/filters.htm b/ldap/clients/dsgw/html/manual/filters.htm
index ba2f18c1..23cd5a3e 100644
--- a/ldap/clients/dsgw/html/manual/filters.htm
+++ b/ldap/clients/dsgw/html/manual/filters.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/index.html b/ldap/clients/dsgw/html/manual/index.html
index 8fb01100..9cd51231 100644
--- a/ldap/clients/dsgw/html/manual/index.html
+++ b/ldap/clients/dsgw/html/manual/index.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/index.map b/ldap/clients/dsgw/html/manual/index.map
index 0629e063..5e33da78 100644
--- a/ldap/clients/dsgw/html/manual/index.map
+++ b/ldap/clients/dsgw/html/manual/index.map
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/intro.htm b/ldap/clients/dsgw/html/manual/intro.htm
index 609cda56..60f70f01 100644
--- a/ldap/clients/dsgw/html/manual/intro.htm
+++ b/ldap/clients/dsgw/html/manual/intro.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/ja/add.htm b/ldap/clients/dsgw/html/manual/ja/add.htm
index c249380b..a1d8e61e 100644
--- a/ldap/clients/dsgw/html/manual/ja/add.htm
+++ b/ldap/clients/dsgw/html/manual/ja/add.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/ja/attribut.htm b/ldap/clients/dsgw/html/manual/ja/attribut.htm
index 93fd4484..a363d79b 100644
--- a/ldap/clients/dsgw/html/manual/ja/attribut.htm
+++ b/ldap/clients/dsgw/html/manual/ja/attribut.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/ja/auth.htm b/ldap/clients/dsgw/html/manual/ja/auth.htm
index 951727b9..b8b11b70 100644
--- a/ldap/clients/dsgw/html/manual/ja/auth.htm
+++ b/ldap/clients/dsgw/html/manual/ja/auth.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/ja/contents.html b/ldap/clients/dsgw/html/manual/ja/contents.html
index 4b002482..68dee7a5 100644
--- a/ldap/clients/dsgw/html/manual/ja/contents.html
+++ b/ldap/clients/dsgw/html/manual/ja/contents.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/ja/filters.htm b/ldap/clients/dsgw/html/manual/ja/filters.htm
index 45191a67..fb9eed32 100644
--- a/ldap/clients/dsgw/html/manual/ja/filters.htm
+++ b/ldap/clients/dsgw/html/manual/ja/filters.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/ja/intro.htm b/ldap/clients/dsgw/html/manual/ja/intro.htm
index 4d7e933b..bac3bc7c 100644
--- a/ldap/clients/dsgw/html/manual/ja/intro.htm
+++ b/ldap/clients/dsgw/html/manual/ja/intro.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/ja/mod.htm b/ldap/clients/dsgw/html/manual/ja/mod.htm
index 63c0be0d..1d2645b0 100644
--- a/ldap/clients/dsgw/html/manual/ja/mod.htm
+++ b/ldap/clients/dsgw/html/manual/ja/mod.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/ja/objclass.htm b/ldap/clients/dsgw/html/manual/ja/objclass.htm
index 7b52d67c..53cd0831 100644
--- a/ldap/clients/dsgw/html/manual/ja/objclass.htm
+++ b/ldap/clients/dsgw/html/manual/ja/objclass.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/ja/search.htm b/ldap/clients/dsgw/html/manual/ja/search.htm
index 5e72af9f..bfee4812 100644
--- a/ldap/clients/dsgw/html/manual/ja/search.htm
+++ b/ldap/clients/dsgw/html/manual/ja/search.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/mod.htm b/ldap/clients/dsgw/html/manual/mod.htm
index 7fcf3db5..0820d0c1 100644
--- a/ldap/clients/dsgw/html/manual/mod.htm
+++ b/ldap/clients/dsgw/html/manual/mod.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/objclass.htm b/ldap/clients/dsgw/html/manual/objclass.htm
index a6e694d9..7a225b69 100644
--- a/ldap/clients/dsgw/html/manual/objclass.htm
+++ b/ldap/clients/dsgw/html/manual/objclass.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/manual/search.htm b/ldap/clients/dsgw/html/manual/search.htm
index a520b1a1..c1e81e6b 100644
--- a/ldap/clients/dsgw/html/manual/search.htm
+++ b/ldap/clients/dsgw/html/manual/search.htm
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/newentrytitle.html b/ldap/clients/dsgw/html/newentrytitle.html
index 75b6379c..b8e28a4f 100644
--- a/ldap/clients/dsgw/html/newentrytitle.html
+++ b/ldap/clients/dsgw/html/newentrytitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/searchtitle.html b/ldap/clients/dsgw/html/searchtitle.html
index 43ba790a..5f260f13 100644
--- a/ldap/clients/dsgw/html/searchtitle.html
+++ b/ldap/clients/dsgw/html/searchtitle.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/html/style.css b/ldap/clients/dsgw/html/style.css
index e9e00763..61b84897 100644
--- a/ldap/clients/dsgw/html/style.css
+++ b/ldap/clients/dsgw/html/style.css
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/htmlout.c b/ldap/clients/dsgw/htmlout.c
index 5f889a2e..4d72971d 100644
--- a/ldap/clients/dsgw/htmlout.c
+++ b/ldap/clients/dsgw/htmlout.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/htmlparse.c b/ldap/clients/dsgw/htmlparse.c
index 5edb8dcc..3b0007fc 100644
--- a/ldap/clients/dsgw/htmlparse.c
+++ b/ldap/clients/dsgw/htmlparse.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/lang.c b/ldap/clients/dsgw/lang.c
index 6c079baa..a4990899 100644
--- a/ldap/clients/dsgw/lang.c
+++ b/ldap/clients/dsgw/lang.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/ldaputil.c b/ldap/clients/dsgw/ldaputil.c
index 49d32787..d2a396f0 100644
--- a/ldap/clients/dsgw/ldaputil.c
+++ b/ldap/clients/dsgw/ldaputil.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/newentry.c b/ldap/clients/dsgw/newentry.c
index 78043999..4e09986c 100644
--- a/ldap/clients/dsgw/newentry.c
+++ b/ldap/clients/dsgw/newentry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbconfig/Makefile b/ldap/clients/dsgw/pbconfig/Makefile
index 49c0dac7..fc45b973 100644
--- a/ldap/clients/dsgw/pbconfig/Makefile
+++ b/ldap/clients/dsgw/pbconfig/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/clients/dsgw/pbconfig/authPassword.html b/ldap/clients/dsgw/pbconfig/authPassword.html
index f9965340..8f1dc818 100644
--- a/ldap/clients/dsgw/pbconfig/authPassword.html
+++ b/ldap/clients/dsgw/pbconfig/authPassword.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -34,7 +36,7 @@
All rights reserved.
--- END COPYRIGHT BLOCK --- -->
<!--
- | $Id: authPassword.html,v 1.3 2005/04/15 22:39:56 nkinder Exp $
+ | $Id: authPassword.html,v 1.4 2005/04/19 22:07:17 nkinder Exp $
|
| AUTHOR:
|
diff --git a/ldap/clients/dsgw/pbconfig/authSearch.html b/ldap/clients/dsgw/pbconfig/authSearch.html
index 01e17fa5..380b4e6b 100644
--- a/ldap/clients/dsgw/pbconfig/authSearch.html
+++ b/ldap/clients/dsgw/pbconfig/authSearch.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -34,7 +36,7 @@
All rights reserved.
--- END COPYRIGHT BLOCK --- -->
<!-- ---------------------------------------------------------------------------
- | $Id: authSearch.html,v 1.3 2005/04/15 22:39:56 nkinder Exp $
+ | $Id: authSearch.html,v 1.4 2005/04/19 22:07:17 nkinder Exp $
|
| AUTHOR:
|
diff --git a/ldap/clients/dsgw/pbconfig/display-orgperson.html b/ldap/clients/dsgw/pbconfig/display-orgperson.html
index 15b6bd02..578ee818 100644
--- a/ldap/clients/dsgw/pbconfig/display-orgperson.html
+++ b/ldap/clients/dsgw/pbconfig/display-orgperson.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbconfig/display-orgunit.html b/ldap/clients/dsgw/pbconfig/display-orgunit.html
index 9dc9ec7e..1608cd25 100644
--- a/ldap/clients/dsgw/pbconfig/display-orgunit.html
+++ b/ldap/clients/dsgw/pbconfig/display-orgunit.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -34,7 +36,7 @@
All rights reserved.
--- END COPYRIGHT BLOCK --- -->
<!-- ---------------------------------------------------------------------------
- | $Id: display-orgunit.html,v 1.3 2005/04/15 22:39:56 nkinder Exp $
+ | $Id: display-orgunit.html,v 1.4 2005/04/19 22:07:17 nkinder Exp $
|
| AUTHOR:
|
diff --git a/ldap/clients/dsgw/pbconfig/display-room.html b/ldap/clients/dsgw/pbconfig/display-room.html
index 5e3ce00c..437001c2 100644
--- a/ldap/clients/dsgw/pbconfig/display-room.html
+++ b/ldap/clients/dsgw/pbconfig/display-room.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbconfig/dsgwfilter.conf b/ldap/clients/dsgw/pbconfig/dsgwfilter.conf
index 67904bef..e46c28c5 100644
--- a/ldap/clients/dsgw/pbconfig/dsgwfilter.conf
+++ b/ldap/clients/dsgw/pbconfig/dsgwfilter.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -36,7 +38,7 @@
#
################################################################################
#
-# $Id: dsgwfilter.conf,v 1.3 2005/04/15 22:39:56 nkinder Exp $
+# $Id: dsgwfilter.conf,v 1.4 2005/04/19 22:07:17 nkinder Exp $
#
# AUTHOR:
#
diff --git a/ldap/clients/dsgw/pbconfig/dsgwsearchprefs.conf b/ldap/clients/dsgw/pbconfig/dsgwsearchprefs.conf
index 1682a300..e051c12f 100644
--- a/ldap/clients/dsgw/pbconfig/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/pbconfig/dsgwsearchprefs.conf
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -36,7 +38,7 @@
#
################################################################################
#
-# $Id: dsgwsearchprefs.conf,v 1.3 2005/04/15 22:39:56 nkinder Exp $
+# $Id: dsgwsearchprefs.conf,v 1.4 2005/04/19 22:07:17 nkinder Exp $
#
# AUTHOR:
#
diff --git a/ldap/clients/dsgw/pbconfig/edit-passwd.html b/ldap/clients/dsgw/pbconfig/edit-passwd.html
index 9db5740e..2ab442fc 100644
--- a/ldap/clients/dsgw/pbconfig/edit-passwd.html
+++ b/ldap/clients/dsgw/pbconfig/edit-passwd.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbconfig/list-Auth.html b/ldap/clients/dsgw/pbconfig/list-Auth.html
index 0093c8f4..a203f9a6 100644
--- a/ldap/clients/dsgw/pbconfig/list-Auth.html
+++ b/ldap/clients/dsgw/pbconfig/list-Auth.html
@@ -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.
@@ -35,7 +37,7 @@
All rights reserved.
--- END COPYRIGHT BLOCK --- -->
<!-- ---------------------------------------------------------------------------
- | $Id: list-Auth.html,v 1.3 2005/04/15 22:39:56 nkinder Exp $
+ | $Id: list-Auth.html,v 1.4 2005/04/19 22:07:18 nkinder Exp $
|
| AUTHOR:
|
diff --git a/ldap/clients/dsgw/pbconfig/list-People.html b/ldap/clients/dsgw/pbconfig/list-People.html
index 174fb104..42cbeed5 100644
--- a/ldap/clients/dsgw/pbconfig/list-People.html
+++ b/ldap/clients/dsgw/pbconfig/list-People.html
@@ -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/clients/dsgw/pbconfig/pb.tmpl b/ldap/clients/dsgw/pbconfig/pb.tmpl
index 3d32374e..23f6b2ce 100644
--- a/ldap/clients/dsgw/pbconfig/pb.tmpl
+++ b/ldap/clients/dsgw/pbconfig/pb.tmpl
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbhtml/Makefile b/ldap/clients/dsgw/pbhtml/Makefile
index 19601b84..02e62acb 100644
--- a/ldap/clients/dsgw/pbhtml/Makefile
+++ b/ldap/clients/dsgw/pbhtml/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/clients/dsgw/pbhtml/alert.html b/ldap/clients/dsgw/pbhtml/alert.html
index 79decb4d..22821bf0 100644
--- a/ldap/clients/dsgw/pbhtml/alert.html
+++ b/ldap/clients/dsgw/pbhtml/alert.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbhtml/carded.html b/ldap/clients/dsgw/pbhtml/carded.html
index 58046487..db9ac9c8 100644
--- a/ldap/clients/dsgw/pbhtml/carded.html
+++ b/ldap/clients/dsgw/pbhtml/carded.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbhtml/confirm.html b/ldap/clients/dsgw/pbhtml/confirm.html
index 8c1939bc..371f5821 100644
--- a/ldap/clients/dsgw/pbhtml/confirm.html
+++ b/ldap/clients/dsgw/pbhtml/confirm.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbhtml/emptyFrame.html b/ldap/clients/dsgw/pbhtml/emptyFrame.html
index 119281c1..ca3671b1 100644
--- a/ldap/clients/dsgw/pbhtml/emptyFrame.html
+++ b/ldap/clients/dsgw/pbhtml/emptyFrame.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbhtml/index.html b/ldap/clients/dsgw/pbhtml/index.html
index 9b073849..bdcf1966 100644
--- a/ldap/clients/dsgw/pbhtml/index.html
+++ b/ldap/clients/dsgw/pbhtml/index.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbhtml/intro.html b/ldap/clients/dsgw/pbhtml/intro.html
index 108f28df..2b665748 100644
--- a/ldap/clients/dsgw/pbhtml/intro.html
+++ b/ldap/clients/dsgw/pbhtml/intro.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbhtml/modify.html b/ldap/clients/dsgw/pbhtml/modify.html
index 428ff7ab..724cc214 100644
--- a/ldap/clients/dsgw/pbhtml/modify.html
+++ b/ldap/clients/dsgw/pbhtml/modify.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -34,7 +36,7 @@
All rights reserved.
--- END COPYRIGHT BLOCK --- -->
<!--
- | $Id: modify.html,v 1.3 2005/04/15 22:40:02 nkinder Exp $
+ | $Id: modify.html,v 1.4 2005/04/19 22:07:18 nkinder Exp $
|
| AUTHOR:
|
diff --git a/ldap/clients/dsgw/pbhtml/nonemp.html b/ldap/clients/dsgw/pbhtml/nonemp.html
index 1fb0585d..13292e0e 100644
--- a/ldap/clients/dsgw/pbhtml/nonemp.html
+++ b/ldap/clients/dsgw/pbhtml/nonemp.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -34,7 +36,7 @@
All rights reserved.
--- END COPYRIGHT BLOCK --- -->
<!--
- | $Id: nonemp.html,v 1.3 2005/04/15 22:40:02 nkinder Exp $
+ | $Id: nonemp.html,v 1.4 2005/04/19 22:07:18 nkinder Exp $
|
| AUTHOR:
|
diff --git a/ldap/clients/dsgw/pbhtml/nullStringError.html b/ldap/clients/dsgw/pbhtml/nullStringError.html
index 7935bb85..4f6dcac3 100644
--- a/ldap/clients/dsgw/pbhtml/nullStringError.html
+++ b/ldap/clients/dsgw/pbhtml/nullStringError.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbhtml/phone.html b/ldap/clients/dsgw/pbhtml/phone.html
index c97a3a5c..9a638b78 100644
--- a/ldap/clients/dsgw/pbhtml/phone.html
+++ b/ldap/clients/dsgw/pbhtml/phone.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbhtml/phone.js b/ldap/clients/dsgw/pbhtml/phone.js
index 26d8dce3..e5a687fe 100755
--- a/ldap/clients/dsgw/pbhtml/phone.js
+++ b/ldap/clients/dsgw/pbhtml/phone.js
@@ -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/clients/dsgw/pbhtml/report.html b/ldap/clients/dsgw/pbhtml/report.html
index 96aeaea3..b3768fbe 100644
--- a/ldap/clients/dsgw/pbhtml/report.html
+++ b/ldap/clients/dsgw/pbhtml/report.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/pbhtml/style.css b/ldap/clients/dsgw/pbhtml/style.css
index a764b9dc..34df36d6 100644
--- a/ldap/clients/dsgw/pbhtml/style.css
+++ b/ldap/clients/dsgw/pbhtml/style.css
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/search.c b/ldap/clients/dsgw/search.c
index 8a26e43b..386c7ce1 100644
--- a/ldap/clients/dsgw/search.c
+++ b/ldap/clients/dsgw/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/clients/dsgw/secglue.c b/ldap/clients/dsgw/secglue.c
index 3fb53fd3..7cf27610 100644
--- a/ldap/clients/dsgw/secglue.c
+++ b/ldap/clients/dsgw/secglue.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/sort.c b/ldap/clients/dsgw/sort.c
index 61af273e..3901e1ad 100644
--- a/ldap/clients/dsgw/sort.c
+++ b/ldap/clients/dsgw/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/clients/dsgw/templateindex.c b/ldap/clients/dsgw/templateindex.c
index 3b53c4bc..40df74f7 100644
--- a/ldap/clients/dsgw/templateindex.c
+++ b/ldap/clients/dsgw/templateindex.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/tutor.c b/ldap/clients/dsgw/tutor.c
index 154f5538..6803e470 100644
--- a/ldap/clients/dsgw/tutor.c
+++ b/ldap/clients/dsgw/tutor.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/unauth.c b/ldap/clients/dsgw/unauth.c
index 0a119b77..7739995e 100644
--- a/ldap/clients/dsgw/unauth.c
+++ b/ldap/clients/dsgw/unauth.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/userhtml/Makefile b/ldap/clients/dsgw/userhtml/Makefile
index e6b7f124..f2cfdced 100644
--- a/ldap/clients/dsgw/userhtml/Makefile
+++ b/ldap/clients/dsgw/userhtml/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/clients/dsgw/userhtml/edit-userpasswd.html b/ldap/clients/dsgw/userhtml/edit-userpasswd.html
index 9bfd92b0..e46c86b9 100644
--- a/ldap/clients/dsgw/userhtml/edit-userpasswd.html
+++ b/ldap/clients/dsgw/userhtml/edit-userpasswd.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/userhtml/edit-userpinfo.html b/ldap/clients/dsgw/userhtml/edit-userpinfo.html
index ae3077cb..92b6966f 100644
--- a/ldap/clients/dsgw/userhtml/edit-userpinfo.html
+++ b/ldap/clients/dsgw/userhtml/edit-userpinfo.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/userhtml/index.html b/ldap/clients/dsgw/userhtml/index.html
index bf9b9dc6..e0508e51 100644
--- a/ldap/clients/dsgw/userhtml/index.html
+++ b/ldap/clients/dsgw/userhtml/index.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/userhtml/index.lst b/ldap/clients/dsgw/userhtml/index.lst
index d2b8d1c6..e6f445ca 100644
--- a/ldap/clients/dsgw/userhtml/index.lst
+++ b/ldap/clients/dsgw/userhtml/index.lst
@@ -26,7 +26,9 @@
; in conjunction with the Program except the Non-GPL Code covered by this
; exception. If you modify this file, you may extend this exception to your
; version of the file, but you are not obligated to do so. If you do not wish to
-; do so, delete this exception statement from your version.
+; provide this exception without modification, you must delete this exception
+; statement from your version and license this file solely under the GPL without
+; exception.
;
;
; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsgw/utf8compare.c b/ldap/clients/dsgw/utf8compare.c
index b43fe497..f351419d 100644
--- a/ldap/clients/dsgw/utf8compare.c
+++ b/ldap/clients/dsgw/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/clients/dsgw/vcard.c b/ldap/clients/dsgw/vcard.c
index 0e935809..a8e4ef8b 100644
--- a/ldap/clients/dsgw/vcard.c
+++ b/ldap/clients/dsgw/vcard.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/clients/dsmlgw/Makefile b/ldap/clients/dsmlgw/Makefile
index f520ae5d..22cff75e 100644
--- a/ldap/clients/dsmlgw/Makefile
+++ b/ldap/clients/dsmlgw/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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/build.xml b/ldap/clients/dsmlgw/build.xml
index e0960076..c0ec4252 100644
--- a/ldap/clients/dsmlgw/build.xml
+++ b/ldap/clients/dsmlgw/build.xml
@@ -3,11 +3,11 @@
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
-
+
This Program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License along with
this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -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/clients/dsmlgw/misc/dsmlgw.cfg b/ldap/clients/dsmlgw/misc/dsmlgw.cfg
index 2547d022..2370987d 100644
--- a/ldap/clients/dsmlgw/misc/dsmlgw.cfg
+++ b/ldap/clients/dsmlgw/misc/dsmlgw.cfg
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this 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/clients/dsmlgw/misc/server-config.wsdd b/ldap/clients/dsmlgw/misc/server-config.wsdd
index 2b28d9ff..e9a57edd 100644
--- a/ldap/clients/dsmlgw/misc/server-config.wsdd
+++ b/ldap/clients/dsmlgw/misc/server-config.wsdd
@@ -3,11 +3,11 @@
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
-
+
This Program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License along with
this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -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/clients/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java
index 95f0cc89..7d0e3c4b 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java
index a955536d..bafbfc4f 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Configuration.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Constants.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Constants.java
index 9ac28ba8..badc7945 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Constants.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Constants.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java
index 4fbc76cb..f44dbcd3 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java
index f2a969ea..96166a1d 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java
index 0a9f1074..51867d29 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java
index e91d107c..09484b41 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java
index 5f5db4b3..4d84cd9c 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java
index d2bedec2..3bf19717 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java
index e2a7578a..28ff6157 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java
index 5a205bba..5f673b57 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java
index 89ee7263..d168a440 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java
index 045050e7..17aa356b 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java
index bbafc217..b42025f0 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java
index e6d7cad3..482abaee 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java
index 4481657b..41c977bc 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java
index ac7e4cf2..5302c734 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java
index 1826e905..d74724fc 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java
index f8026aaf..a7fb6870 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java
index 61a733a8..7b83939b 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java
index 4ec54ce6..7dbed1a8 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java
index 3c2a8975..006bf05d 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java
index 5f76e9a5..6f281d63 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java
index d4453f04..232eaca2 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/SOAPClient.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/SOAPClient.java
index 2e7e6fee..afc86414 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/SOAPClient.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/SOAPClient.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlClient.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlClient.java
index 48c91be7..c43307c9 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlClient.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlClient.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java
index fe106291..15d336f8 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.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) 2005 Red Hat, Inc.
diff --git a/ldap/clients/orgchart/botframe.html b/ldap/clients/orgchart/botframe.html
index 1e2a9b79..9285c78b 100644
--- a/ldap/clients/orgchart/botframe.html
+++ b/ldap/clients/orgchart/botframe.html
@@ -3,11 +3,11 @@
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
-
+
This Program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License along with
this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -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/clients/orgchart/config.tmpl b/ldap/clients/orgchart/config.tmpl
index 80e38bba..1eeaffcd 100644
--- a/ldap/clients/orgchart/config.tmpl
+++ b/ldap/clients/orgchart/config.tmpl
@@ -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/clients/orgchart/index.html b/ldap/clients/orgchart/index.html
index 2a5e8a6d..a8f00fa3 100644
--- a/ldap/clients/orgchart/index.html
+++ b/ldap/clients/orgchart/index.html
@@ -2,11 +2,11 @@
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
-
+
This Program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License along with
this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this 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/clients/orgchart/myorg.bat b/ldap/clients/orgchart/myorg.bat
index 79fcf796..eb96390f 100644
--- a/ldap/clients/orgchart/myorg.bat
+++ b/ldap/clients/orgchart/myorg.bat
@@ -26,7 +26,9 @@
@rem // in conjunction with the Program except the Non-GPL Code covered by this
@rem // exception. If you modify this file, you may extend this exception to your
@rem // version of the file, but you are not obligated to do so. If you do not wish to
-@rem // do so, delete this exception statement from your version.
+@rem // provide this exception without modification, you must delete this exception
+@rem // statement from your version and license this file solely under the GPL without
+@rem // exception.
@rem //
@rem //
@rem // Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/clients/orgchart/myorg.pl b/ldap/clients/orgchart/myorg.pl
index b6dffb32..6a0561f2 100755
--- a/ldap/clients/orgchart/myorg.pl
+++ b/ldap/clients/orgchart/myorg.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/clients/orgchart/org.bat b/ldap/clients/orgchart/org.bat
index 19628657..b807a3c1 100644
--- a/ldap/clients/orgchart/org.bat
+++ b/ldap/clients/orgchart/org.bat
@@ -26,7 +26,9 @@
@rem // in conjunction with the Program except the Non-GPL Code covered by this
@rem // exception. If you modify this file, you may extend this exception to your
@rem // version of the file, but you are not obligated to do so. If you do not wish to
-@rem // do so, delete this exception statement from your version.
+@rem // provide this exception without modification, you must delete this exception
+@rem // statement from your version and license this file solely under the GPL without
+@rem // exception.
@rem //
@rem //
@rem // Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/clients/orgchart/org.pl b/ldap/clients/orgchart/org.pl
index 21e6199f..44e649bd 100755
--- a/ldap/clients/orgchart/org.pl
+++ b/ldap/clients/orgchart/org.pl
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/clients/orgchart/styles.css b/ldap/clients/orgchart/styles.css
index 8df58a42..2d05b4a5 100644
--- a/ldap/clients/orgchart/styles.css
+++ b/ldap/clients/orgchart/styles.css
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this 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/clients/orgchart/topframe.html b/ldap/clients/orgchart/topframe.html
index c31267c6..8227e4f8 100644
--- a/ldap/clients/orgchart/topframe.html
+++ b/ldap/clients/orgchart/topframe.html
@@ -2,11 +2,11 @@
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
-
+
This Program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License along with
this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this 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/clients/orgchart/wrapper.c b/ldap/clients/orgchart/wrapper.c
index d54e2313..9bd6f398 100644
--- a/ldap/clients/orgchart/wrapper.c
+++ b/ldap/clients/orgchart/wrapper.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this 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/cm/Makefile b/ldap/cm/Makefile
index 3bba1b3e..ece32d7d 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/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/cm/filterfiles.sh b/ldap/cm/filterfiles.sh
index ecc6172b..84bb7b63 100644
--- a/ldap/cm/filterfiles.sh
+++ b/ldap/cm/filterfiles.sh
@@ -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/cm/fixBaseInf.pl b/ldap/cm/fixBaseInf.pl
index f6500051..f9a97384 100644
--- a/ldap/cm/fixBaseInf.pl
+++ b/ldap/cm/fixBaseInf.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/cm/fixNSPerlInf.pl b/ldap/cm/fixNSPerlInf.pl
index 04ca561a..5194eaf6 100644
--- a/ldap/cm/fixNSPerlInf.pl
+++ b/ldap/cm/fixNSPerlInf.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/cm/fixPerlDAPInf.pl b/ldap/cm/fixPerlDAPInf.pl
index 9b45f7f1..790a68d4 100644
--- a/ldap/cm/fixPerlDAPInf.pl
+++ b/ldap/cm/fixPerlDAPInf.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/cm/fixSetupInf.pl b/ldap/cm/fixSetupInf.pl
index 2c1c7c87..50ee87f8 100644
--- a/ldap/cm/fixSetupInf.pl
+++ b/ldap/cm/fixSetupInf.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/cm/ldapjava.mpw b/ldap/cm/ldapjava.mpw
index bd95c636..b9d0a019 100644
--- a/ldap/cm/ldapjava.mpw
+++ b/ldap/cm/ldapjava.mpw
@@ -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/cm/nbsp2utf8.sh b/ldap/cm/nbsp2utf8.sh
index 9e8706c4..29b6b5b6 100644
--- a/ldap/cm/nbsp2utf8.sh
+++ b/ldap/cm/nbsp2utf8.sh
@@ -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/cm/newinst/Makefile b/ldap/cm/newinst/Makefile
index 0e2f977f..739dc59f 100644
--- a/ldap/cm/newinst/Makefile
+++ b/ldap/cm/newinst/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/cm/newinst/fixINF.pl b/ldap/cm/newinst/fixINF.pl
index 097606d6..7a6c1ca8 100644
--- a/ldap/cm/newinst/fixINF.pl
+++ b/ldap/cm/newinst/fixINF.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/cm/newinst/ns-keygen b/ldap/cm/newinst/ns-keygen
index 2ee2cdbe..9ba028ee 100755
--- a/ldap/cm/newinst/ns-keygen
+++ b/ldap/cm/newinst/ns-keygen
@@ -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/cm/newinst/ns-update b/ldap/cm/newinst/ns-update
index 2bbe5d17..5e4ffe86 100755
--- a/ldap/cm/newinst/ns-update
+++ b/ldap/cm/newinst/ns-update
@@ -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/cm/newinst/replaceToken.pl b/ldap/cm/newinst/replaceToken.pl
index 2506b77d..474ef304 100644
--- a/ldap/cm/newinst/replaceToken.pl
+++ b/ldap/cm/newinst/replaceToken.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/cm/newinst/setup b/ldap/cm/newinst/setup
index e0c2402e..45bc474c 100755
--- a/ldap/cm/newinst/setup
+++ b/ldap/cm/newinst/setup
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/cm/newinst/setup.pl b/ldap/cm/newinst/setup.pl
index 1f2caa41..978db5be 100755
--- a/ldap/cm/newinst/setup.pl
+++ b/ldap/cm/newinst/setup.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) 2005 Red Hat, Inc.
diff --git a/ldap/cm/newinst/setup.sh b/ldap/cm/newinst/setup.sh
index b7b98d1e..852efc37 100755
--- a/ldap/cm/newinst/setup.sh
+++ b/ldap/cm/newinst/setup.sh
@@ -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/cm/newinst/slapd.inf b/ldap/cm/newinst/slapd.inf
index fdc6e376..c3c826e3 100644
--- a/ldap/cm/newinst/slapd.inf
+++ b/ldap/cm/newinst/slapd.inf
@@ -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/cm/newinst/uninstall b/ldap/cm/newinst/uninstall
index e52d9fd2..f48fa343 100755
--- a/ldap/cm/newinst/uninstall
+++ b/ldap/cm/newinst/uninstall
@@ -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/cm/newinst/ux-config.cc b/ldap/cm/newinst/ux-config.cc
index 06c8d2ee..420d7446 100644
--- a/ldap/cm/newinst/ux-config.cc
+++ b/ldap/cm/newinst/ux-config.cc
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/newinst/ux-config.h b/ldap/cm/newinst/ux-config.h
index 113e2cd9..7e73d6c1 100644
--- a/ldap/cm/newinst/ux-config.h
+++ b/ldap/cm/newinst/ux-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.
@@ -46,6 +48,9 @@
**
** HISTORY:
** $Log: ux-config.h,v $
+** Revision 1.6 2005/04/19 22:07:21 nkinder
+** Fixed licensing typo
+**
** Revision 1.5 2005/04/15 22:40:11 nkinder
** 155068 - Added license to source files
**
diff --git a/ldap/cm/newinst/ux-dialog.cc b/ldap/cm/newinst/ux-dialog.cc
index efe94459..0b7023f8 100644
--- a/ldap/cm/newinst/ux-dialog.cc
+++ b/ldap/cm/newinst/ux-dialog.cc
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/newinst/ux-dialog.h b/ldap/cm/newinst/ux-dialog.h
index 92218e9f..26ef8302 100644
--- a/ldap/cm/newinst/ux-dialog.h
+++ b/ldap/cm/newinst/ux-dialog.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/cm/newinst/ux-dsalib_dn.c b/ldap/cm/newinst/ux-dsalib_dn.c
index 27908dfc..ebdc528a 100644
--- a/ldap/cm/newinst/ux-dsalib_dn.c
+++ b/ldap/cm/newinst/ux-dsalib_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/cm/newinst/ux-guesses.cc b/ldap/cm/newinst/ux-guesses.cc
index 86c1bc63..0402feac 100644
--- a/ldap/cm/newinst/ux-guesses.cc
+++ b/ldap/cm/newinst/ux-guesses.cc
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
@@ -38,9 +40,12 @@
-/* $RCSfile: ux-guesses.cc,v $ $Revision: 1.4 $ $Date: 2005/04/15 22:40:11 $ $State: Exp $ */
+/* $RCSfile: ux-guesses.cc,v $ $Revision: 1.5 $ $Date: 2005/04/19 22:07:21 $ $State: Exp $ */
/*
* $Log: ux-guesses.cc,v $
+ * Revision 1.5 2005/04/19 22:07:21 nkinder
+ * Fixed licensing typo
+ *
* Revision 1.4 2005/04/15 22:40:11 nkinder
* 155068 - Added license to source files
*
diff --git a/ldap/cm/newinstnt/Makefile b/ldap/cm/newinstnt/Makefile
index 9254fefe..0210c0ed 100644
--- a/ldap/cm/newinstnt/Makefile
+++ b/ldap/cm/newinstnt/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/cm/newinstnt/consolinst.c b/ldap/cm/newinstnt/consolinst.c
index b6c2d8b0..a85341f9 100644
--- a/ldap/cm/newinstnt/consolinst.c
+++ b/ldap/cm/newinstnt/consolinst.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/newinstnt/consolinst.h b/ldap/cm/newinstnt/consolinst.h
index 67034659..9878ff2b 100644
--- a/ldap/cm/newinstnt/consolinst.h
+++ b/ldap/cm/newinstnt/consolinst.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/cm/newinstnt/dsinst.c b/ldap/cm/newinstnt/dsinst.c
index 31e22dc7..0b9534ba 100644
--- a/ldap/cm/newinstnt/dsinst.c
+++ b/ldap/cm/newinstnt/dsinst.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/newinstnt/dsinst.h b/ldap/cm/newinstnt/dsinst.h
index 4190b5fd..28a118ed 100644
--- a/ldap/cm/newinstnt/dsinst.h
+++ b/ldap/cm/newinstnt/dsinst.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/cm/newinstnt/dsinst.rc b/ldap/cm/newinstnt/dsinst.rc
index 09df8940..68ef807b 100644
--- a/ldap/cm/newinstnt/dsinst.rc
+++ b/ldap/cm/newinstnt/dsinst.rc
@@ -26,7 +26,9 @@
// in conjunction with the Program except the Non-GPL Code covered by this
// exception. If you modify this file, you may extend this exception to your
// version of the file, but you are not obligated to do so. If you do not wish to
-// do so, delete this exception statement from your version.
+// provide this exception without modification, you must delete this exception
+// statement from your version and license this file solely under the GPL without
+// exception.
//
//
// Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/newinstnt/dsinst_dsalib_dn.c b/ldap/cm/newinstnt/dsinst_dsalib_dn.c
index 62af7b6d..f478ac8f 100644
--- a/ldap/cm/newinstnt/dsinst_dsalib_dn.c
+++ b/ldap/cm/newinstnt/dsinst_dsalib_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/cm/newinstnt/libinst.c b/ldap/cm/newinstnt/libinst.c
index 011ce60e..37e966a7 100644
--- a/ldap/cm/newinstnt/libinst.c
+++ b/ldap/cm/newinstnt/libinst.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/newinstnt/libinst.h b/ldap/cm/newinstnt/libinst.h
index 4b7ce17e..e5709ef9 100644
--- a/ldap/cm/newinstnt/libinst.h
+++ b/ldap/cm/newinstnt/libinst.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/cm/newinstnt/resource.h b/ldap/cm/newinstnt/resource.h
index 379388a1..04cadeeb 100644
--- a/ldap/cm/newinstnt/resource.h
+++ b/ldap/cm/newinstnt/resource.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/cm/newinstnt/setup.bat b/ldap/cm/newinstnt/setup.bat
index 2b557a3a..c6027c65 100644
--- a/ldap/cm/newinstnt/setup.bat
+++ b/ldap/cm/newinstnt/setup.bat
@@ -26,7 +26,9 @@
@rem // in conjunction with the Program except the Non-GPL Code covered by this
@rem // exception. If you modify this file, you may extend this exception to your
@rem // version of the file, but you are not obligated to do so. If you do not wish to
-@rem // do so, delete this exception statement from your version.
+@rem // provide this exception without modification, you must delete this exception
+@rem // statement from your version and license this file solely under the GPL without
+@rem // exception.
@rem //
@rem //
@rem // Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/newinstnt/setup.inf b/ldap/cm/newinstnt/setup.inf
index 878b3ed3..5e35fc24 100644
--- a/ldap/cm/newinstnt/setup.inf
+++ b/ldap/cm/newinstnt/setup.inf
@@ -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/cm/newinstnt/slapd.inf b/ldap/cm/newinstnt/slapd.inf
index 4caa5ae5..b3df80ae 100644
--- a/ldap/cm/newinstnt/slapd.inf
+++ b/ldap/cm/newinstnt/slapd.inf
@@ -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/cm/ntpack.sh b/ldap/cm/ntpack.sh
index 375ab181..465625a9 100644
--- a/ldap/cm/ntpack.sh
+++ b/ldap/cm/ntpack.sh
@@ -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/cm/unixstrip b/ldap/cm/unixstrip
index da6dc8b8..5b7cdd96 100755
--- a/ldap/cm/unixstrip
+++ b/ldap/cm/unixstrip
@@ -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/cm/unixstrip.pl b/ldap/cm/unixstrip.pl
index 53a0c4f3..2093218d 100644
--- a/ldap/cm/unixstrip.pl
+++ b/ldap/cm/unixstrip.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/cm/v1confs/ns-calendar-globopt.conf b/ldap/cm/v1confs/ns-calendar-globopt.conf
index cc41f721..0c5de21f 100644
--- a/ldap/cm/v1confs/ns-calendar-globopt.conf
+++ b/ldap/cm/v1confs/ns-calendar-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-calendar-schema.conf b/ldap/cm/v1confs/ns-calendar-schema.conf
index 4403855c..e7e3c775 100644
--- a/ldap/cm/v1confs/ns-calendar-schema.conf
+++ b/ldap/cm/v1confs/ns-calendar-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-certificate-globopt.conf b/ldap/cm/v1confs/ns-certificate-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v1confs/ns-certificate-globopt.conf
+++ b/ldap/cm/v1confs/ns-certificate-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-certificate-schema.conf b/ldap/cm/v1confs/ns-certificate-schema.conf
index 281d911e..2ea091af 100644
--- a/ldap/cm/v1confs/ns-certificate-schema.conf
+++ b/ldap/cm/v1confs/ns-certificate-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-compass-globopt.conf b/ldap/cm/v1confs/ns-compass-globopt.conf
index 755c213f..6c56c350 100644
--- a/ldap/cm/v1confs/ns-compass-globopt.conf
+++ b/ldap/cm/v1confs/ns-compass-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-compass-schema.conf b/ldap/cm/v1confs/ns-compass-schema.conf
index 2a6d0cf8..7a6d9d4f 100644
--- a/ldap/cm/v1confs/ns-compass-schema.conf
+++ b/ldap/cm/v1confs/ns-compass-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-directory-globopt.conf b/ldap/cm/v1confs/ns-directory-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v1confs/ns-directory-globopt.conf
+++ b/ldap/cm/v1confs/ns-directory-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-directory-schema.conf b/ldap/cm/v1confs/ns-directory-schema.conf
index 699e479b..952a205e 100644
--- a/ldap/cm/v1confs/ns-directory-schema.conf
+++ b/ldap/cm/v1confs/ns-directory-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-mail-globopt.conf b/ldap/cm/v1confs/ns-mail-globopt.conf
index d712ae3f..5c1075d9 100644
--- a/ldap/cm/v1confs/ns-mail-globopt.conf
+++ b/ldap/cm/v1confs/ns-mail-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-mail-schema.conf b/ldap/cm/v1confs/ns-mail-schema.conf
index 33b9ebf5..35a103e8 100644
--- a/ldap/cm/v1confs/ns-mail-schema.conf
+++ b/ldap/cm/v1confs/ns-mail-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-media-globopt.conf b/ldap/cm/v1confs/ns-media-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v1confs/ns-media-globopt.conf
+++ b/ldap/cm/v1confs/ns-media-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-media-schema.conf b/ldap/cm/v1confs/ns-media-schema.conf
index 5e333c16..a52bd5b5 100644
--- a/ldap/cm/v1confs/ns-media-schema.conf
+++ b/ldap/cm/v1confs/ns-media-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-news-globopt.conf b/ldap/cm/v1confs/ns-news-globopt.conf
index 9c387d8c..46dd80f7 100644
--- a/ldap/cm/v1confs/ns-news-globopt.conf
+++ b/ldap/cm/v1confs/ns-news-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-news-schema.conf b/ldap/cm/v1confs/ns-news-schema.conf
index b785529f..33b19bfb 100644
--- a/ldap/cm/v1confs/ns-news-schema.conf
+++ b/ldap/cm/v1confs/ns-news-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-proxy-globopt.conf b/ldap/cm/v1confs/ns-proxy-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v1confs/ns-proxy-globopt.conf
+++ b/ldap/cm/v1confs/ns-proxy-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-proxy-schema.conf b/ldap/cm/v1confs/ns-proxy-schema.conf
index 73ab92f3..aef68f1d 100644
--- a/ldap/cm/v1confs/ns-proxy-schema.conf
+++ b/ldap/cm/v1confs/ns-proxy-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-web-globopt.conf b/ldap/cm/v1confs/ns-web-globopt.conf
index 9c387d8c..46dd80f7 100644
--- a/ldap/cm/v1confs/ns-web-globopt.conf
+++ b/ldap/cm/v1confs/ns-web-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/ns-web-schema.conf b/ldap/cm/v1confs/ns-web-schema.conf
index f9919466..72c7ad91 100644
--- a/ldap/cm/v1confs/ns-web-schema.conf
+++ b/ldap/cm/v1confs/ns-web-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/slapd.at.conf b/ldap/cm/v1confs/slapd.at.conf
index f023e018..c7f9655a 100644
--- a/ldap/cm/v1confs/slapd.at.conf
+++ b/ldap/cm/v1confs/slapd.at.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v1confs/slapd.oc.conf b/ldap/cm/v1confs/slapd.oc.conf
index 597de5a5..649def18 100644
--- a/ldap/cm/v1confs/slapd.oc.conf
+++ b/ldap/cm/v1confs/slapd.oc.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-calendar-globopt.conf b/ldap/cm/v3confs/ns-calendar-globopt.conf
index 6b13bb4b..9b49a483 100644
--- a/ldap/cm/v3confs/ns-calendar-globopt.conf
+++ b/ldap/cm/v3confs/ns-calendar-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-calendar-schema.conf b/ldap/cm/v3confs/ns-calendar-schema.conf
index 527034bb..1c6b9b4c 100644
--- a/ldap/cm/v3confs/ns-calendar-schema.conf
+++ b/ldap/cm/v3confs/ns-calendar-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-certificate-globopt.conf b/ldap/cm/v3confs/ns-certificate-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v3confs/ns-certificate-globopt.conf
+++ b/ldap/cm/v3confs/ns-certificate-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-certificate-schema.conf b/ldap/cm/v3confs/ns-certificate-schema.conf
index be88fe89..e24ae45d 100644
--- a/ldap/cm/v3confs/ns-certificate-schema.conf
+++ b/ldap/cm/v3confs/ns-certificate-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-compass-globopt.conf b/ldap/cm/v3confs/ns-compass-globopt.conf
index 755c213f..6c56c350 100644
--- a/ldap/cm/v3confs/ns-compass-globopt.conf
+++ b/ldap/cm/v3confs/ns-compass-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-compass-schema.conf b/ldap/cm/v3confs/ns-compass-schema.conf
index d0cd0b0e..52997ea4 100644
--- a/ldap/cm/v3confs/ns-compass-schema.conf
+++ b/ldap/cm/v3confs/ns-compass-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-directory-globopt.conf b/ldap/cm/v3confs/ns-directory-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v3confs/ns-directory-globopt.conf
+++ b/ldap/cm/v3confs/ns-directory-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-directory-schema.conf b/ldap/cm/v3confs/ns-directory-schema.conf
index 3cc6d2b2..335dc675 100644
--- a/ldap/cm/v3confs/ns-directory-schema.conf
+++ b/ldap/cm/v3confs/ns-directory-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-mail-globopt.conf b/ldap/cm/v3confs/ns-mail-globopt.conf
index d712ae3f..5c1075d9 100644
--- a/ldap/cm/v3confs/ns-mail-globopt.conf
+++ b/ldap/cm/v3confs/ns-mail-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-mail-schema.conf b/ldap/cm/v3confs/ns-mail-schema.conf
index 9c84dfdf..d55a2ca4 100644
--- a/ldap/cm/v3confs/ns-mail-schema.conf
+++ b/ldap/cm/v3confs/ns-mail-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-media-globopt.conf b/ldap/cm/v3confs/ns-media-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v3confs/ns-media-globopt.conf
+++ b/ldap/cm/v3confs/ns-media-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-media-schema.conf b/ldap/cm/v3confs/ns-media-schema.conf
index c4c43f8a..01b2cf95 100644
--- a/ldap/cm/v3confs/ns-media-schema.conf
+++ b/ldap/cm/v3confs/ns-media-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-news-globopt.conf b/ldap/cm/v3confs/ns-news-globopt.conf
index 9c387d8c..46dd80f7 100644
--- a/ldap/cm/v3confs/ns-news-globopt.conf
+++ b/ldap/cm/v3confs/ns-news-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-news-schema.conf b/ldap/cm/v3confs/ns-news-schema.conf
index 541fb148..9d15c19e 100644
--- a/ldap/cm/v3confs/ns-news-schema.conf
+++ b/ldap/cm/v3confs/ns-news-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-proxy-globopt.conf b/ldap/cm/v3confs/ns-proxy-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v3confs/ns-proxy-globopt.conf
+++ b/ldap/cm/v3confs/ns-proxy-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-proxy-schema.conf b/ldap/cm/v3confs/ns-proxy-schema.conf
index 6cc14784..3151c9c7 100644
--- a/ldap/cm/v3confs/ns-proxy-schema.conf
+++ b/ldap/cm/v3confs/ns-proxy-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-web-globopt.conf b/ldap/cm/v3confs/ns-web-globopt.conf
index 9c387d8c..46dd80f7 100644
--- a/ldap/cm/v3confs/ns-web-globopt.conf
+++ b/ldap/cm/v3confs/ns-web-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-web-schema.conf b/ldap/cm/v3confs/ns-web-schema.conf
index f77ef7f0..3b8b0435 100644
--- a/ldap/cm/v3confs/ns-web-schema.conf
+++ b/ldap/cm/v3confs/ns-web-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/slapd.at.conf b/ldap/cm/v3confs/slapd.at.conf
index 191c8182..5e01e752 100644
--- a/ldap/cm/v3confs/slapd.at.conf
+++ b/ldap/cm/v3confs/slapd.at.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/slapd.oc.conf b/ldap/cm/v3confs/slapd.oc.conf
index f136b3e1..f1d75e7b 100644
--- a/ldap/cm/v3confs/slapd.oc.conf
+++ b/ldap/cm/v3confs/slapd.oc.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/java-object-schema.conf b/ldap/cm/v4confs/40/java-object-schema.conf
index 89bf45b8..7a6c0ef5 100644
--- a/ldap/cm/v4confs/40/java-object-schema.conf
+++ b/ldap/cm/v4confs/40/java-object-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-admin-schema.conf b/ldap/cm/v4confs/40/ns-admin-schema.conf
index 6b4a61dc..3e0acf62 100644
--- a/ldap/cm/v4confs/40/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/40/ns-admin-schema.conf
Binary files differ
diff --git a/ldap/cm/v4confs/40/ns-calendar-globopt.conf b/ldap/cm/v4confs/40/ns-calendar-globopt.conf
index 6b13bb4b..9b49a483 100644
--- a/ldap/cm/v4confs/40/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-calendar-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-calendar-schema.conf b/ldap/cm/v4confs/40/ns-calendar-schema.conf
index a8fd568a..1df0b736 100644
--- a/ldap/cm/v4confs/40/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/40/ns-calendar-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-certificate-globopt.conf b/ldap/cm/v4confs/40/ns-certificate-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/40/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-certificate-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-certificate-schema.conf b/ldap/cm/v4confs/40/ns-certificate-schema.conf
index 13556acd..02efd5a2 100644
--- a/ldap/cm/v4confs/40/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/40/ns-certificate-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-common-schema.conf b/ldap/cm/v4confs/40/ns-common-schema.conf
index db7cec01..f436bacc 100644
--- a/ldap/cm/v4confs/40/ns-common-schema.conf
+++ b/ldap/cm/v4confs/40/ns-common-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-compass-globopt.conf b/ldap/cm/v4confs/40/ns-compass-globopt.conf
index 755c213f..6c56c350 100644
--- a/ldap/cm/v4confs/40/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-compass-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-compass-schema.conf b/ldap/cm/v4confs/40/ns-compass-schema.conf
index d0cd0b0e..52997ea4 100644
--- a/ldap/cm/v4confs/40/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/40/ns-compass-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-cos-schema.conf b/ldap/cm/v4confs/40/ns-cos-schema.conf
index eda5c61d..abea53fd 100644
--- a/ldap/cm/v4confs/40/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/40/ns-cos-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf
index 4225dde9..57e510f5 100644
--- a/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-directory-globopt.conf b/ldap/cm/v4confs/40/ns-directory-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/40/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-directory-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-directory-schema.conf b/ldap/cm/v4confs/40/ns-directory-schema.conf
index 4eccbc7f..ef4ed640 100644
--- a/ldap/cm/v4confs/40/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/40/ns-directory-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-legacy-schema.conf b/ldap/cm/v4confs/40/ns-legacy-schema.conf
index 959e3a6a..5bd96446 100644
--- a/ldap/cm/v4confs/40/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/40/ns-legacy-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-mail-globopt.conf b/ldap/cm/v4confs/40/ns-mail-globopt.conf
index 39c0b7ee..cf392ea4 100644
--- a/ldap/cm/v4confs/40/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-mail-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-mail-schema.conf b/ldap/cm/v4confs/40/ns-mail-schema.conf
index 44dec674..4b816214 100644
--- a/ldap/cm/v4confs/40/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mail-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf
index 2bc864c9..a7e0be55 100644
--- a/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-mcd-config-schema.conf b/ldap/cm/v4confs/40/ns-mcd-config-schema.conf
index 3179c4e0..2eeb6856 100644
--- a/ldap/cm/v4confs/40/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-config-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf
index 3a43c7ca..290c9062 100644
--- a/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-mcd-li-schema.conf b/ldap/cm/v4confs/40/ns-mcd-li-schema.conf
index cae55e82..82034846 100644
--- a/ldap/cm/v4confs/40/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-li-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf
index 9d53bcd5..b232563f 100644
--- a/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-media-globopt.conf b/ldap/cm/v4confs/40/ns-media-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/40/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-media-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-media-schema.conf b/ldap/cm/v4confs/40/ns-media-schema.conf
index c4c43f8a..01b2cf95 100644
--- a/ldap/cm/v4confs/40/ns-media-schema.conf
+++ b/ldap/cm/v4confs/40/ns-media-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-mlm-schema.conf b/ldap/cm/v4confs/40/ns-mlm-schema.conf
index 7dd79c5a..8cd3c379 100644
--- a/ldap/cm/v4confs/40/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mlm-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-msg-schema.conf b/ldap/cm/v4confs/40/ns-msg-schema.conf
index 2d9b055c..5355f3e9 100644
--- a/ldap/cm/v4confs/40/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/40/ns-msg-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-netshare-schema.conf b/ldap/cm/v4confs/40/ns-netshare-schema.conf
index a4d0f862..8a03e929 100644
--- a/ldap/cm/v4confs/40/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/40/ns-netshare-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-news-globopt.conf b/ldap/cm/v4confs/40/ns-news-globopt.conf
index bf0e509b..6f7b2f3b 100644
--- a/ldap/cm/v4confs/40/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-news-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-news-schema.conf b/ldap/cm/v4confs/40/ns-news-schema.conf
index 541fb148..9d15c19e 100644
--- a/ldap/cm/v4confs/40/ns-news-schema.conf
+++ b/ldap/cm/v4confs/40/ns-news-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-proxy-globopt.conf b/ldap/cm/v4confs/40/ns-proxy-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/40/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-proxy-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-proxy-schema.conf b/ldap/cm/v4confs/40/ns-proxy-schema.conf
index 6cc14784..3151c9c7 100644
--- a/ldap/cm/v4confs/40/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/40/ns-proxy-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-value-schema.conf b/ldap/cm/v4confs/40/ns-value-schema.conf
index 587a5f76..a7ee4f3b 100644
--- a/ldap/cm/v4confs/40/ns-value-schema.conf
+++ b/ldap/cm/v4confs/40/ns-value-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-wcal-globopt.conf b/ldap/cm/v4confs/40/ns-wcal-globopt.conf
index 44c190af..9d8ad189 100644
--- a/ldap/cm/v4confs/40/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-wcal-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-wcal-schema.conf b/ldap/cm/v4confs/40/ns-wcal-schema.conf
index 3070f39f..3d4f85d5 100644
--- a/ldap/cm/v4confs/40/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/40/ns-wcal-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-web-globopt.conf b/ldap/cm/v4confs/40/ns-web-globopt.conf
index 1c97535c..6d19f242 100644
--- a/ldap/cm/v4confs/40/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-web-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/ns-web-schema.conf b/ldap/cm/v4confs/40/ns-web-schema.conf
index b2cdca07..08868577 100644
--- a/ldap/cm/v4confs/40/ns-web-schema.conf
+++ b/ldap/cm/v4confs/40/ns-web-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/slapd.at.conf b/ldap/cm/v4confs/40/slapd.at.conf
index dcb658dd..620b1348 100644
--- a/ldap/cm/v4confs/40/slapd.at.conf
+++ b/ldap/cm/v4confs/40/slapd.at.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/40/slapd.oc.conf b/ldap/cm/v4confs/40/slapd.oc.conf
index 5d57606a..a1344708 100644
--- a/ldap/cm/v4confs/40/slapd.oc.conf
+++ b/ldap/cm/v4confs/40/slapd.oc.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/java-object-schema.conf b/ldap/cm/v4confs/41/java-object-schema.conf
index 4fb41d05..da4ee750 100644
--- a/ldap/cm/v4confs/41/java-object-schema.conf
+++ b/ldap/cm/v4confs/41/java-object-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-admin-schema.conf b/ldap/cm/v4confs/41/ns-admin-schema.conf
index f79940f1..73a03cac 100644
--- a/ldap/cm/v4confs/41/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/41/ns-admin-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-calendar-globopt.conf b/ldap/cm/v4confs/41/ns-calendar-globopt.conf
index 6b13bb4b..9b49a483 100644
--- a/ldap/cm/v4confs/41/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-calendar-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-calendar-schema.conf b/ldap/cm/v4confs/41/ns-calendar-schema.conf
index a8fd568a..1df0b736 100644
--- a/ldap/cm/v4confs/41/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/41/ns-calendar-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-certificate-globopt.conf b/ldap/cm/v4confs/41/ns-certificate-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/41/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-certificate-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-certificate-schema.conf b/ldap/cm/v4confs/41/ns-certificate-schema.conf
index 13556acd..02efd5a2 100644
--- a/ldap/cm/v4confs/41/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/41/ns-certificate-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-common-schema.conf b/ldap/cm/v4confs/41/ns-common-schema.conf
index 56abbc24..2cb7e480 100644
--- a/ldap/cm/v4confs/41/ns-common-schema.conf
+++ b/ldap/cm/v4confs/41/ns-common-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-compass-globopt.conf b/ldap/cm/v4confs/41/ns-compass-globopt.conf
index 755c213f..6c56c350 100644
--- a/ldap/cm/v4confs/41/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-compass-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-compass-schema.conf b/ldap/cm/v4confs/41/ns-compass-schema.conf
index d0cd0b0e..52997ea4 100644
--- a/ldap/cm/v4confs/41/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/41/ns-compass-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-cos-schema.conf b/ldap/cm/v4confs/41/ns-cos-schema.conf
index eda5c61d..abea53fd 100644
--- a/ldap/cm/v4confs/41/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/41/ns-cos-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf
index 4225dde9..57e510f5 100644
--- a/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-directory-globopt.conf b/ldap/cm/v4confs/41/ns-directory-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/41/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-directory-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-directory-schema.conf b/ldap/cm/v4confs/41/ns-directory-schema.conf
index 4eccbc7f..ef4ed640 100644
--- a/ldap/cm/v4confs/41/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/41/ns-directory-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-legacy-schema.conf b/ldap/cm/v4confs/41/ns-legacy-schema.conf
index fbfd0c45..43231314 100644
--- a/ldap/cm/v4confs/41/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/41/ns-legacy-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-mail-globopt.conf b/ldap/cm/v4confs/41/ns-mail-globopt.conf
index 39c0b7ee..cf392ea4 100644
--- a/ldap/cm/v4confs/41/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-mail-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-mail-schema.conf b/ldap/cm/v4confs/41/ns-mail-schema.conf
index 115066b5..8cfa0b76 100644
--- a/ldap/cm/v4confs/41/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mail-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf
index 2bc864c9..a7e0be55 100644
--- a/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-mcd-config-schema.conf b/ldap/cm/v4confs/41/ns-mcd-config-schema.conf
index 3179c4e0..2eeb6856 100644
--- a/ldap/cm/v4confs/41/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-config-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf
index 3a43c7ca..290c9062 100644
--- a/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-mcd-li-schema.conf b/ldap/cm/v4confs/41/ns-mcd-li-schema.conf
index cae55e82..82034846 100644
--- a/ldap/cm/v4confs/41/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-li-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf
index 9d53bcd5..b232563f 100644
--- a/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-media-globopt.conf b/ldap/cm/v4confs/41/ns-media-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/41/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-media-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-media-schema.conf b/ldap/cm/v4confs/41/ns-media-schema.conf
index c4c43f8a..01b2cf95 100644
--- a/ldap/cm/v4confs/41/ns-media-schema.conf
+++ b/ldap/cm/v4confs/41/ns-media-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-mlm-schema.conf b/ldap/cm/v4confs/41/ns-mlm-schema.conf
index 293f94fe..bb604b03 100644
--- a/ldap/cm/v4confs/41/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mlm-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-msg-schema.conf b/ldap/cm/v4confs/41/ns-msg-schema.conf
index b8449bc1..25712bf7 100644
--- a/ldap/cm/v4confs/41/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/41/ns-msg-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-netshare-schema.conf b/ldap/cm/v4confs/41/ns-netshare-schema.conf
index a4d0f862..8a03e929 100644
--- a/ldap/cm/v4confs/41/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/41/ns-netshare-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-news-globopt.conf b/ldap/cm/v4confs/41/ns-news-globopt.conf
index bf0e509b..6f7b2f3b 100644
--- a/ldap/cm/v4confs/41/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-news-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-news-schema.conf b/ldap/cm/v4confs/41/ns-news-schema.conf
index 541fb148..9d15c19e 100644
--- a/ldap/cm/v4confs/41/ns-news-schema.conf
+++ b/ldap/cm/v4confs/41/ns-news-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-proxy-globopt.conf b/ldap/cm/v4confs/41/ns-proxy-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/41/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-proxy-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-proxy-schema.conf b/ldap/cm/v4confs/41/ns-proxy-schema.conf
index 6cc14784..3151c9c7 100644
--- a/ldap/cm/v4confs/41/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/41/ns-proxy-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-value-schema.conf b/ldap/cm/v4confs/41/ns-value-schema.conf
index 587a5f76..a7ee4f3b 100644
--- a/ldap/cm/v4confs/41/ns-value-schema.conf
+++ b/ldap/cm/v4confs/41/ns-value-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-wcal-globopt.conf b/ldap/cm/v4confs/41/ns-wcal-globopt.conf
index 44c190af..9d8ad189 100644
--- a/ldap/cm/v4confs/41/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-wcal-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-wcal-schema.conf b/ldap/cm/v4confs/41/ns-wcal-schema.conf
index 3070f39f..3d4f85d5 100644
--- a/ldap/cm/v4confs/41/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/41/ns-wcal-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-web-globopt.conf b/ldap/cm/v4confs/41/ns-web-globopt.conf
index 1c97535c..6d19f242 100644
--- a/ldap/cm/v4confs/41/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-web-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/ns-web-schema.conf b/ldap/cm/v4confs/41/ns-web-schema.conf
index b2cdca07..08868577 100644
--- a/ldap/cm/v4confs/41/ns-web-schema.conf
+++ b/ldap/cm/v4confs/41/ns-web-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/slapd.at.conf b/ldap/cm/v4confs/41/slapd.at.conf
index 538fc5d5..15fcb074 100644
--- a/ldap/cm/v4confs/41/slapd.at.conf
+++ b/ldap/cm/v4confs/41/slapd.at.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/41/slapd.oc.conf b/ldap/cm/v4confs/41/slapd.oc.conf
index 57d0feeb..53ca2e65 100644
--- a/ldap/cm/v4confs/41/slapd.oc.conf
+++ b/ldap/cm/v4confs/41/slapd.oc.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/java-object-schema.conf b/ldap/cm/v4confs/411/java-object-schema.conf
index 89bf45b8..7a6c0ef5 100644
--- a/ldap/cm/v4confs/411/java-object-schema.conf
+++ b/ldap/cm/v4confs/411/java-object-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-admin-schema.conf b/ldap/cm/v4confs/411/ns-admin-schema.conf
index f79940f1..73a03cac 100644
--- a/ldap/cm/v4confs/411/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/411/ns-admin-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-calendar-globopt.conf b/ldap/cm/v4confs/411/ns-calendar-globopt.conf
index 6b13bb4b..9b49a483 100644
--- a/ldap/cm/v4confs/411/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-calendar-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-calendar-schema.conf b/ldap/cm/v4confs/411/ns-calendar-schema.conf
index a8fd568a..1df0b736 100644
--- a/ldap/cm/v4confs/411/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/411/ns-calendar-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-certificate-globopt.conf b/ldap/cm/v4confs/411/ns-certificate-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/411/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-certificate-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-certificate-schema.conf b/ldap/cm/v4confs/411/ns-certificate-schema.conf
index 13556acd..02efd5a2 100644
--- a/ldap/cm/v4confs/411/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/411/ns-certificate-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-common-schema.conf b/ldap/cm/v4confs/411/ns-common-schema.conf
index 56abbc24..2cb7e480 100644
--- a/ldap/cm/v4confs/411/ns-common-schema.conf
+++ b/ldap/cm/v4confs/411/ns-common-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-compass-globopt.conf b/ldap/cm/v4confs/411/ns-compass-globopt.conf
index 755c213f..6c56c350 100644
--- a/ldap/cm/v4confs/411/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-compass-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-compass-schema.conf b/ldap/cm/v4confs/411/ns-compass-schema.conf
index d0cd0b0e..52997ea4 100644
--- a/ldap/cm/v4confs/411/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/411/ns-compass-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-cos-schema.conf b/ldap/cm/v4confs/411/ns-cos-schema.conf
index eda5c61d..abea53fd 100644
--- a/ldap/cm/v4confs/411/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/411/ns-cos-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf
index b339a5fa..0e77ef27 100644
--- a/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-directory-globopt.conf b/ldap/cm/v4confs/411/ns-directory-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/411/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-directory-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-directory-schema.conf b/ldap/cm/v4confs/411/ns-directory-schema.conf
index 4eccbc7f..ef4ed640 100644
--- a/ldap/cm/v4confs/411/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/411/ns-directory-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-legacy-schema.conf b/ldap/cm/v4confs/411/ns-legacy-schema.conf
index fbfd0c45..43231314 100644
--- a/ldap/cm/v4confs/411/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/411/ns-legacy-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-mail-globopt.conf b/ldap/cm/v4confs/411/ns-mail-globopt.conf
index 39c0b7ee..cf392ea4 100644
--- a/ldap/cm/v4confs/411/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-mail-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-mail-schema.conf b/ldap/cm/v4confs/411/ns-mail-schema.conf
index 115066b5..8cfa0b76 100644
--- a/ldap/cm/v4confs/411/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mail-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf
index 2bc864c9..a7e0be55 100644
--- a/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-mcd-config-schema.conf b/ldap/cm/v4confs/411/ns-mcd-config-schema.conf
index 3179c4e0..2eeb6856 100644
--- a/ldap/cm/v4confs/411/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-config-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf
index 3a43c7ca..290c9062 100644
--- a/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-mcd-li-schema.conf b/ldap/cm/v4confs/411/ns-mcd-li-schema.conf
index cae55e82..82034846 100644
--- a/ldap/cm/v4confs/411/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-li-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf
index 9d53bcd5..b232563f 100644
--- a/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-media-globopt.conf b/ldap/cm/v4confs/411/ns-media-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/411/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-media-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-media-schema.conf b/ldap/cm/v4confs/411/ns-media-schema.conf
index c4c43f8a..01b2cf95 100644
--- a/ldap/cm/v4confs/411/ns-media-schema.conf
+++ b/ldap/cm/v4confs/411/ns-media-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-mlm-schema.conf b/ldap/cm/v4confs/411/ns-mlm-schema.conf
index 293f94fe..bb604b03 100644
--- a/ldap/cm/v4confs/411/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mlm-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-msg-schema.conf b/ldap/cm/v4confs/411/ns-msg-schema.conf
index b8449bc1..25712bf7 100644
--- a/ldap/cm/v4confs/411/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/411/ns-msg-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-netshare-schema.conf b/ldap/cm/v4confs/411/ns-netshare-schema.conf
index a4d0f862..8a03e929 100644
--- a/ldap/cm/v4confs/411/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/411/ns-netshare-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-news-globopt.conf b/ldap/cm/v4confs/411/ns-news-globopt.conf
index bf0e509b..6f7b2f3b 100644
--- a/ldap/cm/v4confs/411/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-news-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-news-schema.conf b/ldap/cm/v4confs/411/ns-news-schema.conf
index 541fb148..9d15c19e 100644
--- a/ldap/cm/v4confs/411/ns-news-schema.conf
+++ b/ldap/cm/v4confs/411/ns-news-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-proxy-globopt.conf b/ldap/cm/v4confs/411/ns-proxy-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/411/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-proxy-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-proxy-schema.conf b/ldap/cm/v4confs/411/ns-proxy-schema.conf
index 6cc14784..3151c9c7 100644
--- a/ldap/cm/v4confs/411/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/411/ns-proxy-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-value-schema.conf b/ldap/cm/v4confs/411/ns-value-schema.conf
index 587a5f76..a7ee4f3b 100644
--- a/ldap/cm/v4confs/411/ns-value-schema.conf
+++ b/ldap/cm/v4confs/411/ns-value-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-wcal-globopt.conf b/ldap/cm/v4confs/411/ns-wcal-globopt.conf
index 44c190af..9d8ad189 100644
--- a/ldap/cm/v4confs/411/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-wcal-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-wcal-schema.conf b/ldap/cm/v4confs/411/ns-wcal-schema.conf
index 3070f39f..3d4f85d5 100644
--- a/ldap/cm/v4confs/411/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/411/ns-wcal-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-web-globopt.conf b/ldap/cm/v4confs/411/ns-web-globopt.conf
index 1c97535c..6d19f242 100644
--- a/ldap/cm/v4confs/411/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-web-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/ns-web-schema.conf b/ldap/cm/v4confs/411/ns-web-schema.conf
index b2cdca07..08868577 100644
--- a/ldap/cm/v4confs/411/ns-web-schema.conf
+++ b/ldap/cm/v4confs/411/ns-web-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/slapd.at.conf b/ldap/cm/v4confs/411/slapd.at.conf
index 538fc5d5..15fcb074 100644
--- a/ldap/cm/v4confs/411/slapd.at.conf
+++ b/ldap/cm/v4confs/411/slapd.at.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/411/slapd.oc.conf b/ldap/cm/v4confs/411/slapd.oc.conf
index 57d0feeb..53ca2e65 100644
--- a/ldap/cm/v4confs/411/slapd.oc.conf
+++ b/ldap/cm/v4confs/411/slapd.oc.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/java-object-schema.conf b/ldap/cm/v4confs/412/java-object-schema.conf
index 89bf45b8..7a6c0ef5 100644
--- a/ldap/cm/v4confs/412/java-object-schema.conf
+++ b/ldap/cm/v4confs/412/java-object-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-admin-schema.conf b/ldap/cm/v4confs/412/ns-admin-schema.conf
index f79940f1..73a03cac 100644
--- a/ldap/cm/v4confs/412/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/412/ns-admin-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-calendar-globopt.conf b/ldap/cm/v4confs/412/ns-calendar-globopt.conf
index 6b13bb4b..9b49a483 100644
--- a/ldap/cm/v4confs/412/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-calendar-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-calendar-schema.conf b/ldap/cm/v4confs/412/ns-calendar-schema.conf
index a8fd568a..1df0b736 100644
--- a/ldap/cm/v4confs/412/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/412/ns-calendar-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-certificate-globopt.conf b/ldap/cm/v4confs/412/ns-certificate-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/412/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-certificate-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-certificate-schema.conf b/ldap/cm/v4confs/412/ns-certificate-schema.conf
index 13556acd..02efd5a2 100644
--- a/ldap/cm/v4confs/412/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/412/ns-certificate-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-common-schema.conf b/ldap/cm/v4confs/412/ns-common-schema.conf
index 56abbc24..2cb7e480 100644
--- a/ldap/cm/v4confs/412/ns-common-schema.conf
+++ b/ldap/cm/v4confs/412/ns-common-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-compass-globopt.conf b/ldap/cm/v4confs/412/ns-compass-globopt.conf
index 755c213f..6c56c350 100644
--- a/ldap/cm/v4confs/412/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-compass-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-compass-schema.conf b/ldap/cm/v4confs/412/ns-compass-schema.conf
index d0cd0b0e..52997ea4 100644
--- a/ldap/cm/v4confs/412/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/412/ns-compass-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-cos-schema.conf b/ldap/cm/v4confs/412/ns-cos-schema.conf
index eda5c61d..abea53fd 100644
--- a/ldap/cm/v4confs/412/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/412/ns-cos-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf
index 1bc1d867..97764e52 100644
--- a/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-directory-globopt.conf b/ldap/cm/v4confs/412/ns-directory-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/412/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-directory-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-directory-schema.conf b/ldap/cm/v4confs/412/ns-directory-schema.conf
index 4eccbc7f..ef4ed640 100644
--- a/ldap/cm/v4confs/412/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/412/ns-directory-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-legacy-schema.conf b/ldap/cm/v4confs/412/ns-legacy-schema.conf
index fbfd0c45..43231314 100644
--- a/ldap/cm/v4confs/412/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/412/ns-legacy-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-mail-globopt.conf b/ldap/cm/v4confs/412/ns-mail-globopt.conf
index 39c0b7ee..cf392ea4 100644
--- a/ldap/cm/v4confs/412/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-mail-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-mail-schema.conf b/ldap/cm/v4confs/412/ns-mail-schema.conf
index 115066b5..8cfa0b76 100644
--- a/ldap/cm/v4confs/412/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mail-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf
index 2bc864c9..a7e0be55 100644
--- a/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-mcd-config-schema.conf b/ldap/cm/v4confs/412/ns-mcd-config-schema.conf
index 3179c4e0..2eeb6856 100644
--- a/ldap/cm/v4confs/412/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-config-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf
index 3a43c7ca..290c9062 100644
--- a/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-mcd-li-schema.conf b/ldap/cm/v4confs/412/ns-mcd-li-schema.conf
index cae55e82..82034846 100644
--- a/ldap/cm/v4confs/412/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-li-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf
index 9d53bcd5..b232563f 100644
--- a/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-media-globopt.conf b/ldap/cm/v4confs/412/ns-media-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/412/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-media-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-media-schema.conf b/ldap/cm/v4confs/412/ns-media-schema.conf
index c4c43f8a..01b2cf95 100644
--- a/ldap/cm/v4confs/412/ns-media-schema.conf
+++ b/ldap/cm/v4confs/412/ns-media-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-mlm-schema.conf b/ldap/cm/v4confs/412/ns-mlm-schema.conf
index 293f94fe..bb604b03 100644
--- a/ldap/cm/v4confs/412/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mlm-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-msg-schema.conf b/ldap/cm/v4confs/412/ns-msg-schema.conf
index b8449bc1..25712bf7 100644
--- a/ldap/cm/v4confs/412/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/412/ns-msg-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-netshare-schema.conf b/ldap/cm/v4confs/412/ns-netshare-schema.conf
index a4d0f862..8a03e929 100644
--- a/ldap/cm/v4confs/412/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/412/ns-netshare-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-news-globopt.conf b/ldap/cm/v4confs/412/ns-news-globopt.conf
index bf0e509b..6f7b2f3b 100644
--- a/ldap/cm/v4confs/412/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-news-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-news-schema.conf b/ldap/cm/v4confs/412/ns-news-schema.conf
index 541fb148..9d15c19e 100644
--- a/ldap/cm/v4confs/412/ns-news-schema.conf
+++ b/ldap/cm/v4confs/412/ns-news-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-proxy-globopt.conf b/ldap/cm/v4confs/412/ns-proxy-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v4confs/412/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-proxy-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-proxy-schema.conf b/ldap/cm/v4confs/412/ns-proxy-schema.conf
index 6cc14784..3151c9c7 100644
--- a/ldap/cm/v4confs/412/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/412/ns-proxy-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-value-schema.conf b/ldap/cm/v4confs/412/ns-value-schema.conf
index 587a5f76..a7ee4f3b 100644
--- a/ldap/cm/v4confs/412/ns-value-schema.conf
+++ b/ldap/cm/v4confs/412/ns-value-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-wcal-globopt.conf b/ldap/cm/v4confs/412/ns-wcal-globopt.conf
index 44c190af..9d8ad189 100644
--- a/ldap/cm/v4confs/412/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-wcal-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-wcal-schema.conf b/ldap/cm/v4confs/412/ns-wcal-schema.conf
index 3070f39f..3d4f85d5 100644
--- a/ldap/cm/v4confs/412/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/412/ns-wcal-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-web-globopt.conf b/ldap/cm/v4confs/412/ns-web-globopt.conf
index 1c97535c..6d19f242 100644
--- a/ldap/cm/v4confs/412/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-web-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/ns-web-schema.conf b/ldap/cm/v4confs/412/ns-web-schema.conf
index b2cdca07..08868577 100644
--- a/ldap/cm/v4confs/412/ns-web-schema.conf
+++ b/ldap/cm/v4confs/412/ns-web-schema.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/slapd.at.conf b/ldap/cm/v4confs/412/slapd.at.conf
index fd5fd571..0e7371d1 100644
--- a/ldap/cm/v4confs/412/slapd.at.conf
+++ b/ldap/cm/v4confs/412/slapd.at.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v4confs/412/slapd.oc.conf b/ldap/cm/v4confs/412/slapd.oc.conf
index 57d0feeb..53ca2e65 100644
--- a/ldap/cm/v4confs/412/slapd.oc.conf
+++ b/ldap/cm/v4confs/412/slapd.oc.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/dsml/European.dsml b/ldap/dsml/European.dsml
index 723b7d93..54dd3c79 100644
--- a/ldap/dsml/European.dsml
+++ b/ldap/dsml/European.dsml
@@ -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/dsml/Example-roles.dsml b/ldap/dsml/Example-roles.dsml
index 0c92d3d1..9ac1d772 100644
--- a/ldap/dsml/Example-roles.dsml
+++ b/ldap/dsml/Example-roles.dsml
@@ -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/dsml/Example.dsml b/ldap/dsml/Example.dsml
index a498efd3..44240339 100644
--- a/ldap/dsml/Example.dsml
+++ b/ldap/dsml/Example.dsml
@@ -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/include/Makefile b/ldap/include/Makefile
index 3d0c45b2..92fa38b6 100644
--- a/ldap/include/Makefile
+++ b/ldap/include/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/include/Makefile.client b/ldap/include/Makefile.client
index c6b8fc03..e67eafd1 100644
--- a/ldap/include/Makefile.client
+++ b/ldap/include/Makefile.client
@@ -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/include/avl.h b/ldap/include/avl.h
index bd6e0b32..be0b15db 100644
--- a/ldap/include/avl.h
+++ b/ldap/include/avl.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/include/dblayer.h b/ldap/include/dblayer.h
index 29fa5503..3929b3c0 100644
--- a/ldap/include/dblayer.h
+++ b/ldap/include/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/include/dirlite_strings.h b/ldap/include/dirlite_strings.h
index 11e56978..6089e1b9 100644
--- a/ldap/include/dirlite_strings.h
+++ b/ldap/include/dirlite_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/include/disptmpl.h b/ldap/include/disptmpl.h
index c1eaac46..19198aeb 100644
--- a/ldap/include/disptmpl.h
+++ b/ldap/include/disptmpl.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/include/ldaplog.h b/ldap/include/ldaplog.h
index 730ce6cf..a7e703f9 100644
--- a/ldap/include/ldaplog.h
+++ b/ldap/include/ldaplog.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/include/ldaprot.h b/ldap/include/ldaprot.h
index a3e067e1..1e0bf137 100644
--- a/ldap/include/ldaprot.h
+++ b/ldap/include/ldaprot.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/include/ldbm.h b/ldap/include/ldbm.h
index b8a2da3f..69936d5e 100644
--- a/ldap/include/ldbm.h
+++ b/ldap/include/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/include/ldif.h b/ldap/include/ldif.h
index 734952a9..3f04db83 100644
--- a/ldap/include/ldif.h
+++ b/ldap/include/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/include/litekey.h b/ldap/include/litekey.h
index 8a727451..e8d9b6b1 100644
--- a/ldap/include/litekey.h
+++ b/ldap/include/litekey.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/include/lthread.h b/ldap/include/lthread.h
index 5a67161f..daed6edb 100644
--- a/ldap/include/lthread.h
+++ b/ldap/include/lthread.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/include/ntslapdregparms.h b/ldap/include/ntslapdregparms.h
index 083a27bc..66ef331b 100644
--- a/ldap/include/ntslapdregparms.h
+++ b/ldap/include/ntslapdregparms.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/include/ntwatchdog.h b/ldap/include/ntwatchdog.h
index d1b5d44c..bdb66c01 100644
--- a/ldap/include/ntwatchdog.h
+++ b/ldap/include/ntwatchdog.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/include/portable.h b/ldap/include/portable.h
index 71bdbe70..52a75723 100644
--- a/ldap/include/portable.h
+++ b/ldap/include/portable.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/include/proto-ntutil.h b/ldap/include/proto-ntutil.h
index 19fe4857..49969382 100644
--- a/ldap/include/proto-ntutil.h
+++ b/ldap/include/proto-ntutil.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/include/regex.h b/ldap/include/regex.h
index ebfe128a..1ce0de61 100644
--- a/ldap/include/regex.h
+++ b/ldap/include/regex.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/include/srchpref.h b/ldap/include/srchpref.h
index fb7cf4a5..c14fbe5f 100644
--- a/ldap/include/srchpref.h
+++ b/ldap/include/srchpref.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/include/sysexits-compat.h b/ldap/include/sysexits-compat.h
index c28199ba..11c698c0 100644
--- a/ldap/include/sysexits-compat.h
+++ b/ldap/include/sysexits-compat.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/javarules.mk b/ldap/javarules.mk
index bb7e82cd..2d52d3f2 100644
--- a/ldap/javarules.mk
+++ b/ldap/javarules.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/ldif/Ace.ldif b/ldap/ldif/Ace.ldif
index dbd60d63..528f5ec0 100644
--- a/ldap/ldif/Ace.ldif
+++ b/ldap/ldif/Ace.ldif
@@ -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/ldif/European.ldif b/ldap/ldif/European.ldif
index 1794e51f..83684dd9 100644
--- a/ldap/ldif/European.ldif
+++ b/ldap/ldif/European.ldif
@@ -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/ldif/Eurosuffix.ldif b/ldap/ldif/Eurosuffix.ldif
index 7cc41ab7..b4831c83 100644
--- a/ldap/ldif/Eurosuffix.ldif
+++ b/ldap/ldif/Eurosuffix.ldif
@@ -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/ldif/Example-roles.ldif b/ldap/ldif/Example-roles.ldif
index 9c255e0e..b6dd2d05 100644
--- a/ldap/ldif/Example-roles.ldif
+++ b/ldap/ldif/Example-roles.ldif
@@ -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/ldif/Example-views.ldif b/ldap/ldif/Example-views.ldif
index 09947cab..bcb19c11 100644
--- a/ldap/ldif/Example-views.ldif
+++ b/ldap/ldif/Example-views.ldif
@@ -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/ldif/Example.ldif b/ldap/ldif/Example.ldif
index 3d711e44..84d51f6e 100644
--- a/ldap/ldif/Example.ldif
+++ b/ldap/ldif/Example.ldif
@@ -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/ldif/commonTasks.ldif b/ldap/ldif/commonTasks.ldif
index 130f8ab6..94ef71d7 100644
--- a/ldap/ldif/commonTasks.ldif
+++ b/ldap/ldif/commonTasks.ldif
@@ -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/ldif/roledit.ldif b/ldap/ldif/roledit.ldif
index 247dee73..bdae9a29 100644
--- a/ldap/ldif/roledit.ldif
+++ b/ldap/ldif/roledit.ldif
@@ -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/ldif/tasks.ldif b/ldap/ldif/tasks.ldif
index cf0d5be2..7bd01791 100644
--- a/ldap/ldif/tasks.ldif
+++ b/ldap/ldif/tasks.ldif
@@ -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/ldif/template.ldif b/ldap/ldif/template.ldif
index 74a4c210..e0c54d0b 100644
--- a/ldap/ldif/template.ldif
+++ b/ldap/ldif/template.ldif
@@ -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/libraries/Makefile b/ldap/libraries/Makefile
index 970eaac5..0fd5bd88 100644
--- a/ldap/libraries/Makefile
+++ b/ldap/libraries/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/libraries/Makefile.client b/ldap/libraries/Makefile.client
index 22431f17..38531fa1 100644
--- a/ldap/libraries/Makefile.client
+++ b/ldap/libraries/Makefile.client
@@ -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/libraries/libavl/Makefile b/ldap/libraries/libavl/Makefile
index 25165f1c..e6996719 100644
--- a/ldap/libraries/libavl/Makefile
+++ b/ldap/libraries/libavl/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/libraries/libavl/avl.c b/ldap/libraries/libavl/avl.c
index 9fb75628..e26aab69 100644
--- a/ldap/libraries/libavl/avl.c
+++ b/ldap/libraries/libavl/avl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/libraries/libavl/testavl.c b/ldap/libraries/libavl/testavl.c
index dcda462b..d27df39c 100644
--- a/ldap/libraries/libavl/testavl.c
+++ b/ldap/libraries/libavl/testavl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/libraries/libldif/Makefile b/ldap/libraries/libldif/Makefile
index e2efe536..9509f673 100644
--- a/ldap/libraries/libldif/Makefile
+++ b/ldap/libraries/libldif/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/libraries/libldif/fileurl.c b/ldap/libraries/libldif/fileurl.c
index d635c4bf..55b8ece7 100644
--- a/ldap/libraries/libldif/fileurl.c
+++ b/ldap/libraries/libldif/fileurl.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/libraries/libldif/fileurl.h b/ldap/libraries/libldif/fileurl.h
index 160e49b6..e0acddf9 100644
--- a/ldap/libraries/libldif/fileurl.h
+++ b/ldap/libraries/libldif/fileurl.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/libraries/libldif/line64.c b/ldap/libraries/libldif/line64.c
index de1cc1c0..22adfbef 100644
--- a/ldap/libraries/libldif/line64.c
+++ b/ldap/libraries/libldif/line64.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this 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/libraries/liblitekey/Makefile b/ldap/libraries/liblitekey/Makefile
index 932a8582..7ab5f4c2 100644
--- a/ldap/libraries/liblitekey/Makefile
+++ b/ldap/libraries/liblitekey/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/libraries/liblitekey/keycheck.c b/ldap/libraries/liblitekey/keycheck.c
index a88cc504..b66e6bf0 100644
--- a/ldap/libraries/liblitekey/keycheck.c
+++ b/ldap/libraries/liblitekey/keycheck.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/libraries/libutil/Makefile b/ldap/libraries/libutil/Makefile
index 9bca0d8b..4664f1aa 100644
--- a/ldap/libraries/libutil/Makefile
+++ b/ldap/libraries/libutil/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/libraries/libutil/ntdebug.c b/ldap/libraries/libutil/ntdebug.c
index 7794807c..367ca6b9 100644
--- a/ldap/libraries/libutil/ntdebug.c
+++ b/ldap/libraries/libutil/ntdebug.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/libraries/libutil/ntevent.c b/ldap/libraries/libutil/ntevent.c
index a444ab36..77eb3713 100644
--- a/ldap/libraries/libutil/ntevent.c
+++ b/ldap/libraries/libutil/ntevent.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/libraries/libutil/ntreg.c b/ldap/libraries/libutil/ntreg.c
index 0c134b42..d81446de 100644
--- a/ldap/libraries/libutil/ntreg.c
+++ b/ldap/libraries/libutil/ntreg.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/libraries/libutil/ntresource.h b/ldap/libraries/libutil/ntresource.h
index aa7efb55..173e5476 100644
--- a/ldap/libraries/libutil/ntresource.h
+++ b/ldap/libraries/libutil/ntresource.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/libraries/libutil/ntstubs.c b/ldap/libraries/libutil/ntstubs.c
index 6ce16e18..00238e5e 100644
--- a/ldap/libraries/libutil/ntstubs.c
+++ b/ldap/libraries/libutil/ntstubs.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/nsdeps.mk b/ldap/nsdeps.mk
index 82bcb180..87372fe4 100644
--- a/ldap/nsdeps.mk
+++ b/ldap/nsdeps.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/nsldap.mk b/ldap/nsldap.mk
index 6d62f84e..e3ad1286 100644
--- a/ldap/nsldap.mk
+++ b/ldap/nsldap.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/00core.ldif b/ldap/schema/00core.ldif
index c20a5b05..aae8f2c3 100644
--- a/ldap/schema/00core.ldif
+++ b/ldap/schema/00core.ldif
@@ -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/schema/05rfc2247.ldif b/ldap/schema/05rfc2247.ldif
index 3eb60796..5221266d 100644
--- a/ldap/schema/05rfc2247.ldif
+++ b/ldap/schema/05rfc2247.ldif
@@ -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/schema/05rfc2927.ldif b/ldap/schema/05rfc2927.ldif
index a7da2f23..a9ef2052 100644
--- a/ldap/schema/05rfc2927.ldif
+++ b/ldap/schema/05rfc2927.ldif
@@ -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/schema/10presence.ldif b/ldap/schema/10presence.ldif
index 5fcad281..68b3695c 100644
--- a/ldap/schema/10presence.ldif
+++ b/ldap/schema/10presence.ldif
@@ -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/schema/10rfc2307.ldif b/ldap/schema/10rfc2307.ldif
index cbfdeb46..87710c33 100644
--- a/ldap/schema/10rfc2307.ldif
+++ b/ldap/schema/10rfc2307.ldif
@@ -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/schema/20subscriber.ldif b/ldap/schema/20subscriber.ldif
index ea133393..780332e8 100644
--- a/ldap/schema/20subscriber.ldif
+++ b/ldap/schema/20subscriber.ldif
@@ -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/schema/25java-object.ldif b/ldap/schema/25java-object.ldif
index 985dcee8..f8cc4dbc 100644
--- a/ldap/schema/25java-object.ldif
+++ b/ldap/schema/25java-object.ldif
@@ -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/schema/28pilot.ldif b/ldap/schema/28pilot.ldif
index e8da8ff9..ee90fc9f 100644
--- a/ldap/schema/28pilot.ldif
+++ b/ldap/schema/28pilot.ldif
@@ -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/schema/30ns-common.ldif b/ldap/schema/30ns-common.ldif
index 81d8ad7f..ea48c660 100644
--- a/ldap/schema/30ns-common.ldif
+++ b/ldap/schema/30ns-common.ldif
@@ -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/schema/50ns-admin.ldif b/ldap/schema/50ns-admin.ldif
index 3f6874d1..ec392ae7 100644
--- a/ldap/schema/50ns-admin.ldif
+++ b/ldap/schema/50ns-admin.ldif
@@ -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/schema/50ns-calendar.ldif b/ldap/schema/50ns-calendar.ldif
index a4941a49..a3a054fe 100644
--- a/ldap/schema/50ns-calendar.ldif
+++ b/ldap/schema/50ns-calendar.ldif
@@ -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/schema/50ns-certificate.ldif b/ldap/schema/50ns-certificate.ldif
index 38f7785c..b2fdf1ca 100644
--- a/ldap/schema/50ns-certificate.ldif
+++ b/ldap/schema/50ns-certificate.ldif
@@ -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/schema/50ns-compass.ldif b/ldap/schema/50ns-compass.ldif
index fcd5379b..0b51616e 100644
--- a/ldap/schema/50ns-compass.ldif
+++ b/ldap/schema/50ns-compass.ldif
@@ -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/schema/50ns-delegated-admin.ldif b/ldap/schema/50ns-delegated-admin.ldif
index 780f61a9..d993aad0 100644
--- a/ldap/schema/50ns-delegated-admin.ldif
+++ b/ldap/schema/50ns-delegated-admin.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/schema/50ns-directory.ldif b/ldap/schema/50ns-directory.ldif
index 2e3a94e7..de78d502 100644
--- a/ldap/schema/50ns-directory.ldif
+++ b/ldap/schema/50ns-directory.ldif
@@ -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/schema/50ns-legacy.ldif b/ldap/schema/50ns-legacy.ldif
index 2c25f4e4..20884b57 100644
--- a/ldap/schema/50ns-legacy.ldif
+++ b/ldap/schema/50ns-legacy.ldif
@@ -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/schema/50ns-mail.ldif b/ldap/schema/50ns-mail.ldif
index 945151f2..8d06119c 100644
--- a/ldap/schema/50ns-mail.ldif
+++ b/ldap/schema/50ns-mail.ldif
@@ -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/schema/50ns-mcd-browser.ldif b/ldap/schema/50ns-mcd-browser.ldif
index 0043de95..c0a7dd32 100644
--- a/ldap/schema/50ns-mcd-browser.ldif
+++ b/ldap/schema/50ns-mcd-browser.ldif
@@ -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/schema/50ns-mcd-config.ldif b/ldap/schema/50ns-mcd-config.ldif
index ca5bd322..632bcf1b 100644
--- a/ldap/schema/50ns-mcd-config.ldif
+++ b/ldap/schema/50ns-mcd-config.ldif
@@ -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/schema/50ns-mcd-li.ldif b/ldap/schema/50ns-mcd-li.ldif
index 0fe2e34b..a1aad3c0 100644
--- a/ldap/schema/50ns-mcd-li.ldif
+++ b/ldap/schema/50ns-mcd-li.ldif
@@ -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/schema/50ns-mcd-mail.ldif b/ldap/schema/50ns-mcd-mail.ldif
index a38aa702..61a17024 100644
--- a/ldap/schema/50ns-mcd-mail.ldif
+++ b/ldap/schema/50ns-mcd-mail.ldif
@@ -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/schema/50ns-media.ldif b/ldap/schema/50ns-media.ldif
index cf6ef031..9a0812f7 100644
--- a/ldap/schema/50ns-media.ldif
+++ b/ldap/schema/50ns-media.ldif
@@ -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/schema/50ns-mlm.ldif b/ldap/schema/50ns-mlm.ldif
index e412efed..815872c7 100644
--- a/ldap/schema/50ns-mlm.ldif
+++ b/ldap/schema/50ns-mlm.ldif
@@ -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/schema/50ns-msg.ldif b/ldap/schema/50ns-msg.ldif
index e4911bd7..c3cd7373 100644
--- a/ldap/schema/50ns-msg.ldif
+++ b/ldap/schema/50ns-msg.ldif
@@ -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/schema/50ns-netshare.ldif b/ldap/schema/50ns-netshare.ldif
index cd5b0297..5c58a3ae 100644
--- a/ldap/schema/50ns-netshare.ldif
+++ b/ldap/schema/50ns-netshare.ldif
@@ -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/schema/50ns-news.ldif b/ldap/schema/50ns-news.ldif
index 59d29da5..3267fcd8 100644
--- a/ldap/schema/50ns-news.ldif
+++ b/ldap/schema/50ns-news.ldif
@@ -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/schema/50ns-proxy.ldif b/ldap/schema/50ns-proxy.ldif
index 290eb6e9..ab12d362 100644
--- a/ldap/schema/50ns-proxy.ldif
+++ b/ldap/schema/50ns-proxy.ldif
@@ -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/schema/50ns-value.ldif b/ldap/schema/50ns-value.ldif
index 5308007d..26e9650e 100644
--- a/ldap/schema/50ns-value.ldif
+++ b/ldap/schema/50ns-value.ldif
@@ -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/schema/50ns-wcal.ldif b/ldap/schema/50ns-wcal.ldif
index acf132ff..d4a29411 100644
--- a/ldap/schema/50ns-wcal.ldif
+++ b/ldap/schema/50ns-wcal.ldif
@@ -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/schema/50ns-web.ldif b/ldap/schema/50ns-web.ldif
index 5877c3fd..f7a4d284 100644
--- a/ldap/schema/50ns-web.ldif
+++ b/ldap/schema/50ns-web.ldif
@@ -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/schema/51ns-calendar.ldif b/ldap/schema/51ns-calendar.ldif
index 0cbafa8a..8d6f446e 100644
--- a/ldap/schema/51ns-calendar.ldif
+++ b/ldap/schema/51ns-calendar.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/schema/60pam-plugin.ldif b/ldap/schema/60pam-plugin.ldif
index 6461f46d..b0d67ae6 100644
--- a/ldap/schema/60pam-plugin.ldif
+++ b/ldap/schema/60pam-plugin.ldif
@@ -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/schema/99user.ldif b/ldap/schema/99user.ldif
index afe99e35..c2417f41 100644
--- a/ldap/schema/99user.ldif
+++ b/ldap/schema/99user.ldif
@@ -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/schema/ns-calendar-globopt.conf b/ldap/schema/ns-calendar-globopt.conf
index 716333a3..0968acaf 100644
--- a/ldap/schema/ns-calendar-globopt.conf
+++ b/ldap/schema/ns-calendar-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/ns-certificate-globopt.conf b/ldap/schema/ns-certificate-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/schema/ns-certificate-globopt.conf
+++ b/ldap/schema/ns-certificate-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/ns-compass-globopt.conf b/ldap/schema/ns-compass-globopt.conf
index d174c1d9..4d480cfd 100644
--- a/ldap/schema/ns-compass-globopt.conf
+++ b/ldap/schema/ns-compass-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/ns-directory-globopt.conf b/ldap/schema/ns-directory-globopt.conf
index 807e3adb..e0734d53 100644
--- a/ldap/schema/ns-directory-globopt.conf
+++ b/ldap/schema/ns-directory-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/ns-mail-globopt.conf b/ldap/schema/ns-mail-globopt.conf
index f0c0d2b2..314fdb37 100644
--- a/ldap/schema/ns-mail-globopt.conf
+++ b/ldap/schema/ns-mail-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/ns-mcd-li-globopt.conf b/ldap/schema/ns-mcd-li-globopt.conf
index 3a43c7ca..290c9062 100644
--- a/ldap/schema/ns-mcd-li-globopt.conf
+++ b/ldap/schema/ns-mcd-li-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/ns-media-globopt.conf b/ldap/schema/ns-media-globopt.conf
index 807e3adb..e0734d53 100644
--- a/ldap/schema/ns-media-globopt.conf
+++ b/ldap/schema/ns-media-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/ns-news-globopt.conf b/ldap/schema/ns-news-globopt.conf
index f3b4ea2b..a62e2245 100644
--- a/ldap/schema/ns-news-globopt.conf
+++ b/ldap/schema/ns-news-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/ns-proxy-globopt.conf b/ldap/schema/ns-proxy-globopt.conf
index 807e3adb..e0734d53 100644
--- a/ldap/schema/ns-proxy-globopt.conf
+++ b/ldap/schema/ns-proxy-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/ns-wcal-globopt.conf b/ldap/schema/ns-wcal-globopt.conf
index ada04266..1068f9c3 100644
--- a/ldap/schema/ns-wcal-globopt.conf
+++ b/ldap/schema/ns-wcal-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/ns-web-globopt.conf b/ldap/schema/ns-web-globopt.conf
index 1109bd0d..7ec39395 100644
--- a/ldap/schema/ns-web-globopt.conf
+++ b/ldap/schema/ns-web-globopt.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/schema/slapd-collations.conf b/ldap/schema/slapd-collations.conf
index 993f2707..159c6fde 100644
--- a/ldap/schema/slapd-collations.conf
+++ b/ldap/schema/slapd-collations.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/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.
diff --git a/ldap/synctools/Makefile b/ldap/synctools/Makefile
index e01a5368..1f1283d5 100644
--- a/ldap/synctools/Makefile
+++ b/ldap/synctools/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/synctools/passwordsync/README.txt b/ldap/synctools/passwordsync/README.txt
index d7bb2b15..11658261 100644
--- a/ldap/synctools/passwordsync/README.txt
+++ b/ldap/synctools/passwordsync/README.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) 2005 Red Hat, Inc.
diff --git a/ldap/synctools/passwordsync/build.bat b/ldap/synctools/passwordsync/build.bat
index 8c3bec27..5ffdbc65 100644
--- a/ldap/synctools/passwordsync/build.bat
+++ b/ldap/synctools/passwordsync/build.bat
@@ -27,7 +27,9 @@
@rem // in conjunction with the Program except the Non-GPL Code covered by this
@rem // exception. If you modify this file, you may extend this exception to your
@rem // version of the file, but you are not obligated to do so. If you do not wish to
-@rem // do so, delete this exception statement from your version.
+@rem // provide this exception without modification, you must delete this exception
+@rem // statement from your version and license this file solely under the GPL without
+@rem // exception.
@rem //
@rem //
@rem // Copyright (C) 2005 Red Hat, Inc.
diff --git a/ldap/synctools/passwordsync/passhand.cpp b/ldap/synctools/passwordsync/passhand.cpp
index 714138a3..0a489392 100644
--- a/ldap/synctools/passwordsync/passhand.cpp
+++ b/ldap/synctools/passwordsync/passhand.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) 2005 Red Hat, Inc.
diff --git a/ldap/synctools/passwordsync/passhand.h b/ldap/synctools/passwordsync/passhand.h
index b6d8802a..344e009a 100644
--- a/ldap/synctools/passwordsync/passhand.h
+++ b/ldap/synctools/passwordsync/passhand.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/synctools/passwordsync/passhook/passhook.cpp b/ldap/synctools/passwordsync/passhook/passhook.cpp
index c18f7eb2..f059c538 100644
--- a/ldap/synctools/passwordsync/passhook/passhook.cpp
+++ b/ldap/synctools/passwordsync/passhook/passhook.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) 2005 Red Hat, Inc.
diff --git a/ldap/synctools/passwordsync/passhook/passhook.dep b/ldap/synctools/passwordsync/passhook/passhook.dep
index 5ae79a78..987bdd6d 100644
--- a/ldap/synctools/passwordsync/passhook/passhook.dep
+++ b/ldap/synctools/passwordsync/passhook/passhook.dep
@@ -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/synctools/passwordsync/passhook/passhook.mak b/ldap/synctools/passwordsync/passhook/passhook.mak
index 3fb637a2..a56d7e6d 100644
--- a/ldap/synctools/passwordsync/passhook/passhook.mak
+++ b/ldap/synctools/passwordsync/passhook/passhook.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) 2005 Red Hat, Inc.
diff --git a/ldap/synctools/passwordsync/passsync/dssynch.h b/ldap/synctools/passwordsync/passsync/dssynch.h
index 877c5fb1..6735f6a8 100644
--- a/ldap/synctools/passwordsync/passsync/dssynch.h
+++ b/ldap/synctools/passwordsync/passsync/dssynch.h
@@ -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/synctools/passwordsync/passsync/dssynchmsg.h b/ldap/synctools/passwordsync/passsync/dssynchmsg.h
index f3516adf..f8220442 100644
--- a/ldap/synctools/passwordsync/passsync/dssynchmsg.h
+++ b/ldap/synctools/passwordsync/passsync/dssynchmsg.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/synctools/passwordsync/passsync/ntservice.cpp b/ldap/synctools/passwordsync/passsync/ntservice.cpp
index 2fda335f..1d27592f 100644
--- a/ldap/synctools/passwordsync/passsync/ntservice.cpp
+++ b/ldap/synctools/passwordsync/passsync/ntservice.cpp
@@ -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/synctools/passwordsync/passsync/ntservice.h b/ldap/synctools/passwordsync/passsync/ntservice.h
index b06c3238..eb70ddd1 100644
--- a/ldap/synctools/passwordsync/passsync/ntservice.h
+++ b/ldap/synctools/passwordsync/passsync/ntservice.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/synctools/passwordsync/passsync/resource.h b/ldap/synctools/passwordsync/passsync/resource.h
index 0c54ce07..1644a3c7 100644
--- a/ldap/synctools/passwordsync/passsync/resource.h
+++ b/ldap/synctools/passwordsync/passsync/resource.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/synctools/passwordsync/passsync/service.cpp b/ldap/synctools/passwordsync/passsync/service.cpp
index d26ab650..18efd898 100644
--- a/ldap/synctools/passwordsync/passsync/service.cpp
+++ b/ldap/synctools/passwordsync/passsync/service.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) 2005 Red Hat, Inc.
diff --git a/ldap/synctools/passwordsync/passsync/subuniutil.cpp b/ldap/synctools/passwordsync/passsync/subuniutil.cpp
index a6f2d20b..850d6f8f 100644
--- a/ldap/synctools/passwordsync/passsync/subuniutil.cpp
+++ b/ldap/synctools/passwordsync/passsync/subuniutil.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/synctools/passwordsync/passsync/subuniutil.h b/ldap/synctools/passwordsync/passsync/subuniutil.h
index 241cd5c3..4f0f694c 100644
--- a/ldap/synctools/passwordsync/passsync/subuniutil.h
+++ b/ldap/synctools/passwordsync/passsync/subuniutil.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/synctools/passwordsync/passsync/synchcmds.h b/ldap/synctools/passwordsync/passsync/synchcmds.h
index 96e9397b..cc5c0c8d 100644
--- a/ldap/synctools/passwordsync/passsync/synchcmds.h
+++ b/ldap/synctools/passwordsync/passsync/synchcmds.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/synctools/passwordsync/passsync/syncserv.cpp b/ldap/synctools/passwordsync/passsync/syncserv.cpp
index fa410b85..5fd1ff4f 100644
--- a/ldap/synctools/passwordsync/passsync/syncserv.cpp
+++ b/ldap/synctools/passwordsync/passsync/syncserv.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) 2005 Red Hat, Inc.
diff --git a/ldap/synctools/passwordsync/passsync/syncserv.h b/ldap/synctools/passwordsync/passsync/syncserv.h
index 321ef67f..c072114d 100644
--- a/ldap/synctools/passwordsync/passsync/syncserv.h
+++ b/ldap/synctools/passwordsync/passsync/syncserv.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/synctools/passwordsync/wix/PassSync.wxs b/ldap/synctools/passwordsync/wix/PassSync.wxs
index 578b669e..2a2e1cab 100644
--- a/ldap/synctools/passwordsync/wix/PassSync.wxs
+++ b/ldap/synctools/passwordsync/wix/PassSync.wxs
@@ -3,11 +3,11 @@
This Program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
-
+
This Program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License along with
this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA.
@@ -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/synctools/passwordsync/wix/README.txt b/ldap/synctools/passwordsync/wix/README.txt
index d7bb2b15..11658261 100644
--- a/ldap/synctools/passwordsync/wix/README.txt
+++ b/ldap/synctools/passwordsync/wix/README.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) 2005 Red Hat, Inc.
diff --git a/ldap/systools/Makefile b/ldap/systools/Makefile
index 91a108c1..7e08fdc0 100644
--- a/ldap/systools/Makefile
+++ b/ldap/systools/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/systools/getHPPatches.pl b/ldap/systools/getHPPatches.pl
index e634e47b..9db482f7 100755
--- a/ldap/systools/getHPPatches.pl
+++ b/ldap/systools/getHPPatches.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/systools/getSolPatches.pl b/ldap/systools/getSolPatches.pl
index 60511d77..dfbf03d6 100755
--- a/ldap/systools/getSolPatches.pl
+++ b/ldap/systools/getSolPatches.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/systools/hp_patches.c b/ldap/systools/hp_patches.c
index 5796ceb8..70a2d6bd 100644
--- a/ldap/systools/hp_patches.c
+++ b/ldap/systools/hp_patches.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/systools/idsktune.c b/ldap/systools/idsktune.c
index 2d70f75a..5018ad26 100644
--- a/ldap/systools/idsktune.c
+++ b/ldap/systools/idsktune.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/systools/mergeSolPatches.pl b/ldap/systools/mergeSolPatches.pl
index 748277db..623ef510 100755
--- a/ldap/systools/mergeSolPatches.pl
+++ b/ldap/systools/mergeSolPatches.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/systools/pio.c b/ldap/systools/pio.c
index 71b183ef..3c0b65b1 100644
--- a/ldap/systools/pio.c
+++ b/ldap/systools/pio.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/systools/pio.h b/ldap/systools/pio.h
index 5a4f1fb6..80d65d56 100644
--- a/ldap/systools/pio.h
+++ b/ldap/systools/pio.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/systools/sol_patches.c b/ldap/systools/sol_patches.c
index 9fb3e793..0b41091d 100644
--- a/ldap/systools/sol_patches.c
+++ b/ldap/systools/sol_patches.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/systools/viewcore.c b/ldap/systools/viewcore.c
index 6cddc8d7..adad4638 100644
--- a/ldap/systools/viewcore.c
+++ b/ldap/systools/viewcore.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldapserver.spec.tmpl b/ldapserver.spec.tmpl
index 9d007261..9cbbc59b 100644
--- a/ldapserver.spec.tmpl
+++ b/ldapserver.spec.tmpl
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this 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/lib/base/Makefile b/lib/base/Makefile
index a1dbb984..3a65021b 100644
--- a/lib/base/Makefile
+++ b/lib/base/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/crit.cpp b/lib/base/crit.cpp
index a377c8a9..b4495106 100644
--- a/lib/base/crit.cpp
+++ b/lib/base/crit.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/dns.cpp b/lib/base/dns.cpp
index 9df9ed44..834dcd7f 100644
--- a/lib/base/dns.cpp
+++ b/lib/base/dns.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/dnsdmain.cpp b/lib/base/dnsdmain.cpp
index 443afc6f..c974c2da 100644
--- a/lib/base/dnsdmain.cpp
+++ b/lib/base/dnsdmain.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/ereport.cpp b/lib/base/ereport.cpp
index caf6b270..d05a1b7e 100644
--- a/lib/base/ereport.cpp
+++ b/lib/base/ereport.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/eventlog.cpp b/lib/base/eventlog.cpp
index 5ff62312..b0be1ad0 100644
--- a/lib/base/eventlog.cpp
+++ b/lib/base/eventlog.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/file.cpp b/lib/base/file.cpp
index b5ebde80..7c6028c7 100644
--- a/lib/base/file.cpp
+++ b/lib/base/file.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/fsmutex.cpp b/lib/base/fsmutex.cpp
index 7176ee85..bd4f4357 100644
--- a/lib/base/fsmutex.cpp
+++ b/lib/base/fsmutex.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/lexer.cpp b/lib/base/lexer.cpp
index 767a0483..d5292f0b 100644
--- a/lib/base/lexer.cpp
+++ b/lib/base/lexer.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/lexer_pvt.h b/lib/base/lexer_pvt.h
index 8c303180..528144fd 100644
--- a/lib/base/lexer_pvt.h
+++ b/lib/base/lexer_pvt.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/net.cpp b/lib/base/net.cpp
index 9279f3d3..5c31032b 100644
--- a/lib/base/net.cpp
+++ b/lib/base/net.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/nscperror.c b/lib/base/nscperror.c
index d1e88b9e..8c30a4e0 100644
--- a/lib/base/nscperror.c
+++ b/lib/base/nscperror.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/nterrors.cpp b/lib/base/nterrors.cpp
index 1ffb3fbc..1104515a 100644
--- a/lib/base/nterrors.cpp
+++ b/lib/base/nterrors.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/plist.cpp b/lib/base/plist.cpp
index ca847d62..c2062767 100644
--- a/lib/base/plist.cpp
+++ b/lib/base/plist.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/plist_pvt.h b/lib/base/plist_pvt.h
index 180babaa..e007a7ce 100644
--- a/lib/base/plist_pvt.h
+++ b/lib/base/plist_pvt.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/pool.cpp b/lib/base/pool.cpp
index 126ee3f9..915199c7 100644
--- a/lib/base/pool.cpp
+++ b/lib/base/pool.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/rwlock.cpp b/lib/base/rwlock.cpp
index 67278794..af504a87 100644
--- a/lib/base/rwlock.cpp
+++ b/lib/base/rwlock.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/shexp.cpp b/lib/base/shexp.cpp
index a9b69e05..7b0b2652 100644
--- a/lib/base/shexp.cpp
+++ b/lib/base/shexp.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/system.cpp b/lib/base/system.cpp
index f54e268b..5dde18d8 100644
--- a/lib/base/system.cpp
+++ b/lib/base/system.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/systhr.cpp b/lib/base/systhr.cpp
index 134ae2b4..8bbfc55f 100644
--- a/lib/base/systhr.cpp
+++ b/lib/base/systhr.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/base/util.cpp b/lib/base/util.cpp
index 50f76577..3f4aa766 100644
--- a/lib/base/util.cpp
+++ b/lib/base/util.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/Makefile b/lib/ldaputil/Makefile
index bc029d41..0102d029 100644
--- a/lib/ldaputil/Makefile
+++ b/lib/ldaputil/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/cert.c b/lib/ldaputil/cert.c
index 5dbb9d23..b85f2eb7 100644
--- a/lib/ldaputil/cert.c
+++ b/lib/ldaputil/cert.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/certmap.c b/lib/ldaputil/certmap.c
index e77168c8..952d2116 100644
--- a/lib/ldaputil/certmap.c
+++ b/lib/ldaputil/certmap.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/certmap.conf b/lib/ldaputil/certmap.conf
index 222c87d8..00942071 100644
--- a/lib/ldaputil/certmap.conf
+++ b/lib/ldaputil/certmap.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/dbconf.c b/lib/ldaputil/dbconf.c
index 24db71c1..f507251a 100644
--- a/lib/ldaputil/dbconf.c
+++ b/lib/ldaputil/dbconf.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/encode.c b/lib/ldaputil/encode.c
index 36e52a20..dfc80450 100644
--- a/lib/ldaputil/encode.c
+++ b/lib/ldaputil/encode.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/errors.c b/lib/ldaputil/errors.c
index 820437a0..ef9ae840 100644
--- a/lib/ldaputil/errors.c
+++ b/lib/ldaputil/errors.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/examples/Certmap.mak b/lib/ldaputil/examples/Certmap.mak
index 3418ab9d..bde0f1b3 100644
--- a/lib/ldaputil/examples/Certmap.mak
+++ b/lib/ldaputil/examples/Certmap.mak
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/examples/Makefile b/lib/ldaputil/examples/Makefile
index ee6c5699..7cb7d215 100644
--- a/lib/ldaputil/examples/Makefile
+++ b/lib/ldaputil/examples/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/examples/README b/lib/ldaputil/examples/README
index ca118fbb..ff485810 100644
--- a/lib/ldaputil/examples/README
+++ b/lib/ldaputil/examples/README
@@ -26,7 +26,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/examples/init.c b/lib/ldaputil/examples/init.c
index e505d7fb..4474d3dd 100644
--- a/lib/ldaputil/examples/init.c
+++ b/lib/ldaputil/examples/init.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/examples/plugin.c b/lib/ldaputil/examples/plugin.c
index fa5f10db..8384d34b 100644
--- a/lib/ldaputil/examples/plugin.c
+++ b/lib/ldaputil/examples/plugin.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/examples/plugin.h b/lib/ldaputil/examples/plugin.h
index fe45cce1..ca71595c 100644
--- a/lib/ldaputil/examples/plugin.h
+++ b/lib/ldaputil/examples/plugin.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/init.c b/lib/ldaputil/init.c
index 371d6972..15ed1b20 100644
--- a/lib/ldaputil/init.c
+++ b/lib/ldaputil/init.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/ldapauth.c b/lib/ldaputil/ldapauth.c
index d03f1548..40ee9e77 100644
--- a/lib/ldaputil/ldapauth.c
+++ b/lib/ldaputil/ldapauth.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/ldapdb.c b/lib/ldaputil/ldapdb.c
index 9f75a3b1..4b046418 100644
--- a/lib/ldaputil/ldapdb.c
+++ b/lib/ldaputil/ldapdb.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/ldapu-changes.html b/lib/ldaputil/ldapu-changes.html
index 21637046..6bf12590 100644
--- a/lib/ldaputil/ldapu-changes.html
+++ b/lib/ldaputil/ldapu-changes.html
@@ -26,7 +26,9 @@
in conjunction with the Program except the Non-GPL Code covered by this
exception. If you modify this file, you may extend this exception to your
version of the file, but you are not obligated to do so. If you do not wish to
- do so, delete this exception statement from your version.
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/ldaputili.h b/lib/ldaputil/ldaputili.h
index 99bc74b7..937d13c3 100644
--- a/lib/ldaputil/ldaputili.h
+++ b/lib/ldaputil/ldaputili.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/utest/Makefile b/lib/ldaputil/utest/Makefile
index 78a9739f..2f976af8 100644
--- a/lib/ldaputil/utest/Makefile
+++ b/lib/ldaputil/utest/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/utest/auth.cpp b/lib/ldaputil/utest/auth.cpp
index 60b45bc8..64972aa8 100644
--- a/lib/ldaputil/utest/auth.cpp
+++ b/lib/ldaputil/utest/auth.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/utest/authtest b/lib/ldaputil/utest/authtest
index 98773356..055a4713 100755
--- a/lib/ldaputil/utest/authtest
+++ b/lib/ldaputil/utest/authtest
@@ -28,7 +28,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/utest/certmap.conf b/lib/ldaputil/utest/certmap.conf
index de7d5e53..248b6099 100644
--- a/lib/ldaputil/utest/certmap.conf
+++ b/lib/ldaputil/utest/certmap.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/utest/dblist.conf b/lib/ldaputil/utest/dblist.conf
index 345788a6..a7ed9858 100644
--- a/lib/ldaputil/utest/dblist.conf
+++ b/lib/ldaputil/utest/dblist.conf
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/utest/example.c b/lib/ldaputil/utest/example.c
index 355eff5b..c1d5d6db 100644
--- a/lib/ldaputil/utest/example.c
+++ b/lib/ldaputil/utest/example.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/utest/plugin.c b/lib/ldaputil/utest/plugin.c
index f1be6e82..d46d8118 100644
--- a/lib/ldaputil/utest/plugin.c
+++ b/lib/ldaputil/utest/plugin.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/utest/plugin.h b/lib/ldaputil/utest/plugin.h
index 61e1cfa7..f2cf714e 100644
--- a/lib/ldaputil/utest/plugin.h
+++ b/lib/ldaputil/utest/plugin.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/utest/stubs.c b/lib/ldaputil/utest/stubs.c
index 141841ea..a612c865 100644
--- a/lib/ldaputil/utest/stubs.c
+++ b/lib/ldaputil/utest/stubs.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/utest/stubs.cpp b/lib/ldaputil/utest/stubs.cpp
index 9f367a3a..69dc2300 100644
--- a/lib/ldaputil/utest/stubs.cpp
+++ b/lib/ldaputil/utest/stubs.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/utest/test.ref b/lib/ldaputil/utest/test.ref
index 9db0732b..8f621df6 100644
--- a/lib/ldaputil/utest/test.ref
+++ b/lib/ldaputil/utest/test.ref
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/ldaputil/vtable.c b/lib/ldaputil/vtable.c
index 0d66cccd..3aaa7ec0 100644
--- a/lib/ldaputil/vtable.c
+++ b/lib/ldaputil/vtable.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/Makefile b/lib/libaccess/Makefile
index 6f423cc7..37a7578a 100644
--- a/lib/libaccess/Makefile
+++ b/lib/libaccess/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/access_plhash.cpp b/lib/libaccess/access_plhash.cpp
index 4d78336b..d767bf92 100644
--- a/lib/libaccess/access_plhash.cpp
+++ b/lib/libaccess/access_plhash.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/access_plhash.h b/lib/libaccess/access_plhash.h
index 772f5a2b..9712db78 100644
--- a/lib/libaccess/access_plhash.h
+++ b/lib/libaccess/access_plhash.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/acl.tab.cpp b/lib/libaccess/acl.tab.cpp
index 2c8f42c7..9f66edcf 100644
--- a/lib/libaccess/acl.tab.cpp
+++ b/lib/libaccess/acl.tab.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/acl.tab.h b/lib/libaccess/acl.tab.h
index d114d78d..ba277c38 100644
--- a/lib/libaccess/acl.tab.h
+++ b/lib/libaccess/acl.tab.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/acl.yy.cpp b/lib/libaccess/acl.yy.cpp
index abcd2a9a..9ea95ac5 100644
--- a/lib/libaccess/acl.yy.cpp
+++ b/lib/libaccess/acl.yy.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/aclcache.cpp b/lib/libaccess/aclcache.cpp
index 460c7e83..da467cc7 100644
--- a/lib/libaccess/aclcache.cpp
+++ b/lib/libaccess/aclcache.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/aclcache.h b/lib/libaccess/aclcache.h
index 49618f22..d4f73d24 100644
--- a/lib/libaccess/aclcache.h
+++ b/lib/libaccess/aclcache.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/aclerror.cpp b/lib/libaccess/aclerror.cpp
index 615728b4..813dbbfe 100644
--- a/lib/libaccess/aclerror.cpp
+++ b/lib/libaccess/aclerror.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/acleval.cpp b/lib/libaccess/acleval.cpp
index 86b92746..bc5ae71c 100644
--- a/lib/libaccess/acleval.cpp
+++ b/lib/libaccess/acleval.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/aclflush.cpp b/lib/libaccess/aclflush.cpp
index 80d3a9f7..7f34a307 100644
--- a/lib/libaccess/aclflush.cpp
+++ b/lib/libaccess/aclflush.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/aclpriv.h b/lib/libaccess/aclpriv.h
index ba001321..f4e9b78a 100644
--- a/lib/libaccess/aclpriv.h
+++ b/lib/libaccess/aclpriv.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/aclscan.h b/lib/libaccess/aclscan.h
index 6e6b2ab5..e453a1a9 100644
--- a/lib/libaccess/aclscan.h
+++ b/lib/libaccess/aclscan.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/aclscan.l b/lib/libaccess/aclscan.l
index 5bd4e3f7..671e760a 100644
--- a/lib/libaccess/aclscan.l
+++ b/lib/libaccess/aclscan.l
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/aclspace.cpp b/lib/libaccess/aclspace.cpp
index c3aa05c9..b7f05972 100644
--- a/lib/libaccess/aclspace.cpp
+++ b/lib/libaccess/aclspace.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/acltext.y b/lib/libaccess/acltext.y
index 96d31911..368e7ad5 100644
--- a/lib/libaccess/acltext.y
+++ b/lib/libaccess/acltext.y
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/acltools.cpp b/lib/libaccess/acltools.cpp
index 1ad359ae..7f96bedf 100644
--- a/lib/libaccess/acltools.cpp
+++ b/lib/libaccess/acltools.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/aclutil.cpp b/lib/libaccess/aclutil.cpp
index 58fdba9c..0d14f96e 100644
--- a/lib/libaccess/aclutil.cpp
+++ b/lib/libaccess/aclutil.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/aclutil.h b/lib/libaccess/aclutil.h
index fd389a0a..4dd0124b 100644
--- a/lib/libaccess/aclutil.h
+++ b/lib/libaccess/aclutil.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/authdb.cpp b/lib/libaccess/authdb.cpp
index 12368330..d87703f2 100644
--- a/lib/libaccess/authdb.cpp
+++ b/lib/libaccess/authdb.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/las.h b/lib/libaccess/las.h
index be2b06b6..94ceddfc 100644
--- a/lib/libaccess/las.h
+++ b/lib/libaccess/las.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/lasdns.cpp b/lib/libaccess/lasdns.cpp
index a4ad5933..6b2c4a12 100644
--- a/lib/libaccess/lasdns.cpp
+++ b/lib/libaccess/lasdns.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/lasdns.h b/lib/libaccess/lasdns.h
index 74f38ce0..83967b75 100644
--- a/lib/libaccess/lasdns.h
+++ b/lib/libaccess/lasdns.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/lasgroup.cpp b/lib/libaccess/lasgroup.cpp
index 0349b9e3..f5d7288f 100644
--- a/lib/libaccess/lasgroup.cpp
+++ b/lib/libaccess/lasgroup.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/lasip.cpp b/lib/libaccess/lasip.cpp
index 574d2f0e..3e2ae56a 100644
--- a/lib/libaccess/lasip.cpp
+++ b/lib/libaccess/lasip.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/lasip.h b/lib/libaccess/lasip.h
index 4d1103b5..c3815794 100644
--- a/lib/libaccess/lasip.h
+++ b/lib/libaccess/lasip.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/lastod.cpp b/lib/libaccess/lastod.cpp
index 226b201a..4236b2cc 100644
--- a/lib/libaccess/lastod.cpp
+++ b/lib/libaccess/lastod.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/lasuser.cpp b/lib/libaccess/lasuser.cpp
index 5b20e2b8..eaff4810 100644
--- a/lib/libaccess/lasuser.cpp
+++ b/lib/libaccess/lasuser.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/ldapacl.cpp b/lib/libaccess/ldapacl.cpp
index d4176a96..bbff3f98 100644
--- a/lib/libaccess/ldapacl.cpp
+++ b/lib/libaccess/ldapacl.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/ldapauth.h b/lib/libaccess/ldapauth.h
index 62933cb6..62db6f73 100644
--- a/lib/libaccess/ldapauth.h
+++ b/lib/libaccess/ldapauth.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/method.cpp b/lib/libaccess/method.cpp
index 37a62673..64924847 100644
--- a/lib/libaccess/method.cpp
+++ b/lib/libaccess/method.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/nsautherr.cpp b/lib/libaccess/nsautherr.cpp
index b5c9be18..1f491fdd 100644
--- a/lib/libaccess/nsautherr.cpp
+++ b/lib/libaccess/nsautherr.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/nseframe.cpp b/lib/libaccess/nseframe.cpp
index 1e1e26d0..ee918b5c 100644
--- a/lib/libaccess/nseframe.cpp
+++ b/lib/libaccess/nseframe.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/oneeval.cpp b/lib/libaccess/oneeval.cpp
index 023fc606..9f8cdaaa 100644
--- a/lib/libaccess/oneeval.cpp
+++ b/lib/libaccess/oneeval.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/oneeval.h b/lib/libaccess/oneeval.h
index 4142e4d0..9b433e20 100644
--- a/lib/libaccess/oneeval.h
+++ b/lib/libaccess/oneeval.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/parse.h b/lib/libaccess/parse.h
index b85c041a..e5b92b8f 100644
--- a/lib/libaccess/parse.h
+++ b/lib/libaccess/parse.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/permhash.h b/lib/libaccess/permhash.h
index 85fc5da4..0fa31885 100644
--- a/lib/libaccess/permhash.h
+++ b/lib/libaccess/permhash.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/register.cpp b/lib/libaccess/register.cpp
index 129b1b35..aae5597c 100644
--- a/lib/libaccess/register.cpp
+++ b/lib/libaccess/register.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/symbols.cpp b/lib/libaccess/symbols.cpp
index ac03f4ca..09a3c6d8 100644
--- a/lib/libaccess/symbols.cpp
+++ b/lib/libaccess/symbols.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/usi.cpp b/lib/libaccess/usi.cpp
index 7a97a34c..361f20d3 100644
--- a/lib/libaccess/usi.cpp
+++ b/lib/libaccess/usi.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/usrcache.cpp b/lib/libaccess/usrcache.cpp
index 46eff750..f6f337b8 100644
--- a/lib/libaccess/usrcache.cpp
+++ b/lib/libaccess/usrcache.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/Makefile b/lib/libaccess/utest/Makefile
index 0f63fe1d..81a0eb70 100644
--- a/lib/libaccess/utest/Makefile
+++ b/lib/libaccess/utest/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/acl.dat b/lib/libaccess/utest/acl.dat
index f0338534..00f612d7 100644
--- a/lib/libaccess/utest/acl.dat
+++ b/lib/libaccess/utest/acl.dat
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile0 b/lib/libaccess/utest/aclfile0
index 932052a1..248e245b 100644
--- a/lib/libaccess/utest/aclfile0
+++ b/lib/libaccess/utest/aclfile0
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile1 b/lib/libaccess/utest/aclfile1
index fc14e53f..314ae094 100644
--- a/lib/libaccess/utest/aclfile1
+++ b/lib/libaccess/utest/aclfile1
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile10 b/lib/libaccess/utest/aclfile10
index 84477850..4d78bbc1 100644
--- a/lib/libaccess/utest/aclfile10
+++ b/lib/libaccess/utest/aclfile10
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile11 b/lib/libaccess/utest/aclfile11
index 78881781..16376bb3 100644
--- a/lib/libaccess/utest/aclfile11
+++ b/lib/libaccess/utest/aclfile11
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile12 b/lib/libaccess/utest/aclfile12
index acd40aeb..0a4c2adb 100644
--- a/lib/libaccess/utest/aclfile12
+++ b/lib/libaccess/utest/aclfile12
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile13 b/lib/libaccess/utest/aclfile13
index 028063e4..0fbce619 100644
--- a/lib/libaccess/utest/aclfile13
+++ b/lib/libaccess/utest/aclfile13
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile14 b/lib/libaccess/utest/aclfile14
index ee7964d7..7ed043d2 100644
--- a/lib/libaccess/utest/aclfile14
+++ b/lib/libaccess/utest/aclfile14
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile15 b/lib/libaccess/utest/aclfile15
index f633f721..b2dd641b 100644
--- a/lib/libaccess/utest/aclfile15
+++ b/lib/libaccess/utest/aclfile15
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile16 b/lib/libaccess/utest/aclfile16
index d1dea3bb..1f837b12 100644
--- a/lib/libaccess/utest/aclfile16
+++ b/lib/libaccess/utest/aclfile16
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile17 b/lib/libaccess/utest/aclfile17
index 8d085855..42901016 100644
--- a/lib/libaccess/utest/aclfile17
+++ b/lib/libaccess/utest/aclfile17
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile18 b/lib/libaccess/utest/aclfile18
index 1d83aa0b..1d0445d2 100644
--- a/lib/libaccess/utest/aclfile18
+++ b/lib/libaccess/utest/aclfile18
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile19 b/lib/libaccess/utest/aclfile19
index 559ceafc..f637c17f 100644
--- a/lib/libaccess/utest/aclfile19
+++ b/lib/libaccess/utest/aclfile19
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile2 b/lib/libaccess/utest/aclfile2
index 46b4d3b8..a4424310 100644
--- a/lib/libaccess/utest/aclfile2
+++ b/lib/libaccess/utest/aclfile2
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile3 b/lib/libaccess/utest/aclfile3
index 6eb3c6fa..957072e5 100644
--- a/lib/libaccess/utest/aclfile3
+++ b/lib/libaccess/utest/aclfile3
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile4 b/lib/libaccess/utest/aclfile4
index 2ee7c58e..aa373b34 100644
--- a/lib/libaccess/utest/aclfile4
+++ b/lib/libaccess/utest/aclfile4
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile5 b/lib/libaccess/utest/aclfile5
index 8fab381e..10de6a52 100644
--- a/lib/libaccess/utest/aclfile5
+++ b/lib/libaccess/utest/aclfile5
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile6 b/lib/libaccess/utest/aclfile6
index f8fefcfe..cc3cb7aa 100644
--- a/lib/libaccess/utest/aclfile6
+++ b/lib/libaccess/utest/aclfile6
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile7 b/lib/libaccess/utest/aclfile7
index 0b809504..1c89664c 100644
--- a/lib/libaccess/utest/aclfile7
+++ b/lib/libaccess/utest/aclfile7
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile8 b/lib/libaccess/utest/aclfile8
index c67689f7..e44ff8fc 100644
--- a/lib/libaccess/utest/aclfile8
+++ b/lib/libaccess/utest/aclfile8
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclfile9 b/lib/libaccess/utest/aclfile9
index 1aa4ff84..753fdee0 100644
--- a/lib/libaccess/utest/aclfile9
+++ b/lib/libaccess/utest/aclfile9
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclgrp0 b/lib/libaccess/utest/aclgrp0
index 86ecb985..da6012c4 100644
--- a/lib/libaccess/utest/aclgrp0
+++ b/lib/libaccess/utest/aclgrp0
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclgrp1 b/lib/libaccess/utest/aclgrp1
index 109f1978..e877794f 100644
--- a/lib/libaccess/utest/aclgrp1
+++ b/lib/libaccess/utest/aclgrp1
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclgrp2 b/lib/libaccess/utest/aclgrp2
index eb2765dc..f799ef0b 100644
--- a/lib/libaccess/utest/aclgrp2
+++ b/lib/libaccess/utest/aclgrp2
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclgrp3 b/lib/libaccess/utest/aclgrp3
index 4da77f59..7ad63041 100644
--- a/lib/libaccess/utest/aclgrp3
+++ b/lib/libaccess/utest/aclgrp3
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/aclgrp4 b/lib/libaccess/utest/aclgrp4
index 75e20828..e726f3bd 100644
--- a/lib/libaccess/utest/aclgrp4
+++ b/lib/libaccess/utest/aclgrp4
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/acltest.cpp b/lib/libaccess/utest/acltest.cpp
index 713be4c5..6aafd87a 100644
--- a/lib/libaccess/utest/acltest.cpp
+++ b/lib/libaccess/utest/acltest.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/lasemail.cpp b/lib/libaccess/utest/lasemail.cpp
index e741ce0b..2fdde176 100644
--- a/lib/libaccess/utest/lasemail.cpp
+++ b/lib/libaccess/utest/lasemail.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/onetest.cpp b/lib/libaccess/utest/onetest.cpp
index 82eccdd5..e052f3be 100644
--- a/lib/libaccess/utest/onetest.cpp
+++ b/lib/libaccess/utest/onetest.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/shexp.cpp b/lib/libaccess/utest/shexp.cpp
index 79d2e6f2..601ce41c 100644
--- a/lib/libaccess/utest/shexp.cpp
+++ b/lib/libaccess/utest/shexp.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/shexp.h b/lib/libaccess/utest/shexp.h
index 5397d3dd..2cad1ca5 100644
--- a/lib/libaccess/utest/shexp.h
+++ b/lib/libaccess/utest/shexp.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/testmain.cpp b/lib/libaccess/utest/testmain.cpp
index 641eff84..e13efd9b 100644
--- a/lib/libaccess/utest/testmain.cpp
+++ b/lib/libaccess/utest/testmain.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/twotest.cpp b/lib/libaccess/utest/twotest.cpp
index a94277f5..3247856f 100644
--- a/lib/libaccess/utest/twotest.cpp
+++ b/lib/libaccess/utest/twotest.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/utest/ustubs.cpp b/lib/libaccess/utest/ustubs.cpp
index 65214585..5e6ab4f7 100644
--- a/lib/libaccess/utest/ustubs.cpp
+++ b/lib/libaccess/utest/ustubs.cpp
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libaccess/yy-sed b/lib/libaccess/yy-sed
index 902cd6f1..e33445d1 100644
--- a/lib/libaccess/yy-sed
+++ b/lib/libaccess/yy-sed
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libadmin/Makefile b/lib/libadmin/Makefile
index b0a8ea06..83f2471b 100644
--- a/lib/libadmin/Makefile
+++ b/lib/libadmin/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libadmin/authdb.c b/lib/libadmin/authdb.c
index 2b9fb78c..2256b25d 100644
--- a/lib/libadmin/authdb.c
+++ b/lib/libadmin/authdb.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libadmin/error.c b/lib/libadmin/error.c
index 90065aab..f6e0a3cd 100644
--- a/lib/libadmin/error.c
+++ b/lib/libadmin/error.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libadmin/template.c b/lib/libadmin/template.c
index 0df28226..630e41a9 100644
--- a/lib/libadmin/template.c
+++ b/lib/libadmin/template.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libadmin/util.c b/lib/libadmin/util.c
index ffd813af..28327d2d 100644
--- a/lib/libadmin/util.c
+++ b/lib/libadmin/util.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libnt/Makefile b/lib/libnt/Makefile
index b9bc650a..b43797be 100644
--- a/lib/libnt/Makefile
+++ b/lib/libnt/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libnt/info.c b/lib/libnt/info.c
index 7da1b4ab..a2fcfeb7 100644
--- a/lib/libnt/info.c
+++ b/lib/libnt/info.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libnt/path.c b/lib/libnt/path.c
index 153f3704..b2ba34c4 100644
--- a/lib/libnt/path.c
+++ b/lib/libnt/path.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libnt/pmddeml.c b/lib/libnt/pmddeml.c
index eb3a3dee..aac29528 100644
--- a/lib/libnt/pmddeml.c
+++ b/lib/libnt/pmddeml.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libnt/registry.c b/lib/libnt/registry.c
index d5aa2b6a..04b4ab6e 100644
--- a/lib/libnt/registry.c
+++ b/lib/libnt/registry.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libnt/service.c b/lib/libnt/service.c
index 3768e14d..f193c543 100644
--- a/lib/libnt/service.c
+++ b/lib/libnt/service.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libnt/tcpip.c b/lib/libnt/tcpip.c
index 23e061cb..70cb8dd4 100644
--- a/lib/libnt/tcpip.c
+++ b/lib/libnt/tcpip.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/Makefile b/lib/libsi18n/Makefile
index 59883efd..d9432314 100644
--- a/lib/libsi18n/Makefile
+++ b/lib/libsi18n/Makefile
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/acclanglist.c b/lib/libsi18n/acclanglist.c
index fec4980e..1fd4f15f 100644
--- a/lib/libsi18n/acclanglist.c
+++ b/lib/libsi18n/acclanglist.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/coreres.c b/lib/libsi18n/coreres.c
index 1e4f7e76..4a05c5f9 100644
--- a/lib/libsi18n/coreres.c
+++ b/lib/libsi18n/coreres.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/coreres.h b/lib/libsi18n/coreres.h
index 9d793f2d..1dbc02c2 100644
--- a/lib/libsi18n/coreres.h
+++ b/lib/libsi18n/coreres.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/getlang.c b/lib/libsi18n/getlang.c
index ac544524..ff9ab5b1 100644
--- a/lib/libsi18n/getlang.c
+++ b/lib/libsi18n/getlang.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/getstrmem.c b/lib/libsi18n/getstrmem.c
index ae27fd5b..f1d52dd5 100644
--- a/lib/libsi18n/getstrmem.c
+++ b/lib/libsi18n/getstrmem.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/getstrmem.h b/lib/libsi18n/getstrmem.h
index f7e2c99d..5cfe9671 100644
--- a/lib/libsi18n/getstrmem.h
+++ b/lib/libsi18n/getstrmem.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/getstrprop.c b/lib/libsi18n/getstrprop.c
index ca99bb28..45870652 100644
--- a/lib/libsi18n/getstrprop.c
+++ b/lib/libsi18n/getstrprop.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/gsslapd.h b/lib/libsi18n/gsslapd.h
index 7631becb..d6a0afbb 100644
--- a/lib/libsi18n/gsslapd.h
+++ b/lib/libsi18n/gsslapd.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/makstrdb.c b/lib/libsi18n/makstrdb.c
index 58308423..4669a79c 100644
--- a/lib/libsi18n/makstrdb.c
+++ b/lib/libsi18n/makstrdb.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/propset.c b/lib/libsi18n/propset.c
index ca75176f..c8589d1e 100644
--- a/lib/libsi18n/propset.c
+++ b/lib/libsi18n/propset.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/propset.h b/lib/libsi18n/propset.h
index bbbbd5fc..97421ec3 100644
--- a/lib/libsi18n/propset.h
+++ b/lib/libsi18n/propset.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/reshash.c b/lib/libsi18n/reshash.c
index 8a331b41..eefb87b6 100644
--- a/lib/libsi18n/reshash.c
+++ b/lib/libsi18n/reshash.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/reshash.h b/lib/libsi18n/reshash.h
index 672ec32f..1edf4163 100644
--- a/lib/libsi18n/reshash.h
+++ b/lib/libsi18n/reshash.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/txtfile.c b/lib/libsi18n/txtfile.c
index 6daf5998..79549a6e 100644
--- a/lib/libsi18n/txtfile.c
+++ b/lib/libsi18n/txtfile.c
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/lib/libsi18n/txtfile.h b/lib/libsi18n/txtfile.h
index 0afc1c0a..eac4f41f 100644
--- a/lib/libsi18n/txtfile.h
+++ b/lib/libsi18n/txtfile.h
@@ -26,7 +26,9 @@
* in conjunction with the Program except the Non-GPL Code covered by this
* exception. If you modify this file, you may extend this exception to your
* version of the file, but you are not obligated to do so. If you do not wish to
- * do so, delete this exception statement from your version.
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
*
*
* Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/modules.awk b/modules.awk
index e04400e6..40bf55aa 100644
--- a/modules.awk
+++ b/modules.awk
@@ -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/modules.sh b/modules.sh
index 38007154..da334070 100644
--- a/modules.sh
+++ b/modules.sh
@@ -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/ns_usepurify.mk b/ns_usepurify.mk
index 6b577873..f8af5e48 100644
--- a/ns_usepurify.mk
+++ b/ns_usepurify.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ns_usequantify.mk b/ns_usequantify.mk
index 6ffca277..d228c04a 100644
--- a/ns_usequantify.mk
+++ b/ns_usequantify.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2005 Red Hat, Inc.
diff --git a/ns_usesh.mk b/ns_usesh.mk
index abec777e..1735acc8 100644
--- a/ns_usesh.mk
+++ b/ns_usesh.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/nsarch b/nsarch
index 332ea0b0..ae5d6f92 100755
--- a/nsarch
+++ b/nsarch
@@ -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/nsarch.bat b/nsarch.bat
index 3ca34120..2fc3704f 100644
--- a/nsarch.bat
+++ b/nsarch.bat
@@ -27,7 +27,9 @@
@rem // in conjunction with the Program except the Non-GPL Code covered by this
@rem // exception. If you modify this file, you may extend this exception to your
@rem // version of the file, but you are not obligated to do so. If you do not wish to
-@rem // do so, delete this exception statement from your version.
+@rem // provide this exception without modification, you must delete this exception
+@rem // statement from your version and license this file solely under the GPL without
+@rem // exception.
@rem //
@rem //
@rem // Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/nsconfig.mk b/nsconfig.mk
index 3cfcaac5..ab6c45e2 100644
--- a/nsconfig.mk
+++ b/nsconfig.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/nscore.mk b/nscore.mk
index feacd08e..77176109 100644
--- a/nscore.mk
+++ b/nscore.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/nsdefs.mk b/nsdefs.mk
index cbd3ce0f..abc53ec7 100644
--- a/nsdefs.mk
+++ b/nsdefs.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/nsperl.mk b/nsperl.mk
index a5c9c443..adbbf3e8 100755
--- a/nsperl.mk
+++ b/nsperl.mk
@@ -27,7 +27,9 @@
# in conjunction with the Program except the Non-GPL Code covered by this
# exception. If you modify this file, you may extend this exception to your
# version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version.
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
#
#
# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ntversion.pl b/ntversion.pl
index f5cc3da6..63505283 100644
--- a/ntversion.pl
+++ b/ntversion.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/pumpkin.pl b/pumpkin.pl
index bcd89325..32154e5b 100644
--- a/pumpkin.pl
+++ b/pumpkin.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.