summaryrefslogtreecommitdiffstats
path: root/ldap/servers/slapd
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2005-02-28 23:38:10 +0000
committerNathan Kinder <nkinder@redhat.com>2005-02-28 23:38:10 +0000
commit606a96781b8bd30ff8331d04c7eed86c3963f7e7 (patch)
tree766abc6a2ad7be5aaf1bd4a894dd45748ca445e6 /ldap/servers/slapd
parent791b7e016853125fc759ee750959e6ce121533c0 (diff)
downloadds-606a96781b8bd30ff8331d04c7eed86c3963f7e7.tar.gz
ds-606a96781b8bd30ff8331d04c7eed86c3963f7e7.tar.xz
ds-606a96781b8bd30ff8331d04c7eed86c3963f7e7.zip
149951 - Updated source code copyrights
Diffstat (limited to 'ldap/servers/slapd')
-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.h2
-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.c2
-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.c2
-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/index_subsys.h3
-rw-r--r--ldap/servers/slapd/index_subsystem.c3
-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.c2
-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.c11
-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.c2
-rw-r--r--ldap/servers/slapd/sasl_map.c2
-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/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
-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.c2
-rw-r--r--ldap/servers/slapd/test-plugins/testdbinterop.h2
-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.c2
-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
313 files changed, 623 insertions, 618 deletions
diff --git a/ldap/servers/slapd/Makefile b/ldap/servers/slapd/Makefile
index dc33916f..cd027f17 100644
--- a/ldap/servers/slapd/Makefile
+++ b/ldap/servers/slapd/Makefile
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/abandon.c b/ldap/servers/slapd/abandon.c
index df099cda..8df59965 100644
--- a/ldap/servers/slapd/abandon.c
+++ b/ldap/servers/slapd/abandon.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* abandon.c - decode and handle an ldap abandon operation */
diff --git a/ldap/servers/slapd/add.c b/ldap/servers/slapd/add.c
index 3e58f672..320bf2a0 100644
--- a/ldap/servers/slapd/add.c
+++ b/ldap/servers/slapd/add.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/agtmmap.c b/ldap/servers/slapd/agtmmap.c
index 73536654..ee49ea0c 100644
--- a/ldap/servers/slapd/agtmmap.c
+++ b/ldap/servers/slapd/agtmmap.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/********************************************************************
diff --git a/ldap/servers/slapd/agtmmap.h b/ldap/servers/slapd/agtmmap.h
index b7c3a205..7c9d3bf9 100644
--- a/ldap/servers/slapd/agtmmap.h
+++ b/ldap/servers/slapd/agtmmap.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/apibroker.c b/ldap/servers/slapd/apibroker.c
index 28068401..706911e8 100644
--- a/ldap/servers/slapd/apibroker.c
+++ b/ldap/servers/slapd/apibroker.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* ABAPI Broker */
diff --git a/ldap/servers/slapd/attr.c b/ldap/servers/slapd/attr.c
index 78b1b2a0..0e07fa1d 100644
--- a/ldap/servers/slapd/attr.c
+++ b/ldap/servers/slapd/attr.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* attr.c - routines for dealing with attributes */
diff --git a/ldap/servers/slapd/attrlist.c b/ldap/servers/slapd/attrlist.c
index e57e473c..dadbedcc 100644
--- a/ldap/servers/slapd/attrlist.c
+++ b/ldap/servers/slapd/attrlist.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/attrsyntax.c b/ldap/servers/slapd/attrsyntax.c
index 845e9666..9ffd3c94 100644
--- a/ldap/servers/slapd/attrsyntax.c
+++ b/ldap/servers/slapd/attrsyntax.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* attrsyntax.c */
diff --git a/ldap/servers/slapd/auditlog.c b/ldap/servers/slapd/auditlog.c
index e2f11afb..0f647db2 100644
--- a/ldap/servers/slapd/auditlog.c
+++ b/ldap/servers/slapd/auditlog.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/auth.c b/ldap/servers/slapd/auth.c
index cfcb1c2e..92643cf9 100644
--- a/ldap/servers/slapd/auth.c
+++ b/ldap/servers/slapd/auth.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include <stdlib.h> /* getenv */
diff --git a/ldap/servers/slapd/auth.h b/ldap/servers/slapd/auth.h
index 044b95e4..33a3eefb 100644
--- a/ldap/servers/slapd/auth.h
+++ b/ldap/servers/slapd/auth.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifndef _SLDAPD_AUTH_H_
diff --git a/ldap/servers/slapd/ava.c b/ldap/servers/slapd/ava.c
index 9831315c..74873768 100644
--- a/ldap/servers/slapd/ava.c
+++ b/ldap/servers/slapd/ava.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* ava.c - routines for dealing with attribute value assertions */
diff --git a/ldap/servers/slapd/back-ldbm/Makefile b/ldap/servers/slapd/back-ldbm/Makefile
index 3fefc207..e2d54206 100644
--- a/ldap/servers/slapd/back-ldbm/Makefile
+++ b/ldap/servers/slapd/back-ldbm/Makefile
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/back-ldbm/ancestorid.c b/ldap/servers/slapd/back-ldbm/ancestorid.c
index 0ec76a17..3f66134b 100644
--- a/ldap/servers/slapd/back-ldbm/ancestorid.c
+++ b/ldap/servers/slapd/back-ldbm/ancestorid.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/archive.c b/ldap/servers/slapd/back-ldbm/archive.c
index 10f79cfc..58460a84 100644
--- a/ldap/servers/slapd/back-ldbm/archive.c
+++ b/ldap/servers/slapd/back-ldbm/archive.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* archive.c - ldap ldbm back-end archive and restore entry points */
diff --git a/ldap/servers/slapd/back-ldbm/attrcrypt.h b/ldap/servers/slapd/back-ldbm/attrcrypt.h
index b6ba50fb..6e73b76c 100644
--- a/ldap/servers/slapd/back-ldbm/attrcrypt.h
+++ b/ldap/servers/slapd/back-ldbm/attrcrypt.h
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Portions copyright 2004 Netscape Communications Corporation.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* Private tructures and #defines used in the attribute encryption code. */
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h
index efe24ed7..08a678b9 100644
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* back-ldbm.h - ldap ldbm back-end header file */
diff --git a/ldap/servers/slapd/back-ldbm/backentry.c b/ldap/servers/slapd/back-ldbm/backentry.c
index f38953d8..e8b0dfee 100644
--- a/ldap/servers/slapd/back-ldbm/backentry.c
+++ b/ldap/servers/slapd/back-ldbm/backentry.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* backentry.c - wrapper routines to deal with entries */
diff --git a/ldap/servers/slapd/back-ldbm/cache.c b/ldap/servers/slapd/back-ldbm/cache.c
index e55bddb2..01218b3c 100644
--- a/ldap/servers/slapd/back-ldbm/cache.c
+++ b/ldap/servers/slapd/back-ldbm/cache.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* cache.c - routines to maintain an in-core cache of entries */
diff --git a/ldap/servers/slapd/back-ldbm/cleanup.c b/ldap/servers/slapd/back-ldbm/cleanup.c
index ef539134..eb521400 100644
--- a/ldap/servers/slapd/back-ldbm/cleanup.c
+++ b/ldap/servers/slapd/back-ldbm/cleanup.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* cleanup.c - cleans up ldbm backend */
diff --git a/ldap/servers/slapd/back-ldbm/close.c b/ldap/servers/slapd/back-ldbm/close.c
index ce2be3b9..dda51a0b 100644
--- a/ldap/servers/slapd/back-ldbm/close.c
+++ b/ldap/servers/slapd/back-ldbm/close.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* close.c - close ldbm backend */
diff --git a/ldap/servers/slapd/back-ldbm/dbhelp.c b/ldap/servers/slapd/back-ldbm/dbhelp.c
index df4ae1d0..bf60acfb 100644
--- a/ldap/servers/slapd/back-ldbm/dbhelp.c
+++ b/ldap/servers/slapd/back-ldbm/dbhelp.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2005 Red Hat Inc.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
index 41c2f4c1..9d4aa094 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2004 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.h b/ldap/servers/slapd/back-ldbm/dblayer.h
index 7c096617..905d0ddd 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.h
+++ b/ldap/servers/slapd/back-ldbm/dblayer.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* Structures and #defines used in the dblayer. */
diff --git a/ldap/servers/slapd/back-ldbm/dbsize.c b/ldap/servers/slapd/back-ldbm/dbsize.c
index 891310fd..8b766b58 100644
--- a/ldap/servers/slapd/back-ldbm/dbsize.c
+++ b/ldap/servers/slapd/back-ldbm/dbsize.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldbm/dbtest.c b/ldap/servers/slapd/back-ldbm/dbtest.c
index e2ba3dd0..330f431f 100644
--- a/ldap/servers/slapd/back-ldbm/dbtest.c
+++ b/ldap/servers/slapd/back-ldbm/dbtest.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* dbtest.c - ldbm database test program */
diff --git a/ldap/servers/slapd/back-ldbm/dbversion.c b/ldap/servers/slapd/back-ldbm/dbversion.c
index 843c5609..5b8bbe9a 100644
--- a/ldap/servers/slapd/back-ldbm/dbversion.c
+++ b/ldap/servers/slapd/back-ldbm/dbversion.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/dllmain.c b/ldap/servers/slapd/back-ldbm/dllmain.c
index d473ca49..e2927fb6 100644
--- a/ldap/servers/slapd/back-ldbm/dllmain.c
+++ b/ldap/servers/slapd/back-ldbm/dllmain.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldbm/dn2entry.c b/ldap/servers/slapd/back-ldbm/dn2entry.c
index f34e7f77..ef66b779 100644
--- a/ldap/servers/slapd/back-ldbm/dn2entry.c
+++ b/ldap/servers/slapd/back-ldbm/dn2entry.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* dn2entry.c - given a dn return an entry */
diff --git a/ldap/servers/slapd/back-ldbm/entrystore.c b/ldap/servers/slapd/back-ldbm/entrystore.c
index 46c011ae..2daa8991 100644
--- a/ldap/servers/slapd/back-ldbm/entrystore.c
+++ b/ldap/servers/slapd/back-ldbm/entrystore.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/filterindex.c b/ldap/servers/slapd/back-ldbm/filterindex.c
index 445f3195..ea6d0f36 100644
--- a/ldap/servers/slapd/back-ldbm/filterindex.c
+++ b/ldap/servers/slapd/back-ldbm/filterindex.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* filterindex.c - generate the list of candidate entries from a filter */
diff --git a/ldap/servers/slapd/back-ldbm/findentry.c b/ldap/servers/slapd/back-ldbm/findentry.c
index 6565b279..4f228b9a 100644
--- a/ldap/servers/slapd/back-ldbm/findentry.c
+++ b/ldap/servers/slapd/back-ldbm/findentry.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* findentry.c - find a database entry, obeying referrals (& aliases?) */
diff --git a/ldap/servers/slapd/back-ldbm/haschildren.c b/ldap/servers/slapd/back-ldbm/haschildren.c
index 6e2fa9d9..dcd028c7 100644
--- a/ldap/servers/slapd/back-ldbm/haschildren.c
+++ b/ldap/servers/slapd/back-ldbm/haschildren.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* haschildren.c - tell if an entry has kids or not */
diff --git a/ldap/servers/slapd/back-ldbm/id2entry.c b/ldap/servers/slapd/back-ldbm/id2entry.c
index 7c5a00c2..9b53c4af 100644
--- a/ldap/servers/slapd/back-ldbm/id2entry.c
+++ b/ldap/servers/slapd/back-ldbm/id2entry.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* id2entry.c - routines to deal with the id2entry index */
diff --git a/ldap/servers/slapd/back-ldbm/idl.c b/ldap/servers/slapd/back-ldbm/idl.c
index df97a979..86e5fc3e 100644
--- a/ldap/servers/slapd/back-ldbm/idl.c
+++ b/ldap/servers/slapd/back-ldbm/idl.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* idl.c - ldap id list handling routines */
diff --git a/ldap/servers/slapd/back-ldbm/idl_common.c b/ldap/servers/slapd/back-ldbm/idl_common.c
index 2cea183e..71b2be14 100644
--- a/ldap/servers/slapd/back-ldbm/idl_common.c
+++ b/ldap/servers/slapd/back-ldbm/idl_common.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* Common IDL code, used in both old and new indexing schemes */
diff --git a/ldap/servers/slapd/back-ldbm/idl_new.c b/ldap/servers/slapd/back-ldbm/idl_new.c
index d2038261..be0f6057 100644
--- a/ldap/servers/slapd/back-ldbm/idl_new.c
+++ b/ldap/servers/slapd/back-ldbm/idl_new.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/idl_shim.c b/ldap/servers/slapd/back-ldbm/idl_shim.c
index 2332ce1b..ab9f18e6 100644
--- a/ldap/servers/slapd/back-ldbm/idl_shim.c
+++ b/ldap/servers/slapd/back-ldbm/idl_shim.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* Shim which forwards IDL calls to the appropriate implementation */
diff --git a/ldap/servers/slapd/back-ldbm/idlapi.h b/ldap/servers/slapd/back-ldbm/idlapi.h
index 39fe9c15..86b6b6a0 100644
--- a/ldap/servers/slapd/back-ldbm/idlapi.h
+++ b/ldap/servers/slapd/back-ldbm/idlapi.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/import-merge.c b/ldap/servers/slapd/back-ldbm/import-merge.c
index b50aaaec..fcffde31 100644
--- a/ldap/servers/slapd/back-ldbm/import-merge.c
+++ b/ldap/servers/slapd/back-ldbm/import-merge.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldbm/import-threads.c b/ldap/servers/slapd/back-ldbm/import-threads.c
index 653daf44..76de92c2 100644
--- a/ldap/servers/slapd/back-ldbm/import-threads.c
+++ b/ldap/servers/slapd/back-ldbm/import-threads.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldbm/import.c b/ldap/servers/slapd/back-ldbm/import.c
index 47e05fa6..0e5744b4 100644
--- a/ldap/servers/slapd/back-ldbm/import.c
+++ b/ldap/servers/slapd/back-ldbm/import.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldbm/import.h b/ldap/servers/slapd/back-ldbm/import.h
index 866ef9f8..8c9731be 100644
--- a/ldap/servers/slapd/back-ldbm/import.h
+++ b/ldap/servers/slapd/back-ldbm/import.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldbm/index.c b/ldap/servers/slapd/back-ldbm/index.c
index c742c5fe..5dc2bd2a 100644
--- a/ldap/servers/slapd/back-ldbm/index.c
+++ b/ldap/servers/slapd/back-ldbm/index.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/init.c b/ldap/servers/slapd/back-ldbm/init.c
index cfb59871..f3793eb5 100644
--- a/ldap/servers/slapd/back-ldbm/init.c
+++ b/ldap/servers/slapd/back-ldbm/init.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* init.c - initialize ldbm backend */
diff --git a/ldap/servers/slapd/back-ldbm/instance.c b/ldap/servers/slapd/back-ldbm/instance.c
index aa672000..90c2a14e 100644
--- a/ldap/servers/slapd/back-ldbm/instance.c
+++ b/ldap/servers/slapd/back-ldbm/instance.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include "back-ldbm.h"
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_abandon.c b/ldap/servers/slapd/back-ldbm/ldbm_abandon.c
index 6dd8c087..ea82a9e1 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_abandon.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_abandon.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* abandon.c - ldbm backend abandon routine */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_add.c b/ldap/servers/slapd/back-ldbm/ldbm_add.c
index 1c4b8541..d281ba57 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_add.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_add.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attr.c b/ldap/servers/slapd/back-ldbm/ldbm_attr.c
index 246a8d7d..657de14a 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attr.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attr.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* attr.c - backend routines for dealing with attributes */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
index c114fdd6..8912aeec 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 1999, 2001-2004 Netscape Communications Corporation.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* This file handles attribute encryption.
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
index 7ec93554..8d08178e 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2004 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* This file handles configuration information that is specific
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_bind.c b/ldap/servers/slapd/back-ldbm/ldbm_bind.c
index de70c601..0269b92f 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_bind.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_bind.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* bind.c - ldbm backend bind and unbind routines */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_compare.c b/ldap/servers/slapd/back-ldbm/ldbm_compare.c
index a63f6009..2baf9ce8 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_compare.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_compare.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* compare.c - ldbm backend compare routine */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index 59e197f3..f0ddfd3b 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* ldbm_config.c - Handles configuration information that is global to all ldbm instances. */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.h b/ldap/servers/slapd/back-ldbm/ldbm_config.h
index a26a73ed..a9145739 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.h
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifndef _LDBM_CONFIG_H_
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
index 55d8f162..dfb391b1 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_index_config.c b/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
index bd604cdb..b227d1d1 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_index_config.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* This file handles configuration information that is specific
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
index a5819d6f..74fa64de 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* This file handles configuration information that is specific
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modify.c b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
index 1df2e6fd..e715fa7a 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modify.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modify.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* modify.c - ldbm backend modify routine */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
index 8658886a..4bbe35f1 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* modrdn.c - ldbm backend modrdn routine */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_search.c b/ldap/servers/slapd/back-ldbm/ldbm_search.c
index ee33011d..3e740f76 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_search.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_search.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* search.c - ldbm backend search function */
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_unbind.c b/ldap/servers/slapd/back-ldbm/ldbm_unbind.c
index 9d3e80fa..2cf5b063 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_unbind.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_unbind.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* unbind.c - handle an ldap unbind operation */
diff --git a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
index 65ef0ddb..980c76e1 100644
--- a/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
+++ b/ldap/servers/slapd/back-ldbm/ldif2ldbm.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2004 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* ldif2ldbm.c
diff --git a/ldap/servers/slapd/back-ldbm/libback-ldbm.def b/ldap/servers/slapd/back-ldbm/libback-ldbm.def
index 0967d9c5..10e435ab 100644
--- a/ldap/servers/slapd/back-ldbm/libback-ldbm.def
+++ b/ldap/servers/slapd/back-ldbm/libback-ldbm.def
@@ -1,6 +1,6 @@
; BEGIN COPYRIGHT BLOCK
-; Copyright 2001 Sun Microsystems, Inc.
-; Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
; END COPYRIGHT BLOCK
;
diff --git a/ldap/servers/slapd/back-ldbm/matchrule.c b/ldap/servers/slapd/back-ldbm/matchrule.c
index 0d7197ab..28664105 100644
--- a/ldap/servers/slapd/back-ldbm/matchrule.c
+++ b/ldap/servers/slapd/back-ldbm/matchrule.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* matchrule.c */
diff --git a/ldap/servers/slapd/back-ldbm/misc.c b/ldap/servers/slapd/back-ldbm/misc.c
index b2a8d6de..6f6a7cdb 100644
--- a/ldap/servers/slapd/back-ldbm/misc.c
+++ b/ldap/servers/slapd/back-ldbm/misc.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* misc.c - backend misc routines */
diff --git a/ldap/servers/slapd/back-ldbm/monitor.c b/ldap/servers/slapd/back-ldbm/monitor.c
index 1c5a2960..d182cd21 100644
--- a/ldap/servers/slapd/back-ldbm/monitor.c
+++ b/ldap/servers/slapd/back-ldbm/monitor.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* monitor.c - ldbm backend monitor function */
diff --git a/ldap/servers/slapd/back-ldbm/nextid.c b/ldap/servers/slapd/back-ldbm/nextid.c
index 12773768..33d351af 100644
--- a/ldap/servers/slapd/back-ldbm/nextid.c
+++ b/ldap/servers/slapd/back-ldbm/nextid.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* id.c - keep track of the next id to be given out */
diff --git a/ldap/servers/slapd/back-ldbm/parents.c b/ldap/servers/slapd/back-ldbm/parents.c
index 80fec7ac..df6346f3 100644
--- a/ldap/servers/slapd/back-ldbm/parents.c
+++ b/ldap/servers/slapd/back-ldbm/parents.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* parents.c - where the adults live */
diff --git a/ldap/servers/slapd/back-ldbm/perfctrs.c b/ldap/servers/slapd/back-ldbm/perfctrs.c
index 0457e170..3830a985 100644
--- a/ldap/servers/slapd/back-ldbm/perfctrs.c
+++ b/ldap/servers/slapd/back-ldbm/perfctrs.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* Database performance counters stuff */
diff --git a/ldap/servers/slapd/back-ldbm/perfctrs.h b/ldap/servers/slapd/back-ldbm/perfctrs.h
index 8aed8d55..ab654d8a 100644
--- a/ldap/servers/slapd/back-ldbm/perfctrs.h
+++ b/ldap/servers/slapd/back-ldbm/perfctrs.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* Structure definition for performance data */
diff --git a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
index 0f42a28f..04c2fcd1 100644
--- a/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2004 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifndef _PROTO_BACK_LDBM
diff --git a/ldap/servers/slapd/back-ldbm/rmdb.c b/ldap/servers/slapd/back-ldbm/rmdb.c
index d4b760bd..b6a33e2d 100644
--- a/ldap/servers/slapd/back-ldbm/rmdb.c
+++ b/ldap/servers/slapd/back-ldbm/rmdb.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldbm/seq.c b/ldap/servers/slapd/back-ldbm/seq.c
index 6a61fd2e..beab7e6b 100644
--- a/ldap/servers/slapd/back-ldbm/seq.c
+++ b/ldap/servers/slapd/back-ldbm/seq.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* seq.c - ldbm backend sequential access function */
diff --git a/ldap/servers/slapd/back-ldbm/sort.c b/ldap/servers/slapd/back-ldbm/sort.c
index 4a25e068..e3a740c5 100644
--- a/ldap/servers/slapd/back-ldbm/sort.c
+++ b/ldap/servers/slapd/back-ldbm/sort.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* Code to implement result sorting */
diff --git a/ldap/servers/slapd/back-ldbm/start.c b/ldap/servers/slapd/back-ldbm/start.c
index f87b7112..14212cf0 100644
--- a/ldap/servers/slapd/back-ldbm/start.c
+++ b/ldap/servers/slapd/back-ldbm/start.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile b/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
index dffcba37..e5f1e506 100644
--- a/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
+++ b/ldap/servers/slapd/back-ldbm/tools/index_dump/Makefile
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
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 66998e49..289136a8 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
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/uniqueid2entry.c b/ldap/servers/slapd/back-ldbm/uniqueid2entry.c
index 31f53898..c743de54 100644
--- a/ldap/servers/slapd/back-ldbm/uniqueid2entry.c
+++ b/ldap/servers/slapd/back-ldbm/uniqueid2entry.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* uniqueid2entry.c - given a dn return an entry */
diff --git a/ldap/servers/slapd/back-ldbm/upgrade.c b/ldap/servers/slapd/back-ldbm/upgrade.c
index 1c0bfb9d..c7ff3ae5 100644
--- a/ldap/servers/slapd/back-ldbm/upgrade.c
+++ b/ldap/servers/slapd/back-ldbm/upgrade.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/back-ldbm/vlv.c b/ldap/servers/slapd/back-ldbm/vlv.c
index 8397ef0e..a93cd3e5 100644
--- a/ldap/servers/slapd/back-ldbm/vlv.c
+++ b/ldap/servers/slapd/back-ldbm/vlv.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* vlv.c */
diff --git a/ldap/servers/slapd/back-ldbm/vlv_key.c b/ldap/servers/slapd/back-ldbm/vlv_key.c
index d80aaa34..7cd6647d 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_key.c
+++ b/ldap/servers/slapd/back-ldbm/vlv_key.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* vlv_key.c */
diff --git a/ldap/servers/slapd/back-ldbm/vlv_key.h b/ldap/servers/slapd/back-ldbm/vlv_key.h
index d7436629..959f9258 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_key.h
+++ b/ldap/servers/slapd/back-ldbm/vlv_key.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* vlv_key.h */
diff --git a/ldap/servers/slapd/back-ldbm/vlv_srch.c b/ldap/servers/slapd/back-ldbm/vlv_srch.c
index 0f72c418..ea59dfbc 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_srch.c
+++ b/ldap/servers/slapd/back-ldbm/vlv_srch.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* vlv_srch.c */
diff --git a/ldap/servers/slapd/back-ldbm/vlv_srch.h b/ldap/servers/slapd/back-ldbm/vlv_srch.h
index c892f6b4..53f1fbac 100644
--- a/ldap/servers/slapd/back-ldbm/vlv_srch.h
+++ b/ldap/servers/slapd/back-ldbm/vlv_srch.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* vlv_srch.h */
diff --git a/ldap/servers/slapd/back-ldif/Makefile b/ldap/servers/slapd/back-ldif/Makefile
index 3c7f2e6e..bb4a72ff 100644
--- a/ldap/servers/slapd/back-ldif/Makefile
+++ b/ldap/servers/slapd/back-ldif/Makefile
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/back-ldif/add.c b/ldap/servers/slapd/back-ldif/add.c
index cd0b81dc..9a4375d4 100644
--- a/ldap/servers/slapd/back-ldif/add.c
+++ b/ldap/servers/slapd/back-ldif/add.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/back-ldif.h b/ldap/servers/slapd/back-ldif/back-ldif.h
index 5875c985..9e24a930 100644
--- a/ldap/servers/slapd/back-ldif/back-ldif.h
+++ b/ldap/servers/slapd/back-ldif/back-ldif.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/bind.c b/ldap/servers/slapd/back-ldif/bind.c
index b95a589f..27ae6813 100644
--- a/ldap/servers/slapd/back-ldif/bind.c
+++ b/ldap/servers/slapd/back-ldif/bind.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/close.c b/ldap/servers/slapd/back-ldif/close.c
index 34048eca..64d52844 100644
--- a/ldap/servers/slapd/back-ldif/close.c
+++ b/ldap/servers/slapd/back-ldif/close.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/compare.c b/ldap/servers/slapd/back-ldif/compare.c
index bb0c3754..057f3020 100644
--- a/ldap/servers/slapd/back-ldif/compare.c
+++ b/ldap/servers/slapd/back-ldif/compare.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/config.c b/ldap/servers/slapd/back-ldif/config.c
index a62335a5..fb414faf 100644
--- a/ldap/servers/slapd/back-ldif/config.c
+++ b/ldap/servers/slapd/back-ldif/config.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/delete.c b/ldap/servers/slapd/back-ldif/delete.c
index cf155ad4..afe2d5f1 100644
--- a/ldap/servers/slapd/back-ldif/delete.c
+++ b/ldap/servers/slapd/back-ldif/delete.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/dllmain.c b/ldap/servers/slapd/back-ldif/dllmain.c
index 69d0ceb5..b691a937 100644
--- a/ldap/servers/slapd/back-ldif/dllmain.c
+++ b/ldap/servers/slapd/back-ldif/dllmain.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/init.c b/ldap/servers/slapd/back-ldif/init.c
index 8196d371..e3ec86ff 100644
--- a/ldap/servers/slapd/back-ldif/init.c
+++ b/ldap/servers/slapd/back-ldif/init.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/libback-ldif.def b/ldap/servers/slapd/back-ldif/libback-ldif.def
index f4724f97..99eb3d0b 100644
--- a/ldap/servers/slapd/back-ldif/libback-ldif.def
+++ b/ldap/servers/slapd/back-ldif/libback-ldif.def
@@ -1,6 +1,6 @@
; BEGIN COPYRIGHT BLOCK
-; Copyright 2001 Sun Microsystems, Inc.
-; Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
; END COPYRIGHT BLOCK
;
diff --git a/ldap/servers/slapd/back-ldif/modify.c b/ldap/servers/slapd/back-ldif/modify.c
index 53f0bb2e..e28e97e1 100644
--- a/ldap/servers/slapd/back-ldif/modify.c
+++ b/ldap/servers/slapd/back-ldif/modify.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/modrdn.c b/ldap/servers/slapd/back-ldif/modrdn.c
index d2dfcdb8..550f710d 100644
--- a/ldap/servers/slapd/back-ldif/modrdn.c
+++ b/ldap/servers/slapd/back-ldif/modrdn.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/monitor.c b/ldap/servers/slapd/back-ldif/monitor.c
index b4b721b0..9ea741e1 100644
--- a/ldap/servers/slapd/back-ldif/monitor.c
+++ b/ldap/servers/slapd/back-ldif/monitor.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/search.c b/ldap/servers/slapd/back-ldif/search.c
index 1f9adbfb..3c983672 100644
--- a/ldap/servers/slapd/back-ldif/search.c
+++ b/ldap/servers/slapd/back-ldif/search.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/start.c b/ldap/servers/slapd/back-ldif/start.c
index 4e22cb08..0072e666 100644
--- a/ldap/servers/slapd/back-ldif/start.c
+++ b/ldap/servers/slapd/back-ldif/start.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/back-ldif/unbind.c b/ldap/servers/slapd/back-ldif/unbind.c
index 77c45adb..aa518381 100644
--- a/ldap/servers/slapd/back-ldif/unbind.c
+++ b/ldap/servers/slapd/back-ldif/unbind.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/backend.c b/ldap/servers/slapd/backend.c
index f4ffcc87..4c917310 100644
--- a/ldap/servers/slapd/backend.c
+++ b/ldap/servers/slapd/backend.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* backend.c - Slapi_Backend methods */
diff --git a/ldap/servers/slapd/backend_manager.c b/ldap/servers/slapd/backend_manager.c
index 18a9e8a6..10653aa5 100644
--- a/ldap/servers/slapd/backend_manager.c
+++ b/ldap/servers/slapd/backend_manager.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* backend_manager.c - routines for dealing with back-end databases */
diff --git a/ldap/servers/slapd/bind.c b/ldap/servers/slapd/bind.c
index 7490f3d3..617b464b 100644
--- a/ldap/servers/slapd/bind.c
+++ b/ldap/servers/slapd/bind.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* bind.c - decode an ldap bind operation and pass it to a backend db */
diff --git a/ldap/servers/slapd/bitset.c b/ldap/servers/slapd/bitset.c
index 5bdc5291..10880891 100644
--- a/ldap/servers/slapd/bitset.c
+++ b/ldap/servers/slapd/bitset.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/bulk_import.c b/ldap/servers/slapd/bulk_import.c
index ea531cb3..208244b5 100644
--- a/ldap/servers/slapd/bulk_import.c
+++ b/ldap/servers/slapd/bulk_import.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/ch_malloc.c b/ldap/servers/slapd/ch_malloc.c
index c4d1e748..8e4e0ab2 100644
--- a/ldap/servers/slapd/ch_malloc.c
+++ b/ldap/servers/slapd/ch_malloc.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* slapi_ch_malloc.c - malloc routines that test returns from malloc and friends */
diff --git a/ldap/servers/slapd/charray.c b/ldap/servers/slapd/charray.c
index 77c264ca..d4a90549 100644
--- a/ldap/servers/slapd/charray.c
+++ b/ldap/servers/slapd/charray.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* charray.c - routines for dealing with char * arrays */
diff --git a/ldap/servers/slapd/compare.c b/ldap/servers/slapd/compare.c
index 8030871b..f874c296 100644
--- a/ldap/servers/slapd/compare.c
+++ b/ldap/servers/slapd/compare.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/computed.c b/ldap/servers/slapd/computed.c
index 638c8159..cc37cba1 100644
--- a/ldap/servers/slapd/computed.c
+++ b/ldap/servers/slapd/computed.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/config.c b/ldap/servers/slapd/config.c
index 2e3170a4..0eabc408 100644
--- a/ldap/servers/slapd/config.c
+++ b/ldap/servers/slapd/config.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* config.c - configuration file handling routines */
diff --git a/ldap/servers/slapd/configdse.c b/ldap/servers/slapd/configdse.c
index b2fba44e..b396d685 100644
--- a/ldap/servers/slapd/configdse.c
+++ b/ldap/servers/slapd/configdse.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* configdse.c - routines to manage the config DSE */
diff --git a/ldap/servers/slapd/connection.c b/ldap/servers/slapd/connection.c
index b7f08b01..4e3994d1 100644
--- a/ldap/servers/slapd/connection.c
+++ b/ldap/servers/slapd/connection.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include <stdio.h>
diff --git a/ldap/servers/slapd/conntable.c b/ldap/servers/slapd/conntable.c
index 8297971c..0eb82aeb 100644
--- a/ldap/servers/slapd/conntable.c
+++ b/ldap/servers/slapd/conntable.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* Connection Table */
diff --git a/ldap/servers/slapd/control.c b/ldap/servers/slapd/control.c
index 012d3d4c..f139922a 100644
--- a/ldap/servers/slapd/control.c
+++ b/ldap/servers/slapd/control.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* control.c - routines for dealing with LDAPMessage controls */
diff --git a/ldap/servers/slapd/counters.c b/ldap/servers/slapd/counters.c
index f9875790..754d80d3 100644
--- a/ldap/servers/slapd/counters.c
+++ b/ldap/servers/slapd/counters.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/csn.c b/ldap/servers/slapd/csn.c
index 30243d88..213305f0 100644
--- a/ldap/servers/slapd/csn.c
+++ b/ldap/servers/slapd/csn.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/csngen.c b/ldap/servers/slapd/csngen.c
index 60131741..893cbe75 100644
--- a/ldap/servers/slapd/csngen.c
+++ b/ldap/servers/slapd/csngen.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/csngen.h b/ldap/servers/slapd/csngen.h
index 14021c41..baf47192 100644
--- a/ldap/servers/slapd/csngen.h
+++ b/ldap/servers/slapd/csngen.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/csnset.c b/ldap/servers/slapd/csnset.c
index 700cbc82..50341c9a 100644
--- a/ldap/servers/slapd/csnset.c
+++ b/ldap/servers/slapd/csnset.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c
index db79288f..ba8df8dd 100644
--- a/ldap/servers/slapd/daemon.c
+++ b/ldap/servers/slapd/daemon.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include <string.h>
diff --git a/ldap/servers/slapd/defbackend.c b/ldap/servers/slapd/defbackend.c
index abd76d88..083b31da 100644
--- a/ldap/servers/slapd/defbackend.c
+++ b/ldap/servers/slapd/defbackend.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/delete.c b/ldap/servers/slapd/delete.c
index 6e009709..9e037761 100644
--- a/ldap/servers/slapd/delete.c
+++ b/ldap/servers/slapd/delete.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/detach.c b/ldap/servers/slapd/detach.c
index 8c86358d..a7be1dbf 100644
--- a/ldap/servers/slapd/detach.c
+++ b/ldap/servers/slapd/detach.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/disconnect_error_strings.h b/ldap/servers/slapd/disconnect_error_strings.h
index 673d3528..ed6195b1 100644
--- a/ldap/servers/slapd/disconnect_error_strings.h
+++ b/ldap/servers/slapd/disconnect_error_strings.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* disconnect_error_strings.h
diff --git a/ldap/servers/slapd/disconnect_errors.h b/ldap/servers/slapd/disconnect_errors.h
index c992b874..7bb4102f 100644
--- a/ldap/servers/slapd/disconnect_errors.h
+++ b/ldap/servers/slapd/disconnect_errors.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* disconnect_errors.h
diff --git a/ldap/servers/slapd/dl.c b/ldap/servers/slapd/dl.c
index b4724b06..a52e1e68 100644
--- a/ldap/servers/slapd/dl.c
+++ b/ldap/servers/slapd/dl.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* DataList access functions */
diff --git a/ldap/servers/slapd/dn.c b/ldap/servers/slapd/dn.c
index 0a05a6a8..71e2fc8d 100644
--- a/ldap/servers/slapd/dn.c
+++ b/ldap/servers/slapd/dn.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* dn.c - routines for dealing with distinguished names */
diff --git a/ldap/servers/slapd/dse.c b/ldap/servers/slapd/dse.c
index 31c23e3b..4ce9063e 100644
--- a/ldap/servers/slapd/dse.c
+++ b/ldap/servers/slapd/dse.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/dynalib.c b/ldap/servers/slapd/dynalib.c
index aeb12a1f..d57d2f98 100644
--- a/ldap/servers/slapd/dynalib.c
+++ b/ldap/servers/slapd/dynalib.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* dynalib.c - dynamic library routines */
diff --git a/ldap/servers/slapd/entry.c b/ldap/servers/slapd/entry.c
index dc232db2..d4d49733 100644
--- a/ldap/servers/slapd/entry.c
+++ b/ldap/servers/slapd/entry.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* entry.c - routines for dealing with entries */
diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c
index 8a39b941..b3b21b96 100644
--- a/ldap/servers/slapd/entrywsi.c
+++ b/ldap/servers/slapd/entrywsi.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/errormap.c b/ldap/servers/slapd/errormap.c
index 8e7f2151..7d718af7 100644
--- a/ldap/servers/slapd/errormap.c
+++ b/ldap/servers/slapd/errormap.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/eventq.c b/ldap/servers/slapd/eventq.c
index 3acd027f..0e734f09 100644
--- a/ldap/servers/slapd/eventq.c
+++ b/ldap/servers/slapd/eventq.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/extendop.c b/ldap/servers/slapd/extendop.c
index 8044f2f3..c4da7c89 100644
--- a/ldap/servers/slapd/extendop.c
+++ b/ldap/servers/slapd/extendop.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* extendedop.c - handle an LDAPv3 extended operation */
diff --git a/ldap/servers/slapd/factory.c b/ldap/servers/slapd/factory.c
index b4ef0585..dac2eb8c 100644
--- a/ldap/servers/slapd/factory.c
+++ b/ldap/servers/slapd/factory.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/fe.h b/ldap/servers/slapd/fe.h
index f1e8dae6..0fe7cb00 100644
--- a/ldap/servers/slapd/fe.h
+++ b/ldap/servers/slapd/fe.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifndef _SLAPD_FE_H_
diff --git a/ldap/servers/slapd/fedse.c b/ldap/servers/slapd/fedse.c
index e2779e08..6ef97b62 100644
--- a/ldap/servers/slapd/fedse.c
+++ b/ldap/servers/slapd/fedse.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/fileio.c b/ldap/servers/slapd/fileio.c
index f3e90b10..d359a550 100644
--- a/ldap/servers/slapd/fileio.c
+++ b/ldap/servers/slapd/fileio.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* fileio.c - layer to adjust EOL to use DOS format via PR_Read/Write on NT */
diff --git a/ldap/servers/slapd/filter.c b/ldap/servers/slapd/filter.c
index 2f22e317..1a382adf 100644
--- a/ldap/servers/slapd/filter.c
+++ b/ldap/servers/slapd/filter.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* filter.c - routines for parsing and dealing with filters */
diff --git a/ldap/servers/slapd/filter.h b/ldap/servers/slapd/filter.h
index 93b02ca5..3cc899f6 100644
--- a/ldap/servers/slapd/filter.h
+++ b/ldap/servers/slapd/filter.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/filtercmp.c b/ldap/servers/slapd/filtercmp.c
index 4275df94..c6b01a6b 100644
--- a/ldap/servers/slapd/filtercmp.c
+++ b/ldap/servers/slapd/filtercmp.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* filtercmp.c - routines for comparing filters */
diff --git a/ldap/servers/slapd/filterentry.c b/ldap/servers/slapd/filterentry.c
index 6c6bc4b4..2af69670 100644
--- a/ldap/servers/slapd/filterentry.c
+++ b/ldap/servers/slapd/filterentry.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* filterentry.c - apply a filter to an entry */
diff --git a/ldap/servers/slapd/generation.c b/ldap/servers/slapd/generation.c
index 24988493..c9b8fb5b 100644
--- a/ldap/servers/slapd/generation.c
+++ b/ldap/servers/slapd/generation.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/getfilelist.c b/ldap/servers/slapd/getfilelist.c
index aa1b0152..38f334e3 100644
--- a/ldap/servers/slapd/getfilelist.c
+++ b/ldap/servers/slapd/getfilelist.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/***********************************************************************
diff --git a/ldap/servers/slapd/getopt_ext.c b/ldap/servers/slapd/getopt_ext.c
index 97d2e6d3..25410698 100644
--- a/ldap/servers/slapd/getopt_ext.c
+++ b/ldap/servers/slapd/getopt_ext.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/getopt_ext.h b/ldap/servers/slapd/getopt_ext.h
index aab66728..9ba21c12 100644
--- a/ldap/servers/slapd/getopt_ext.h
+++ b/ldap/servers/slapd/getopt_ext.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/globals.c b/ldap/servers/slapd/globals.c
index 08aae06d..4fe4fd6b 100644
--- a/ldap/servers/slapd/globals.c
+++ b/ldap/servers/slapd/globals.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/house.c b/ldap/servers/slapd/house.c
index 25cdb435..1a8d99c7 100644
--- a/ldap/servers/slapd/house.c
+++ b/ldap/servers/slapd/house.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include <stdio.h>
diff --git a/ldap/servers/slapd/index_subsys.h b/ldap/servers/slapd/index_subsys.h
index 190659c5..5ac6834e 100644
--- a/ldap/servers/slapd/index_subsys.h
+++ b/ldap/servers/slapd/index_subsys.h
@@ -1,5 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2002 Netscape Communications Corporation. All rights reserved.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
* END COPYRIGHT BLOCK **/
#ifndef _INDEX_SUBSYS_H_
diff --git a/ldap/servers/slapd/index_subsystem.c b/ldap/servers/slapd/index_subsystem.c
index e696860e..f4946f3c 100644
--- a/ldap/servers/slapd/index_subsystem.c
+++ b/ldap/servers/slapd/index_subsystem.c
@@ -1,5 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2002 Netscape Communications Corporation. All rights reserved.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
* END COPYRIGHT BLOCK **/
/* The indexing subsystem
diff --git a/ldap/servers/slapd/init.c b/ldap/servers/slapd/init.c
index 54ac5f78..e10f3c97 100644
--- a/ldap/servers/slapd/init.c
+++ b/ldap/servers/slapd/init.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* init.c - initialize various things */
diff --git a/ldap/servers/slapd/intrinsics.h b/ldap/servers/slapd/intrinsics.h
index f0b63431..56142f60 100644
--- a/ldap/servers/slapd/intrinsics.h
+++ b/ldap/servers/slapd/intrinsics.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/ldbmlinktest.c b/ldap/servers/slapd/ldbmlinktest.c
index a4df5bed..7a218b05 100644
--- a/ldap/servers/slapd/ldbmlinktest.c
+++ b/ldap/servers/slapd/ldbmlinktest.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#if 0
diff --git a/ldap/servers/slapd/lenstr.c b/ldap/servers/slapd/lenstr.c
index f7b19054..4a4581e2 100644
--- a/ldap/servers/slapd/lenstr.c
+++ b/ldap/servers/slapd/lenstr.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/libglobs.c b/ldap/servers/slapd/libglobs.c
index ac9ac10c..06d5aa16 100644
--- a/ldap/servers/slapd/libglobs.c
+++ b/ldap/servers/slapd/libglobs.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/libmakefile b/ldap/servers/slapd/libmakefile
index 48599132..2064840f 100644
--- a/ldap/servers/slapd/libmakefile
+++ b/ldap/servers/slapd/libmakefile
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/libsh_stub/Makefile b/ldap/servers/slapd/libsh_stub/Makefile
index 6e555a14..c47d3b53 100644
--- a/ldap/servers/slapd/libsh_stub/Makefile
+++ b/ldap/servers/slapd/libsh_stub/Makefile
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/libsh_stub/libsh_stub.c b/ldap/servers/slapd/libsh_stub/libsh_stub.c
index 56a08c9f..41f8017b 100644
--- a/ldap/servers/slapd/libsh_stub/libsh_stub.c
+++ b/ldap/servers/slapd/libsh_stub/libsh_stub.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/libslapd.def b/ldap/servers/slapd/libslapd.def
index 94ca945a..44f5cb70 100644
--- a/ldap/servers/slapd/libslapd.def
+++ b/ldap/servers/slapd/libslapd.def
@@ -1,6 +1,6 @@
; BEGIN COPYRIGHT BLOCK
-; Copyright 2001 Sun Microsystems, Inc.
-; Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
; END COPYRIGHT BLOCK
;
diff --git a/ldap/servers/slapd/listConfigAttrs.pl b/ldap/servers/slapd/listConfigAttrs.pl
index 25b63293..62be17e2 100644
--- a/ldap/servers/slapd/listConfigAttrs.pl
+++ b/ldap/servers/slapd/listConfigAttrs.pl
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/lite_entries.c b/ldap/servers/slapd/lite_entries.c
index 980bf3fe..f97bff59 100644
--- a/ldap/servers/slapd/lite_entries.c
+++ b/ldap/servers/slapd/lite_entries.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* lite_entries.c -
diff --git a/ldap/servers/slapd/localhost.c b/ldap/servers/slapd/localhost.c
index ee831647..3afb9331 100644
--- a/ldap/servers/slapd/localhost.c
+++ b/ldap/servers/slapd/localhost.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/lock.c b/ldap/servers/slapd/lock.c
index d0f2fc48..ef21b841 100644
--- a/ldap/servers/slapd/lock.c
+++ b/ldap/servers/slapd/lock.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* lock.c - routines to open and apply an advisory lock to a file */
diff --git a/ldap/servers/slapd/log.c b/ldap/servers/slapd/log.c
index 32c0fa2f..10b6032b 100644
--- a/ldap/servers/slapd/log.c
+++ b/ldap/servers/slapd/log.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/log.h b/ldap/servers/slapd/log.h
index b92b58f7..06fbe8a6 100644
--- a/ldap/servers/slapd/log.h
+++ b/ldap/servers/slapd/log.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c
index 346444da..5dfeb337 100644
--- a/ldap/servers/slapd/main.c
+++ b/ldap/servers/slapd/main.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/mapping_tree.c b/ldap/servers/slapd/mapping_tree.c
index 797ea14d..572b1b29 100644
--- a/ldap/servers/slapd/mapping_tree.c
+++ b/ldap/servers/slapd/mapping_tree.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* mapping_tree.c - Maps the DIT onto backends and/or referrals. */
diff --git a/ldap/servers/slapd/match.c b/ldap/servers/slapd/match.c
index 9ff2305e..ed62e73a 100644
--- a/ldap/servers/slapd/match.c
+++ b/ldap/servers/slapd/match.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/mkDBErrStrs.pl b/ldap/servers/slapd/mkDBErrStrs.pl
index c93cf261..6dc1e74b 100755
--- a/ldap/servers/slapd/mkDBErrStrs.pl
+++ b/ldap/servers/slapd/mkDBErrStrs.pl
@@ -1,8 +1,8 @@
#!/usr/local/bin/perl
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/modify.c b/ldap/servers/slapd/modify.c
index ba36b49c..1e73f7c6 100644
--- a/ldap/servers/slapd/modify.c
+++ b/ldap/servers/slapd/modify.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/modrdn.c b/ldap/servers/slapd/modrdn.c
index 3e6c4bf6..b22f1d72 100644
--- a/ldap/servers/slapd/modrdn.c
+++ b/ldap/servers/slapd/modrdn.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/modutil.c b/ldap/servers/slapd/modutil.c
index ac5d2c5d..94f4b30e 100644
--- a/ldap/servers/slapd/modutil.c
+++ b/ldap/servers/slapd/modutil.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* modutil.c - modify utility routine */
diff --git a/ldap/servers/slapd/monitor.c b/ldap/servers/slapd/monitor.c
index f877e679..2321223e 100644
--- a/ldap/servers/slapd/monitor.c
+++ b/ldap/servers/slapd/monitor.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/ntmsgdll/Makefile b/ldap/servers/slapd/ntmsgdll/Makefile
index 51b15e91..d6a9d279 100644
--- a/ldap/servers/slapd/ntmsgdll/Makefile
+++ b/ldap/servers/slapd/ntmsgdll/Makefile
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.c b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.c
index 9d8e9ab5..40876e17 100644
--- a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.c
+++ b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
index 9189ca68..e37040a7 100644
--- a/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
+++ b/ldap/servers/slapd/ntmsgdll/ntslapdmessages.mc
@@ -1,7 +1,7 @@
; /*
; BEGIN COPYRIGHT BLOCK
-; Copyright 2001 Sun Microsystems, Inc.
-; Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
; END COPYRIGHT BLOCK
;
diff --git a/ldap/servers/slapd/ntperfdll/Makefile b/ldap/servers/slapd/ntperfdll/Makefile
index b0c7072c..1578e379 100644
--- a/ldap/servers/slapd/ntperfdll/Makefile
+++ b/ldap/servers/slapd/ntperfdll/Makefile
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/ntperfdll/exports.def b/ldap/servers/slapd/ntperfdll/exports.def
index c5805d9d..e060ddfe 100644
--- a/ldap/servers/slapd/ntperfdll/exports.def
+++ b/ldap/servers/slapd/ntperfdll/exports.def
@@ -1,6 +1,6 @@
; BEGIN COPYRIGHT BLOCK
-; Copyright 2001 Sun Microsystems, Inc.
-; Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
; END COPYRIGHT BLOCK
;
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctr.cpp b/ldap/servers/slapd/ntperfdll/nsldapctr.cpp
index 21bf429d..387127a1 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctr.cpp
+++ b/ldap/servers/slapd/ntperfdll/nsldapctr.cpp
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrdef.h b/ldap/servers/slapd/ntperfdll/nsldapctrdef.h
index 77b5d279..7afaaae6 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrdef.h
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrdef.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrmc.h b/ldap/servers/slapd/ntperfdll/nsldapctrmc.h
index 2178d6be..d22ad30e 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrmc.h
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrmc.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrmc.mc b/ldap/servers/slapd/ntperfdll/nsldapctrmc.mc
index 10c8341f..ce801db8 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrmc.mc
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrmc.mc
@@ -1,6 +1,6 @@
; BEGIN COPYRIGHT BLOCK
-; Copyright 2001 Sun Microsystems, Inc.
-; Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
; END COPYRIGHT BLOCK
;
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrmsg.h b/ldap/servers/slapd/ntperfdll/nsldapctrmsg.h
index 684ed821..c3f24469 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrmsg.h
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrmsg.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrs.h b/ldap/servers/slapd/ntperfdll/nsldapctrs.h
index 3bd4c70a..57764430 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrs.h
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrs.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrs.ini b/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
index 1b0d6263..fb7be118 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrs.ini
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrutil.cpp b/ldap/servers/slapd/ntperfdll/nsldapctrutil.cpp
index 1783aee2..04af656c 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrutil.cpp
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrutil.cpp
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/ntperfdll/nsldapctrutil.h b/ldap/servers/slapd/ntperfdll/nsldapctrutil.h
index 37384b3a..8240e8bb 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapctrutil.h
+++ b/ldap/servers/slapd/ntperfdll/nsldapctrutil.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/ntperfdll/nsldapreg.ini b/ldap/servers/slapd/ntperfdll/nsldapreg.ini
index 6ca7a2c2..1084112b 100644
--- a/ldap/servers/slapd/ntperfdll/nsldapreg.ini
+++ b/ldap/servers/slapd/ntperfdll/nsldapreg.ini
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/ntuserpin.c b/ldap/servers/slapd/ntuserpin.c
index e183f8e6..2d3a9081 100644
--- a/ldap/servers/slapd/ntuserpin.c
+++ b/ldap/servers/slapd/ntuserpin.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/******************************************************
diff --git a/ldap/servers/slapd/ntwdog/Makefile b/ldap/servers/slapd/ntwdog/Makefile
index 4cefe026..afb11921 100644
--- a/ldap/servers/slapd/ntwdog/Makefile
+++ b/ldap/servers/slapd/ntwdog/Makefile
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/ntwdog/cron_conf.c b/ldap/servers/slapd/ntwdog/cron_conf.c
index 8d60191a..78e2c3ac 100644
--- a/ldap/servers/slapd/ntwdog/cron_conf.c
+++ b/ldap/servers/slapd/ntwdog/cron_conf.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/ntwdog/cron_conf.h b/ldap/servers/slapd/ntwdog/cron_conf.h
index 23a32463..cd186b73 100644
--- a/ldap/servers/slapd/ntwdog/cron_conf.h
+++ b/ldap/servers/slapd/ntwdog/cron_conf.h
@@ -1,10 +1,10 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/***********************************************************************
-** $Id: cron_conf.h,v 1.1 2005/01/21 00:40:52 cvsadm Exp $
+** $Id: cron_conf.h,v 1.2 2005/02/28 23:38:03 nkinder Exp $
**
**
** NAME
diff --git a/ldap/servers/slapd/ntwdog/ntcron.c b/ldap/servers/slapd/ntwdog/ntcron.c
index 98b4cae3..d3bcb43a 100644
--- a/ldap/servers/slapd/ntwdog/ntcron.c
+++ b/ldap/servers/slapd/ntwdog/ntcron.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
// //
diff --git a/ldap/servers/slapd/ntwdog/ntwatchdog.c b/ldap/servers/slapd/ntwdog/ntwatchdog.c
index ef8e795c..0c516827 100644
--- a/ldap/servers/slapd/ntwdog/ntwatchdog.c
+++ b/ldap/servers/slapd/ntwdog/ntwatchdog.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#pragma warning(disable : 4001)
diff --git a/ldap/servers/slapd/object.c b/ldap/servers/slapd/object.c
index 7fb90164..c19b365f 100644
--- a/ldap/servers/slapd/object.c
+++ b/ldap/servers/slapd/object.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/objset.c b/ldap/servers/slapd/objset.c
index ceb5f225..4803c6a8 100644
--- a/ldap/servers/slapd/objset.c
+++ b/ldap/servers/slapd/objset.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/operation.c b/ldap/servers/slapd/operation.c
index a049e382..6f72bd4d 100644
--- a/ldap/servers/slapd/operation.c
+++ b/ldap/servers/slapd/operation.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* operation.c - routines to deal with pending ldap operations */
diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c
index e265d420..847cdd31 100644
--- a/ldap/servers/slapd/opshared.c
+++ b/ldap/servers/slapd/opshared.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* opshared.c - functions shared between regular and internal operations */
diff --git a/ldap/servers/slapd/passwd_extop.c b/ldap/servers/slapd/passwd_extop.c
index c4412746..f0403721 100644
--- a/ldap/servers/slapd/passwd_extop.c
+++ b/ldap/servers/slapd/passwd_extop.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2004 Netscape Communications Corporation.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c
index d4431ddb..d2e08c70 100644
--- a/ldap/servers/slapd/pblock.c
+++ b/ldap/servers/slapd/pblock.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/plugin.c b/ldap/servers/slapd/plugin.c
index 825fb21b..3db20f67 100644
--- a/ldap/servers/slapd/plugin.c
+++ b/ldap/servers/slapd/plugin.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* plugin.c - routines for setting up and calling plugins */
diff --git a/ldap/servers/slapd/plugin_acl.c b/ldap/servers/slapd/plugin_acl.c
index 2115dfbd..cd47dedf 100644
--- a/ldap/servers/slapd/plugin_acl.c
+++ b/ldap/servers/slapd/plugin_acl.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/plugin_internal_op.c b/ldap/servers/slapd/plugin_internal_op.c
index c73d0d79..7a972d6c 100644
--- a/ldap/servers/slapd/plugin_internal_op.c
+++ b/ldap/servers/slapd/plugin_internal_op.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* stevross@netscape.com June 13 1997 */
diff --git a/ldap/servers/slapd/plugin_mr.c b/ldap/servers/slapd/plugin_mr.c
index 2579ff64..491f9f2e 100644
--- a/ldap/servers/slapd/plugin_mr.c
+++ b/ldap/servers/slapd/plugin_mr.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/plugin_role.c b/ldap/servers/slapd/plugin_role.c
index 362b08cc..c48e8fe2 100644
--- a/ldap/servers/slapd/plugin_role.c
+++ b/ldap/servers/slapd/plugin_role.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/plugin_syntax.c b/ldap/servers/slapd/plugin_syntax.c
index caace965..57ac9450 100644
--- a/ldap/servers/slapd/plugin_syntax.c
+++ b/ldap/servers/slapd/plugin_syntax.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/poll_using_select.c b/ldap/servers/slapd/poll_using_select.c
index 5c25a57b..2b4d67e1 100644
--- a/ldap/servers/slapd/poll_using_select.c
+++ b/ldap/servers/slapd/poll_using_select.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/poll_using_select.h b/ldap/servers/slapd/poll_using_select.h
index de117729..81f8ca6f 100644
--- a/ldap/servers/slapd/poll_using_select.h
+++ b/ldap/servers/slapd/poll_using_select.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifndef _POLL_USING_SELECT_H
diff --git a/ldap/servers/slapd/prerrstrs.h b/ldap/servers/slapd/prerrstrs.h
index 3f34f277..190c690d 100644
--- a/ldap/servers/slapd/prerrstrs.h
+++ b/ldap/servers/slapd/prerrstrs.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/protect_db.c b/ldap/servers/slapd/protect_db.c
index 34a63e80..3f9c5c16 100644
--- a/ldap/servers/slapd/protect_db.c
+++ b/ldap/servers/slapd/protect_db.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* protect_db.c
diff --git a/ldap/servers/slapd/protect_db.h b/ldap/servers/slapd/protect_db.h
index 6d6d59d0..6eed8206 100644
--- a/ldap/servers/slapd/protect_db.h
+++ b/ldap/servers/slapd/protect_db.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* Header file for protect_db.c */
diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h
index 8b331152..09f04d0b 100644
--- a/ldap/servers/slapd/proto-slap.h
+++ b/ldap/servers/slapd/proto-slap.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifndef _PROTO_SLAP
diff --git a/ldap/servers/slapd/psearch.c b/ldap/servers/slapd/psearch.c
index d7b89495..c95a33bb 100644
--- a/ldap/servers/slapd/psearch.c
+++ b/ldap/servers/slapd/psearch.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/pw.c b/ldap/servers/slapd/pw.c
index b767e0e9..1b55b954 100644
--- a/ldap/servers/slapd/pw.c
+++ b/ldap/servers/slapd/pw.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/pw.h b/ldap/servers/slapd/pw.h
index d9202bef..ce7aa90f 100644
--- a/ldap/servers/slapd/pw.h
+++ b/ldap/servers/slapd/pw.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifndef _SLAPD_PW_H_
diff --git a/ldap/servers/slapd/pw_mgmt.c b/ldap/servers/slapd/pw_mgmt.c
index d9346f85..def09c02 100644
--- a/ldap/servers/slapd/pw_mgmt.c
+++ b/ldap/servers/slapd/pw_mgmt.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* pw_mgmt.c
diff --git a/ldap/servers/slapd/pw_retry.c b/ldap/servers/slapd/pw_retry.c
index 3fda4421..094d1587 100644
--- a/ldap/servers/slapd/pw_retry.c
+++ b/ldap/servers/slapd/pw_retry.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* pw_retry.c
diff --git a/ldap/servers/slapd/rdn.c b/ldap/servers/slapd/rdn.c
index 1eeb75ee..c93bdc80 100644
--- a/ldap/servers/slapd/rdn.c
+++ b/ldap/servers/slapd/rdn.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/referral.c b/ldap/servers/slapd/referral.c
index 98fedadf..4391c6b9 100644
--- a/ldap/servers/slapd/referral.c
+++ b/ldap/servers/slapd/referral.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/regex.c b/ldap/servers/slapd/regex.c
index d9382b24..34f9d623 100644
--- a/ldap/servers/slapd/regex.c
+++ b/ldap/servers/slapd/regex.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include "slap.h" /* must come before regex.h */
@@ -54,8 +54,11 @@ slapd_re_unlock( void )
* Modification history:
*
* $Log: regex.c,v $
- * Revision 1.1 2005/01/21 00:40:51 cvsadm
- * Initial revision
+ * Revision 1.2 2005/02/28 23:38:00 nkinder
+ * 149951 - Updated source code copyrights
+ *
+ * Revision 1.1.1.1 2005/01/21 00:40:51 cvsadm
+ * Moving NSCP Directory Server from DirectoryBranch to TRUNK, initial drop. (foxworth)
*
* Revision 1.3.20.1.2.11 2005/01/14 01:22:12 nhosoi
* For the open-source project.
diff --git a/ldap/servers/slapd/resourcelimit.c b/ldap/servers/slapd/resourcelimit.c
index 3f0d3840..7e552a75 100644
--- a/ldap/servers/slapd/resourcelimit.c
+++ b/ldap/servers/slapd/resourcelimit.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* resourcelimit.c - binder-based resource limits implementation */
diff --git a/ldap/servers/slapd/result.c b/ldap/servers/slapd/result.c
index b8be99f7..4995a620 100644
--- a/ldap/servers/slapd/result.c
+++ b/ldap/servers/slapd/result.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* result.c - routines to send ldap results, errors, and referrals */
diff --git a/ldap/servers/slapd/rootdse.c b/ldap/servers/slapd/rootdse.c
index f438cceb..1dcb11d7 100644
--- a/ldap/servers/slapd/rootdse.c
+++ b/ldap/servers/slapd/rootdse.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* rootdse.c - routines to manage the root DSE */
diff --git a/ldap/servers/slapd/rwlock.c b/ldap/servers/slapd/rwlock.c
index 8642a9ea..0ed2c661 100644
--- a/ldap/servers/slapd/rwlock.c
+++ b/ldap/servers/slapd/rwlock.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/rwlock.h b/ldap/servers/slapd/rwlock.h
index 112f1de6..18061aee 100644
--- a/ldap/servers/slapd/rwlock.h
+++ b/ldap/servers/slapd/rwlock.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#ifndef _RWLOCK_H_
diff --git a/ldap/servers/slapd/sasl_io.c b/ldap/servers/slapd/sasl_io.c
index bf250658..3715ff17 100644
--- a/ldap/servers/slapd/sasl_io.c
+++ b/ldap/servers/slapd/sasl_io.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2004 Netscape Communications Corporation.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/sasl_map.c b/ldap/servers/slapd/sasl_map.c
index 6a966039..ec2068f1 100644
--- a/ldap/servers/slapd/sasl_map.c
+++ b/ldap/servers/slapd/sasl_map.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2004 Netscape Communications Corporation.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/saslbind.c b/ldap/servers/slapd/saslbind.c
index 3e86fece..669abcd2 100644
--- a/ldap/servers/slapd/saslbind.c
+++ b/ldap/servers/slapd/saslbind.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/schema.c b/ldap/servers/slapd/schema.c
index 9404dccb..b8324b7c 100644
--- a/ldap/servers/slapd/schema.c
+++ b/ldap/servers/slapd/schema.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* schema.c - routines to enforce schema definitions */
diff --git a/ldap/servers/slapd/schemaparse.c b/ldap/servers/slapd/schemaparse.c
index c6fb51fe..4a0ab0db 100644
--- a/ldap/servers/slapd/schemaparse.c
+++ b/ldap/servers/slapd/schemaparse.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* schemaparse.c - routines to support objectclass definitions */
diff --git a/ldap/servers/slapd/search.c b/ldap/servers/slapd/search.c
index c8210158..5fa20357 100644
--- a/ldap/servers/slapd/search.c
+++ b/ldap/servers/slapd/search.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/secerrstrs.h b/ldap/servers/slapd/secerrstrs.h
index 05be8170..f95332f9 100644
--- a/ldap/servers/slapd/secerrstrs.h
+++ b/ldap/servers/slapd/secerrstrs.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/security_wrappers.c b/ldap/servers/slapd/security_wrappers.c
index d4b898d8..9b68a0ba 100644
--- a/ldap/servers/slapd/security_wrappers.c
+++ b/ldap/servers/slapd/security_wrappers.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include <ssl.h>
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 3569a198..13048aa9 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* slap.h - stand alone ldap server include file */
diff --git a/ldap/servers/slapd/slapd.lite.key b/ldap/servers/slapd/slapd.lite.key
index 0ff28a14..e24db226 100644
--- a/ldap/servers/slapd/slapd.lite.key
+++ b/ldap/servers/slapd/slapd.lite.key
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/slapd.normal.key b/ldap/servers/slapd/slapd.normal.key
index 0f1ce157..d343a4b4 100644
--- a/ldap/servers/slapd/slapd.normal.key
+++ b/ldap/servers/slapd/slapd.normal.key
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/slapd_plhash.c b/ldap/servers/slapd/slapd_plhash.c
index 0206440e..2d36675e 100644
--- a/ldap/servers/slapd/slapd_plhash.c
+++ b/ldap/servers/slapd/slapd_plhash.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/slapi-plugin-compat4.h b/ldap/servers/slapd/slapi-plugin-compat4.h
index 198a72c0..4afee22d 100644
--- a/ldap/servers/slapd/slapi-plugin-compat4.h
+++ b/ldap/servers/slapd/slapi-plugin-compat4.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h
index c9da17a5..968c33a3 100644
--- a/ldap/servers/slapd/slapi-plugin.h
+++ b/ldap/servers/slapd/slapi-plugin.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h
index 8577c550..4344a02a 100644
--- a/ldap/servers/slapd/slapi-private.h
+++ b/ldap/servers/slapd/slapi-private.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* slapi-private.h - external header file for some special plugins */
diff --git a/ldap/servers/slapd/slapi2nspr.c b/ldap/servers/slapd/slapi2nspr.c
index 17f4896f..870230ed 100644
--- a/ldap/servers/slapd/slapi2nspr.c
+++ b/ldap/servers/slapd/slapi2nspr.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/snmp_collator.c b/ldap/servers/slapd/snmp_collator.c
index 75e033ed..68fe4423 100644
--- a/ldap/servers/slapd/snmp_collator.c
+++ b/ldap/servers/slapd/snmp_collator.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include <stdio.h>
diff --git a/ldap/servers/slapd/snmp_collator.h b/ldap/servers/slapd/snmp_collator.h
index d6eec840..77dd4bc1 100644
--- a/ldap/servers/slapd/snmp_collator.h
+++ b/ldap/servers/slapd/snmp_collator.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/******************************************************************************
diff --git a/ldap/servers/slapd/snoop.c b/ldap/servers/slapd/snoop.c
index d6841aa2..bc42c75e 100644
--- a/ldap/servers/slapd/snoop.c
+++ b/ldap/servers/slapd/snoop.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/ssl.c b/ldap/servers/slapd/ssl.c
index 49eea76a..96e6be33 100644
--- a/ldap/servers/slapd/ssl.c
+++ b/ldap/servers/slapd/ssl.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* SSL-related stuff for slapd */
diff --git a/ldap/servers/slapd/sslerrstrs.h b/ldap/servers/slapd/sslerrstrs.h
index 5b63e3a7..9d7ec167 100644
--- a/ldap/servers/slapd/sslerrstrs.h
+++ b/ldap/servers/slapd/sslerrstrs.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/start_tls_extop.c b/ldap/servers/slapd/start_tls_extop.c
index d34085f9..915ad1b0 100644
--- a/ldap/servers/slapd/start_tls_extop.c
+++ b/ldap/servers/slapd/start_tls_extop.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/statechange.h b/ldap/servers/slapd/statechange.h
index 70ec3ab8..dba10178 100644
--- a/ldap/servers/slapd/statechange.h
+++ b/ldap/servers/slapd/statechange.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/str2filter.c b/ldap/servers/slapd/str2filter.c
index c3cb2e31..0be70725 100644
--- a/ldap/servers/slapd/str2filter.c
+++ b/ldap/servers/slapd/str2filter.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* slapi_str2filter.c - parse an rfc 1588 string filter */
diff --git a/ldap/servers/slapd/strdup.c b/ldap/servers/slapd/strdup.c
index b25d6485..d8e78f9d 100644
--- a/ldap/servers/slapd/strdup.c
+++ b/ldap/servers/slapd/strdup.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#if defined( ultrix ) || defined( nextstep )
diff --git a/ldap/servers/slapd/stubrepl.c b/ldap/servers/slapd/stubrepl.c
index 83607bc6..7cd084de 100644
--- a/ldap/servers/slapd/stubrepl.c
+++ b/ldap/servers/slapd/stubrepl.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* stubrepl.c - stubs of functions required for the evil stuff in the tools directory */
diff --git a/ldap/servers/slapd/stubs.c b/ldap/servers/slapd/stubs.c
index 0440cedf..1406a83d 100644
--- a/ldap/servers/slapd/stubs.c
+++ b/ldap/servers/slapd/stubs.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/subentry.c b/ldap/servers/slapd/subentry.c
index b178115c..5763741f 100644
--- a/ldap/servers/slapd/subentry.c
+++ b/ldap/servers/slapd/subentry.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/task.c b/ldap/servers/slapd/task.c
index dd85e41d..e1e6f1af 100644
--- a/ldap/servers/slapd/task.c
+++ b/ldap/servers/slapd/task.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/tempnam.c b/ldap/servers/slapd/tempnam.c
index 00c7c2fc..cfb87e0d 100644
--- a/ldap/servers/slapd/tempnam.c
+++ b/ldap/servers/slapd/tempnam.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#if defined( nextstep )
diff --git a/ldap/servers/slapd/test-plugins/Makefile b/ldap/servers/slapd/test-plugins/Makefile
index 08cdf854..827d33a8 100644
--- a/ldap/servers/slapd/test-plugins/Makefile
+++ b/ldap/servers/slapd/test-plugins/Makefile
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.AIX b/ldap/servers/slapd/test-plugins/Makefile.AIX
index 31a64146..86345ecb 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.AIX
+++ b/ldap/servers/slapd/test-plugins/Makefile.AIX
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.BSDI b/ldap/servers/slapd/test-plugins/Makefile.BSDI
index 0433e752..f731443f 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.BSDI
+++ b/ldap/servers/slapd/test-plugins/Makefile.BSDI
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.HPUX b/ldap/servers/slapd/test-plugins/Makefile.HPUX
index 06df5a21..86179175 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.HPUX
+++ b/ldap/servers/slapd/test-plugins/Makefile.HPUX
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.HPUX64 b/ldap/servers/slapd/test-plugins/Makefile.HPUX64
index 2e9fc329..5b82ed8f 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.HPUX64
+++ b/ldap/servers/slapd/test-plugins/Makefile.HPUX64
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.IRIX b/ldap/servers/slapd/test-plugins/Makefile.IRIX
index 820e5d1b..94e6e9a8 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.IRIX
+++ b/ldap/servers/slapd/test-plugins/Makefile.IRIX
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.Linux b/ldap/servers/slapd/test-plugins/Makefile.Linux
index 1e3de457..8b9f36e2 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.Linux
+++ b/ldap/servers/slapd/test-plugins/Makefile.Linux
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.OSF1 b/ldap/servers/slapd/test-plugins/Makefile.OSF1
index a1765d2e..2591111a 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.OSF1
+++ b/ldap/servers/slapd/test-plugins/Makefile.OSF1
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.ReliantUNIX b/ldap/servers/slapd/test-plugins/Makefile.ReliantUNIX
index 0433e752..f731443f 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.ReliantUNIX
+++ b/ldap/servers/slapd/test-plugins/Makefile.ReliantUNIX
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.SOLARIS b/ldap/servers/slapd/test-plugins/Makefile.SOLARIS
index 1914f3b2..ef4c2ed6 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.SOLARIS
+++ b/ldap/servers/slapd/test-plugins/Makefile.SOLARIS
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.SOLARIS64 b/ldap/servers/slapd/test-plugins/Makefile.SOLARIS64
index 151ea5b1..5156c803 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.SOLARIS64
+++ b/ldap/servers/slapd/test-plugins/Makefile.SOLARIS64
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.SOLARISx86 b/ldap/servers/slapd/test-plugins/Makefile.SOLARISx86
index 0433e752..f731443f 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.SOLARISx86
+++ b/ldap/servers/slapd/test-plugins/Makefile.SOLARISx86
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.UnixWare b/ldap/servers/slapd/test-plugins/Makefile.UnixWare
index 0433e752..f731443f 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.UnixWare
+++ b/ldap/servers/slapd/test-plugins/Makefile.UnixWare
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.UnixWareUDK b/ldap/servers/slapd/test-plugins/Makefile.UnixWareUDK
index 0433e752..f731443f 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.UnixWareUDK
+++ b/ldap/servers/slapd/test-plugins/Makefile.UnixWareUDK
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/Makefile.WINNT b/ldap/servers/slapd/test-plugins/Makefile.WINNT
index d18d7ea7..f9326aaf 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.WINNT
+++ b/ldap/servers/slapd/test-plugins/Makefile.WINNT
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/README b/ldap/servers/slapd/test-plugins/README
index 1faf1b05..a5f2b0c6 100644
--- a/ldap/servers/slapd/test-plugins/README
+++ b/ldap/servers/slapd/test-plugins/README
@@ -1,6 +1,6 @@
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/clients/README b/ldap/servers/slapd/test-plugins/clients/README
index a2aac49d..998645b2 100644
--- a/ldap/servers/slapd/test-plugins/clients/README
+++ b/ldap/servers/slapd/test-plugins/clients/README
@@ -1,6 +1,6 @@
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/clients/ReqExtOp.java b/ldap/servers/slapd/test-plugins/clients/ReqExtOp.java
index cf29ea21..7d972b0c 100644
--- a/ldap/servers/slapd/test-plugins/clients/ReqExtOp.java
+++ b/ldap/servers/slapd/test-plugins/clients/ReqExtOp.java
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/test-plugins/clients/reqextop.c b/ldap/servers/slapd/test-plugins/clients/reqextop.c
index f23bcf38..ad297a40 100644
--- a/ldap/servers/slapd/test-plugins/clients/reqextop.c
+++ b/ldap/servers/slapd/test-plugins/clients/reqextop.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/test-plugins/dllmain.c b/ldap/servers/slapd/test-plugins/dllmain.c
index f50f3595..7997f747 100644
--- a/ldap/servers/slapd/test-plugins/dllmain.c
+++ b/ldap/servers/slapd/test-plugins/dllmain.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/test-plugins/nicknames b/ldap/servers/slapd/test-plugins/nicknames
index 1d7a2515..4803b071 100644
--- a/ldap/servers/slapd/test-plugins/nicknames
+++ b/ldap/servers/slapd/test-plugins/nicknames
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/testbind.c b/ldap/servers/slapd/test-plugins/testbind.c
index 4d080a0f..0e498c75 100644
--- a/ldap/servers/slapd/test-plugins/testbind.c
+++ b/ldap/servers/slapd/test-plugins/testbind.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/test-plugins/testdatainterop.c b/ldap/servers/slapd/test-plugins/testdatainterop.c
index 19b171c1..8e27cd61 100644
--- a/ldap/servers/slapd/test-plugins/testdatainterop.c
+++ b/ldap/servers/slapd/test-plugins/testdatainterop.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2002 Netscape Communications Corporation.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/test-plugins/testdbinterop.h b/ldap/servers/slapd/test-plugins/testdbinterop.h
index 4fe46347..7f292632 100644
--- a/ldap/servers/slapd/test-plugins/testdbinterop.h
+++ b/ldap/servers/slapd/test-plugins/testdbinterop.h
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2002 Netscape Communications Corporation.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/test-plugins/testentry.c b/ldap/servers/slapd/test-plugins/testentry.c
index 893c6955..a762ef7f 100644
--- a/ldap/servers/slapd/test-plugins/testentry.c
+++ b/ldap/servers/slapd/test-plugins/testentry.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/************************************************************
diff --git a/ldap/servers/slapd/test-plugins/testextendedop.c b/ldap/servers/slapd/test-plugins/testextendedop.c
index fad462a7..b29d3505 100644
--- a/ldap/servers/slapd/test-plugins/testextendedop.c
+++ b/ldap/servers/slapd/test-plugins/testextendedop.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/test-plugins/testgetip.c b/ldap/servers/slapd/test-plugins/testgetip.c
index b8d08a52..b5bd1162 100644
--- a/ldap/servers/slapd/test-plugins/testgetip.c
+++ b/ldap/servers/slapd/test-plugins/testgetip.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/************************************************************
diff --git a/ldap/servers/slapd/test-plugins/testplugin.def b/ldap/servers/slapd/test-plugins/testplugin.def
index 38863078..d8d19af5 100644
--- a/ldap/servers/slapd/test-plugins/testplugin.def
+++ b/ldap/servers/slapd/test-plugins/testplugin.def
@@ -1,6 +1,6 @@
; BEGIN COPYRIGHT BLOCK
-; Copyright 2001 Sun Microsystems, Inc.
-; Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
; END COPYRIGHT BLOCK
;
diff --git a/ldap/servers/slapd/test-plugins/testplugin.dsp b/ldap/servers/slapd/test-plugins/testplugin.dsp
index d956bcd3..fc0ee046 100644
--- a/ldap/servers/slapd/test-plugins/testplugin.dsp
+++ b/ldap/servers/slapd/test-plugins/testplugin.dsp
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/testplugin.mak b/ldap/servers/slapd/test-plugins/testplugin.mak
index ca48774c..93c122ba 100644
--- a/ldap/servers/slapd/test-plugins/testplugin.mak
+++ b/ldap/servers/slapd/test-plugins/testplugin.mak
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/test-plugins/testpostop.c b/ldap/servers/slapd/test-plugins/testpostop.c
index 5dbf18d1..9eee48c2 100644
--- a/ldap/servers/slapd/test-plugins/testpostop.c
+++ b/ldap/servers/slapd/test-plugins/testpostop.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/test-plugins/testpreop.c b/ldap/servers/slapd/test-plugins/testpreop.c
index 54a08b53..4693eb5a 100644
--- a/ldap/servers/slapd/test-plugins/testpreop.c
+++ b/ldap/servers/slapd/test-plugins/testpreop.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/************************************************************
diff --git a/ldap/servers/slapd/test-plugins/testsaslbind.c b/ldap/servers/slapd/test-plugins/testsaslbind.c
index 5b8e5021..14e61f58 100644
--- a/ldap/servers/slapd/test-plugins/testsaslbind.c
+++ b/ldap/servers/slapd/test-plugins/testsaslbind.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/time.c b/ldap/servers/slapd/time.c
index ebb279e8..a4253c3a 100644
--- a/ldap/servers/slapd/time.c
+++ b/ldap/servers/slapd/time.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* time.c - various time routines */
diff --git a/ldap/servers/slapd/tools/Makefile b/ldap/servers/slapd/tools/Makefile
index 1dbce5e2..1b473f54 100644
--- a/ldap/servers/slapd/tools/Makefile
+++ b/ldap/servers/slapd/tools/Makefile
@@ -1,7 +1,7 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/slapd/tools/dbscan.c b/ldap/servers/slapd/tools/dbscan.c
index 9c257824..bd6d37a9 100644
--- a/ldap/servers/slapd/tools/dbscan.c
+++ b/ldap/servers/slapd/tools/dbscan.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright Copyright 2002 Netscape Communications Corporation.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/tools/eggencode.c b/ldap/servers/slapd/tools/eggencode.c
index 92b098ca..f1339c20 100644
--- a/ldap/servers/slapd/tools/eggencode.c
+++ b/ldap/servers/slapd/tools/eggencode.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/tools/keyupg.c b/ldap/servers/slapd/tools/keyupg.c
index f1d9adc1..52432182 100644
--- a/ldap/servers/slapd/tools/keyupg.c
+++ b/ldap/servers/slapd/tools/keyupg.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/tools/ldif.c b/ldap/servers/slapd/tools/ldif.c
index aa90a178..98f8f6d4 100644
--- a/ldap/servers/slapd/tools/ldif.c
+++ b/ldap/servers/slapd/tools/ldif.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include <stdio.h>
diff --git a/ldap/servers/slapd/tools/migratecred.c b/ldap/servers/slapd/tools/migratecred.c
index 9d0d2c66..e1a337e8 100644
--- a/ldap/servers/slapd/tools/migratecred.c
+++ b/ldap/servers/slapd/tools/migratecred.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/tools/mkdep.c b/ldap/servers/slapd/tools/mkdep.c
index 469194fe..a0cb5626 100644
--- a/ldap/servers/slapd/tools/mkdep.c
+++ b/ldap/servers/slapd/tools/mkdep.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/slapd/tools/mmldif.c b/ldap/servers/slapd/tools/mmldif.c
index 413c1b7d..995b7bc3 100644
--- a/ldap/servers/slapd/tools/mmldif.c
+++ b/ldap/servers/slapd/tools/mmldif.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/tools/pwenc.c b/ldap/servers/slapd/tools/pwenc.c
index 7a150860..80affdcb 100644
--- a/ldap/servers/slapd/tools/pwenc.c
+++ b/ldap/servers/slapd/tools/pwenc.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#if defined( _WIN32 )
diff --git a/ldap/servers/slapd/unbind.c b/ldap/servers/slapd/unbind.c
index 5f7d9057..5b26ca7a 100644
--- a/ldap/servers/slapd/unbind.c
+++ b/ldap/servers/slapd/unbind.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* unbind.c - decode an ldap unbind operation and pass it to a backend db */
diff --git a/ldap/servers/slapd/uniqueid.c b/ldap/servers/slapd/uniqueid.c
index 0c7439f0..a5eb2d82 100644
--- a/ldap/servers/slapd/uniqueid.c
+++ b/ldap/servers/slapd/uniqueid.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* uniqueid.c implementation of entryid functionality */
diff --git a/ldap/servers/slapd/uniqueidgen.c b/ldap/servers/slapd/uniqueidgen.c
index 1765b78d..294faf37 100644
--- a/ldap/servers/slapd/uniqueidgen.c
+++ b/ldap/servers/slapd/uniqueidgen.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* uniqueidgen.c - implementation for uniqueID generator */
diff --git a/ldap/servers/slapd/utf8compare.c b/ldap/servers/slapd/utf8compare.c
index f011472a..3c6bec3c 100644
--- a/ldap/servers/slapd/utf8compare.c
+++ b/ldap/servers/slapd/utf8compare.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include <stdio.h>
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index 6b6a5b0c..767441cc 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/util.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* util.c -- utility functions -- functions available form libslapd */
diff --git a/ldap/servers/slapd/uuid.c b/ldap/servers/slapd/uuid.c
index 47576559..f490fbae 100644
--- a/ldap/servers/slapd/uuid.c
+++ b/ldap/servers/slapd/uuid.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* uuid.c */
diff --git a/ldap/servers/slapd/uuid.h b/ldap/servers/slapd/uuid.h
index 403b8ed7..3371ba15 100644
--- a/ldap/servers/slapd/uuid.h
+++ b/ldap/servers/slapd/uuid.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* uuid.h - interface to uuid layer. UUID is generated in accordance
diff --git a/ldap/servers/slapd/value.c b/ldap/servers/slapd/value.c
index 8e2a31ef..ad178069 100644
--- a/ldap/servers/slapd/value.c
+++ b/ldap/servers/slapd/value.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/valueset.c b/ldap/servers/slapd/valueset.c
index a388fc38..7f2b7d59 100644
--- a/ldap/servers/slapd/valueset.c
+++ b/ldap/servers/slapd/valueset.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/* valueset.c - routines for dealing with value sets */
diff --git a/ldap/servers/slapd/vattr.c b/ldap/servers/slapd/vattr.c
index ca360b08..26bdd61f 100644
--- a/ldap/servers/slapd/vattr.c
+++ b/ldap/servers/slapd/vattr.c
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/vattr_spi.h b/ldap/servers/slapd/vattr_spi.h
index c9de3988..99f389a6 100644
--- a/ldap/servers/slapd/vattr_spi.h
+++ b/ldap/servers/slapd/vattr_spi.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/slapd/views.h b/ldap/servers/slapd/views.h
index 10a7b135..349cc5d3 100644
--- a/ldap/servers/slapd/views.h
+++ b/ldap/servers/slapd/views.h
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/