summaryrefslogtreecommitdiffstats
path: root/ldap
diff options
context:
space:
mode:
Diffstat (limited to 'ldap')
-rw-r--r--ldap/Makefile4
-rw-r--r--ldap/Makefile.client4
-rw-r--r--ldap/admin/Makefile4
-rw-r--r--ldap/admin/include/Makefile4
-rw-r--r--ldap/admin/include/dsalib.h4
-rw-r--r--ldap/admin/include/dsalib_pw.h4
-rw-r--r--ldap/admin/include/dsalib_schema.h4
-rw-r--r--ldap/admin/include/nterrors.h4
-rw-r--r--ldap/admin/lib/Makefile4
-rw-r--r--ldap/admin/lib/dsalib_conf.c4
-rw-r--r--ldap/admin/lib/dsalib_confs.c4
-rw-r--r--ldap/admin/lib/dsalib_db.c4
-rw-r--r--ldap/admin/lib/dsalib_debug.c4
-rw-r--r--ldap/admin/lib/dsalib_dn.c4
-rw-r--r--ldap/admin/lib/dsalib_filename.c4
-rw-r--r--ldap/admin/lib/dsalib_html.c4
-rw-r--r--ldap/admin/lib/dsalib_ldif.c4
-rw-r--r--ldap/admin/lib/dsalib_location.c4
-rw-r--r--ldap/admin/lib/dsalib_pw.c4
-rw-r--r--ldap/admin/lib/dsalib_tailf.c4
-rw-r--r--ldap/admin/lib/dsalib_updown.c4
-rw-r--r--ldap/admin/lib/dsalib_util.c4
-rw-r--r--ldap/admin/src/AddPerlHeader.pl4
-rw-r--r--ldap/admin/src/Base.def4
-rw-r--r--ldap/admin/src/Base.pm4
-rw-r--r--ldap/admin/src/CGI_ENV4
-rw-r--r--ldap/admin/src/Cgi.pm4
-rw-r--r--ldap/admin/src/CreateInstall.pl4
-rw-r--r--ldap/admin/src/DSAdmin.def4
-rw-r--r--ldap/admin/src/DSAdmin.mk4
-rw-r--r--ldap/admin/src/DSAdmin.pm4
-rw-r--r--ldap/admin/src/DSAdmin.xs4
-rw-r--r--ldap/admin/src/Inf.pm4
-rw-r--r--ldap/admin/src/Makefile4
-rw-r--r--ldap/admin/src/addindex.c4
-rw-r--r--ldap/admin/src/cfg_sspt.c4
-rw-r--r--ldap/admin/src/cfg_sspt.h4
-rw-r--r--ldap/admin/src/configure_instance.cpp4
-rw-r--r--ldap/admin/src/configure_instance.h4
-rw-r--r--ldap/admin/src/create_instance.c4
-rw-r--r--ldap/admin/src/create_instance.h4
-rw-r--r--ldap/admin/src/ds_bak2db.c4
-rw-r--r--ldap/admin/src/ds_db2bak.c4
-rw-r--r--ldap/admin/src/ds_db2ldif.c4
-rw-r--r--ldap/admin/src/ds_ldif2db.c4
-rw-r--r--ldap/admin/src/ds_listdb.c4
-rw-r--r--ldap/admin/src/ds_remove.c4
-rw-r--r--ldap/admin/src/ds_remove_uninst.cpp4
-rw-r--r--ldap/admin/src/ds_remove_uninst.h4
-rw-r--r--ldap/admin/src/ds_rmdb.c4
-rw-r--r--ldap/admin/src/ds_snmpctrl.c4
-rw-r--r--ldap/admin/src/ds_viewlog.pl4
-rw-r--r--ldap/admin/src/getConfigInfo4
-rwxr-xr-xldap/admin/src/import2info4
-rw-r--r--ldap/admin/src/init_ds_env.c4
-rw-r--r--ldap/admin/src/init_ds_env.h4
-rw-r--r--ldap/admin/src/install_keywords.h4
-rw-r--r--ldap/admin/src/instindex.cpp4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/DSMLReader.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/GetOpt.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java4
-rw-r--r--ldap/admin/src/java/com/netscape/xmltools/Makefile4
-rwxr-xr-xldap/admin/src/java/install4
-rwxr-xr-xldap/admin/src/java/mcc4
-rw-r--r--ldap/admin/src/java/mcc.bat4
-rw-r--r--ldap/admin/src/key.rc4
-rw-r--r--ldap/admin/src/latest_file.c4
-rwxr-xr-xldap/admin/src/logconv.pl4
-rw-r--r--ldap/admin/src/makemccvlvindexes4
-rw-r--r--ldap/admin/src/makevlvindex4
-rw-r--r--ldap/admin/src/makevlvsearch4
-rw-r--r--ldap/admin/src/migrateInstance4
-rw-r--r--ldap/admin/src/migrateLocalDB4
-rw-r--r--ldap/admin/src/migratePwdFile4
-rw-r--r--ldap/admin/src/migrateTo44
-rwxr-xr-xldap/admin/src/migratedsgw4
-rw-r--r--ldap/admin/src/namegen.c4
-rw-r--r--ldap/admin/src/ns-newpwpolicy.pl4
-rw-r--r--ldap/admin/src/restart.c4
-rw-r--r--ldap/admin/src/script-gen.c4
-rw-r--r--ldap/admin/src/scripts/template-bak2db.pl4
-rw-r--r--ldap/admin/src/scripts/template-db2bak.pl4
-rw-r--r--ldap/admin/src/scripts/template-db2index.pl4
-rw-r--r--ldap/admin/src/scripts/template-db2ldif.pl4
-rw-r--r--ldap/admin/src/scripts/template-ldif2db.pl4
-rw-r--r--ldap/admin/src/scripts/template-migrate50to514
-rw-r--r--ldap/admin/src/scripts/template-migrate5to64
-rw-r--r--ldap/admin/src/scripts/template-migrate5to74
-rw-r--r--ldap/admin/src/scripts/template-migrate6to74
-rw-r--r--ldap/admin/src/scripts/template-migrateInstance54
-rw-r--r--ldap/admin/src/scripts/template-migrateInstance64
-rw-r--r--ldap/admin/src/scripts/template-migrateInstance74
-rwxr-xr-xldap/admin/src/scripts/template-migrateTo54
-rw-r--r--ldap/admin/src/scripts/template-migrateTo64
-rw-r--r--ldap/admin/src/scripts/template-migrateTo74
-rw-r--r--ldap/admin/src/scripts/template-ns-accountstatus.pl4
-rw-r--r--ldap/admin/src/scripts/template-ns-activate.pl4
-rw-r--r--ldap/admin/src/scripts/template-ns-inactivate.pl4
-rwxr-xr-xldap/admin/src/scripts/template-ns-newpwpolicy.pl4
-rwxr-xr-xldap/admin/src/scripts/template-repl-monitor-cgi.pl2
-rw-r--r--ldap/admin/src/scripts/template-verify-db.pl2
-rw-r--r--ldap/admin/src/shutdown.c4
-rw-r--r--ldap/admin/src/start.c4
-rw-r--r--ldap/admin/src/uname.lib4
-rwxr-xr-xldap/admin/src/updatedsgw4
-rwxr-xr-xldap/admin/src/upgradeServer4
-rw-r--r--ldap/admin/src/vlvindex.c4
-rw-r--r--ldap/clients/Makefile4
-rw-r--r--ldap/cm/Makefile4
-rw-r--r--ldap/cm/filterfiles.sh4
-rw-r--r--ldap/cm/fixBaseInf.pl4
-rw-r--r--ldap/cm/fixNSPerlInf.pl4
-rw-r--r--ldap/cm/fixPerlDAPInf.pl4
-rw-r--r--ldap/cm/fixSetupInf.pl4
-rw-r--r--ldap/cm/ldapjava.mpw4
-rw-r--r--ldap/cm/nbsp2utf8.sh4
-rw-r--r--ldap/cm/newinst/Makefile4
-rw-r--r--ldap/cm/newinst/fixINF.pl4
-rwxr-xr-xldap/cm/newinst/ns-keygen4
-rwxr-xr-xldap/cm/newinst/ns-update4
-rw-r--r--ldap/cm/newinst/replaceToken.pl4
-rwxr-xr-xldap/cm/newinst/setup2
-rw-r--r--ldap/cm/newinst/slapd.inf4
-rwxr-xr-xldap/cm/newinst/uninstall4
-rw-r--r--ldap/cm/newinst/ux-config.cc4
-rw-r--r--ldap/cm/newinst/ux-config.h7
-rw-r--r--ldap/cm/newinst/ux-dialog.cc4
-rw-r--r--ldap/cm/newinst/ux-dialog.h4
-rw-r--r--ldap/cm/newinst/ux-dsalib_dn.c4
-rw-r--r--ldap/cm/newinst/ux-guesses.cc13
-rw-r--r--ldap/cm/newinstnt/Makefile4
-rw-r--r--ldap/cm/newinstnt/consolinst.c4
-rw-r--r--ldap/cm/newinstnt/consolinst.h4
-rw-r--r--ldap/cm/newinstnt/dsinst.c4
-rw-r--r--ldap/cm/newinstnt/dsinst.h4
-rw-r--r--ldap/cm/newinstnt/dsinst_dsalib_dn.c4
-rw-r--r--ldap/cm/newinstnt/libinst.c4
-rw-r--r--ldap/cm/newinstnt/libinst.h4
-rw-r--r--ldap/cm/newinstnt/setup.inf4
-rw-r--r--ldap/cm/newinstnt/slapd.inf4
-rw-r--r--ldap/cm/ntpack.sh4
-rwxr-xr-xldap/cm/unixstrip4
-rw-r--r--ldap/cm/unixstrip.pl4
-rw-r--r--ldap/cm/v1confs/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-media-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-news-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v1confs/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v1confs/ns-web-schema.conf4
-rw-r--r--ldap/cm/v1confs/slapd.at.conf4
-rw-r--r--ldap/cm/v1confs/slapd.oc.conf4
-rw-r--r--ldap/cm/v3confs/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-media-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-news-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v3confs/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v3confs/ns-web-schema.conf4
-rw-r--r--ldap/cm/v3confs/slapd.at.conf4
-rw-r--r--ldap/cm/v3confs/slapd.oc.conf4
-rw-r--r--ldap/cm/v4confs/40/java-object-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-admin-schema.confbin3032 -> 3017 bytes
-rw-r--r--ldap/cm/v4confs/40/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-common-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-cos-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-delegated-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-legacy-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mcd-browser-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mcd-config-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mcd-li-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mcd-li-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mcd-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-media-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-mlm-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-msg-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-netshare-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-news-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-value-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-wcal-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-wcal-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v4confs/40/ns-web-schema.conf4
-rw-r--r--ldap/cm/v4confs/40/slapd.at.conf4
-rw-r--r--ldap/cm/v4confs/40/slapd.oc.conf4
-rw-r--r--ldap/cm/v4confs/41/java-object-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-common-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-cos-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-delegated-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-legacy-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mcd-browser-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mcd-config-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mcd-li-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mcd-li-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mcd-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-media-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-mlm-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-msg-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-netshare-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-news-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-value-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-wcal-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-wcal-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v4confs/41/ns-web-schema.conf4
-rw-r--r--ldap/cm/v4confs/41/slapd.at.conf4
-rw-r--r--ldap/cm/v4confs/41/slapd.oc.conf4
-rw-r--r--ldap/cm/v4confs/411/java-object-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-common-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-cos-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-delegated-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-legacy-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mcd-browser-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mcd-config-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mcd-li-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mcd-li-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mcd-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-media-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-mlm-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-msg-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-netshare-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-news-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-value-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-wcal-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-wcal-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v4confs/411/ns-web-schema.conf4
-rw-r--r--ldap/cm/v4confs/411/slapd.at.conf4
-rw-r--r--ldap/cm/v4confs/411/slapd.oc.conf4
-rw-r--r--ldap/cm/v4confs/412/java-object-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-calendar-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-calendar-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-certificate-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-certificate-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-common-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-compass-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-compass-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-cos-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-delegated-admin-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-directory-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-directory-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-legacy-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mail-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mcd-browser-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mcd-config-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mcd-li-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mcd-li-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mcd-mail-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-media-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-media-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-mlm-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-msg-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-netshare-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-news-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-news-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-proxy-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-proxy-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-value-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-wcal-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-wcal-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-web-globopt.conf4
-rw-r--r--ldap/cm/v4confs/412/ns-web-schema.conf4
-rw-r--r--ldap/cm/v4confs/412/slapd.at.conf4
-rw-r--r--ldap/cm/v4confs/412/slapd.oc.conf4
-rw-r--r--ldap/dsml/European.dsml4
-rw-r--r--ldap/dsml/Example-roles.dsml4
-rw-r--r--ldap/dsml/Example.dsml4
-rw-r--r--ldap/include/Makefile4
-rw-r--r--ldap/include/Makefile.client4
-rw-r--r--ldap/include/avl.h4
-rw-r--r--ldap/include/dblayer.h4
-rw-r--r--ldap/include/dirlite_strings.h4
-rw-r--r--ldap/include/disptmpl.h4
-rw-r--r--ldap/include/ldaplog.h4
-rw-r--r--ldap/include/ldaprot.h4
-rw-r--r--ldap/include/ldbm.h4
-rw-r--r--ldap/include/ldif.h4
-rw-r--r--ldap/include/litekey.h4
-rw-r--r--ldap/include/lthread.h4
-rw-r--r--ldap/include/ntslapdregparms.h4
-rw-r--r--ldap/include/ntwatchdog.h4
-rw-r--r--ldap/include/portable.h4
-rw-r--r--ldap/include/proto-ntutil.h4
-rw-r--r--ldap/include/regex.h4
-rw-r--r--ldap/include/srchpref.h4
-rw-r--r--ldap/include/sysexits-compat.h4
-rw-r--r--ldap/javarules.mk4
-rw-r--r--ldap/ldif/Ace.ldif4
-rw-r--r--ldap/ldif/European.ldif4
-rw-r--r--ldap/ldif/Eurosuffix.ldif4
-rw-r--r--ldap/ldif/Example-roles.ldif4
-rw-r--r--ldap/ldif/Example-views.ldif4
-rw-r--r--ldap/ldif/Example.ldif4
-rw-r--r--ldap/ldif/commonTasks.ldif4
-rw-r--r--ldap/ldif/roledit.ldif4
-rw-r--r--ldap/ldif/tasks.ldif4
-rw-r--r--ldap/ldif/template.ldif4
-rw-r--r--ldap/libraries/Makefile4
-rw-r--r--ldap/libraries/Makefile.client4
-rw-r--r--ldap/libraries/libavl/Makefile4
-rw-r--r--ldap/libraries/libavl/avl.c4
-rw-r--r--ldap/libraries/libavl/testavl.c4
-rw-r--r--ldap/libraries/libldif/Makefile4
-rw-r--r--ldap/libraries/libldif/fileurl.c4
-rw-r--r--ldap/libraries/libldif/fileurl.h4
-rw-r--r--ldap/libraries/liblitekey/Makefile4
-rw-r--r--ldap/libraries/liblitekey/keycheck.c4
-rw-r--r--ldap/libraries/libutil/Makefile4
-rw-r--r--ldap/libraries/libutil/ntdebug.c4
-rw-r--r--ldap/libraries/libutil/ntevent.c4
-rw-r--r--ldap/libraries/libutil/ntreg.c4
-rw-r--r--ldap/libraries/libutil/ntresource.h4
-rw-r--r--ldap/libraries/libutil/ntstubs.c4
-rw-r--r--ldap/nsdeps.mk4
-rw-r--r--ldap/nsldap.mk4
-rw-r--r--ldap/schema/00core.ldif4
-rw-r--r--ldap/schema/05rfc2247.ldif4
-rw-r--r--ldap/schema/05rfc2927.ldif4
-rw-r--r--ldap/schema/10presence.ldif4
-rw-r--r--ldap/schema/10rfc2307.ldif4
-rw-r--r--ldap/schema/20subscriber.ldif4
-rw-r--r--ldap/schema/25java-object.ldif4
-rw-r--r--ldap/schema/28pilot.ldif4
-rw-r--r--ldap/schema/30ns-common.ldif4
-rw-r--r--ldap/schema/50ns-admin.ldif4
-rw-r--r--ldap/schema/50ns-calendar.ldif4
-rw-r--r--ldap/schema/50ns-certificate.ldif4
-rw-r--r--ldap/schema/50ns-compass.ldif4
-rw-r--r--ldap/schema/50ns-delegated-admin.ldif4
-rw-r--r--ldap/schema/50ns-directory.ldif4
-rw-r--r--ldap/schema/50ns-legacy.ldif4
-rw-r--r--ldap/schema/50ns-mail.ldif4
-rw-r--r--ldap/schema/50ns-mcd-browser.ldif4
-rw-r--r--ldap/schema/50ns-mcd-config.ldif4
-rw-r--r--ldap/schema/50ns-mcd-li.ldif4
-rw-r--r--ldap/schema/50ns-mcd-mail.ldif4
-rw-r--r--ldap/schema/50ns-media.ldif4
-rw-r--r--ldap/schema/50ns-mlm.ldif4
-rw-r--r--ldap/schema/50ns-msg.ldif4
-rw-r--r--ldap/schema/50ns-netshare.ldif4
-rw-r--r--ldap/schema/50ns-news.ldif4
-rw-r--r--ldap/schema/50ns-proxy.ldif4
-rw-r--r--ldap/schema/50ns-value.ldif4
-rw-r--r--ldap/schema/50ns-wcal.ldif4
-rw-r--r--ldap/schema/50ns-web.ldif4
-rw-r--r--ldap/schema/51ns-calendar.ldif4
-rw-r--r--ldap/schema/60pam-plugin.ldif2
-rw-r--r--ldap/schema/99user.ldif4
-rw-r--r--ldap/schema/ns-calendar-globopt.conf4
-rw-r--r--ldap/schema/ns-certificate-globopt.conf4
-rw-r--r--ldap/schema/ns-compass-globopt.conf4
-rw-r--r--ldap/schema/ns-directory-globopt.conf4
-rw-r--r--ldap/schema/ns-mail-globopt.conf4
-rw-r--r--ldap/schema/ns-mcd-li-globopt.conf4
-rw-r--r--ldap/schema/ns-media-globopt.conf4
-rw-r--r--ldap/schema/ns-news-globopt.conf4
-rw-r--r--ldap/schema/ns-proxy-globopt.conf4
-rw-r--r--ldap/schema/ns-wcal-globopt.conf4
-rw-r--r--ldap/schema/ns-web-globopt.conf4
-rw-r--r--ldap/schema/slapd-collations.conf4
-rw-r--r--ldap/servers/Makefile4
-rw-r--r--ldap/servers/plugins/Makefile4
-rw-r--r--ldap/servers/plugins/acl/ACL-Notes4
-rw-r--r--ldap/servers/plugins/acl/Makefile4
-rw-r--r--ldap/servers/plugins/acl/acl.c4
-rw-r--r--ldap/servers/plugins/acl/acl.h4
-rw-r--r--ldap/servers/plugins/acl/acl_ext.c4
-rw-r--r--ldap/servers/plugins/acl/aclanom.c4
-rw-r--r--ldap/servers/plugins/acl/acldllmain.c4
-rw-r--r--ldap/servers/plugins/acl/acleffectiverights.c2
-rw-r--r--ldap/servers/plugins/acl/aclgroup.c4
-rw-r--r--ldap/servers/plugins/acl/aclinit.c4
-rw-r--r--ldap/servers/plugins/acl/acllas.c4
-rw-r--r--ldap/servers/plugins/acl/acllist.c4
-rw-r--r--ldap/servers/plugins/acl/aclparse.c4
-rw-r--r--ldap/servers/plugins/acl/aclplugin.c4
-rw-r--r--ldap/servers/plugins/acl/aclproxy.c4
-rw-r--r--ldap/servers/plugins/acl/aclutil.c4
-rw-r--r--ldap/servers/plugins/acl/libacl.def4
-rw-r--r--ldap/servers/plugins/chainingdb/Makefile4
-rw-r--r--ldap/servers/plugins/chainingdb/cb.h4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_abandon.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_acl.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_add.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_bind.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_cleanup.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_close.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_compare.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_config.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_conn_stateless.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_controls.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_debug.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_delete.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_init.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_instance.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_modify.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_modrdn.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_monitor.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_schema.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_search.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_size.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_start.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_temp.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_test.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_unbind.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cb_utils.c4
-rw-r--r--ldap/servers/plugins/chainingdb/cbdllmain.c4
-rw-r--r--ldap/servers/plugins/chainingdb/libcb.def4
-rw-r--r--ldap/servers/plugins/collation/Makefile4
-rw-r--r--ldap/servers/plugins/collation/collate.c4
-rw-r--r--ldap/servers/plugins/collation/collate.h4
-rw-r--r--ldap/servers/plugins/collation/collation.def4
-rw-r--r--ldap/servers/plugins/collation/config.c4
-rw-r--r--ldap/servers/plugins/collation/config.h4
-rw-r--r--ldap/servers/plugins/collation/debug.c4
-rw-r--r--ldap/servers/plugins/collation/dllmain.c4
-rw-r--r--ldap/servers/plugins/collation/orfilter.c4
-rw-r--r--ldap/servers/plugins/collation/orfilter.h4
-rw-r--r--ldap/servers/plugins/cos/Makefile4
-rw-r--r--ldap/servers/plugins/cos/cos.c4
-rw-r--r--ldap/servers/plugins/cos/cos.def4
-rw-r--r--ldap/servers/plugins/cos/cos_cache.c4
-rw-r--r--ldap/servers/plugins/cos/cos_cache.h4
-rw-r--r--ldap/servers/plugins/cos/dllmain.c4
-rw-r--r--ldap/servers/plugins/pam_passthru/Makefile2
-rw-r--r--ldap/servers/plugins/pam_passthru/README2
-rw-r--r--ldap/servers/plugins/pam_passthru/libpam_passthru.def2
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_passthru.h2
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_ptconfig.c2
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_ptdebug.c2
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_ptdllmain.c2
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_ptimpl.c2
-rw-r--r--ldap/servers/plugins/pam_passthru/pam_ptpreop.c2
-rw-r--r--ldap/servers/plugins/passthru/Makefile4
-rw-r--r--ldap/servers/plugins/passthru/PT-Notes4
-rw-r--r--ldap/servers/plugins/passthru/libpassthru.def4
-rw-r--r--ldap/servers/plugins/passthru/passthru.h4
-rw-r--r--ldap/servers/plugins/passthru/ptbind.c4
-rw-r--r--ldap/servers/plugins/passthru/ptconfig.c4
-rw-r--r--ldap/servers/plugins/passthru/ptconn.c4
-rw-r--r--ldap/servers/plugins/passthru/ptdebug.c4
-rw-r--r--ldap/servers/plugins/passthru/ptdllmain.c4
-rw-r--r--ldap/servers/plugins/passthru/ptpreop.c4
-rw-r--r--ldap/servers/plugins/passthru/ptutil.c4
-rw-r--r--ldap/servers/plugins/presence/Makefile4
-rw-r--r--ldap/servers/plugins/presence/dllmain.c4
-rw-r--r--ldap/servers/plugins/presence/presence.c4
-rw-r--r--ldap/servers/plugins/presence/presence.def4
-rw-r--r--ldap/servers/plugins/pwdstorage/Makefile4
-rw-r--r--ldap/servers/plugins/pwdstorage/clear_pwd.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/crypt_pwd.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/dllmain.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/libpwdstorage.def4
-rw-r--r--ldap/servers/plugins/pwdstorage/md5.h4
-rw-r--r--ldap/servers/plugins/pwdstorage/md5c.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.bu4
-rw-r--r--ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/pwd_init.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/pwdstorage.h4
-rw-r--r--ldap/servers/plugins/pwdstorage/sha_pwd.c4
-rw-r--r--ldap/servers/plugins/pwdstorage/ssha_pwd.c4
-rw-r--r--ldap/servers/plugins/referint/Makefile4
-rw-r--r--ldap/servers/plugins/referint/dllmain.c4
-rw-r--r--ldap/servers/plugins/referint/referint.c4
-rw-r--r--ldap/servers/plugins/referint/referint.def4
-rw-r--r--ldap/servers/plugins/replication/Makefile4
-rw-r--r--ldap/servers/plugins/replication/cl4.h4
-rw-r--r--ldap/servers/plugins/replication/cl4_api.c4
-rw-r--r--ldap/servers/plugins/replication/cl4_api.h4
-rw-r--r--ldap/servers/plugins/replication/cl4_init.c4
-rw-r--r--ldap/servers/plugins/replication/cl5.h4
-rw-r--r--ldap/servers/plugins/replication/cl5_api.c4
-rw-r--r--ldap/servers/plugins/replication/cl5_api.h4
-rw-r--r--ldap/servers/plugins/replication/cl5_clcache.c2
-rw-r--r--ldap/servers/plugins/replication/cl5_clcache.h4
-rw-r--r--ldap/servers/plugins/replication/cl5_config.c4
-rw-r--r--ldap/servers/plugins/replication/cl5_init.c4
-rw-r--r--ldap/servers/plugins/replication/cl5_test.c4
-rw-r--r--ldap/servers/plugins/replication/cl5_test.h4
-rw-r--r--ldap/servers/plugins/replication/csnpl.c4
-rw-r--r--ldap/servers/plugins/replication/csnpl.h4
-rw-r--r--ldap/servers/plugins/replication/dllmain.c4
-rw-r--r--ldap/servers/plugins/replication/legacy_consumer.c4
-rw-r--r--ldap/servers/plugins/replication/llist.c4
-rw-r--r--ldap/servers/plugins/replication/llist.h4
-rw-r--r--ldap/servers/plugins/replication/profile.c4
-rw-r--r--ldap/servers/plugins/replication/repl.h4
-rw-r--r--ldap/servers/plugins/replication/repl5.h4
-rw-r--r--ldap/servers/plugins/replication/repl5_agmt.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_agmtlist.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_backoff.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_connection.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_inc_protocol.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_init.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_mtnode_ext.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_plugins.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_prot_private.h4
-rw-r--r--ldap/servers/plugins/replication/repl5_protocol.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_protocol_util.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_replica.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_replica_config.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_replica_dnhash.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_replica_hash.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_replsupplier.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_ruv.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_ruv.h4
-rw-r--r--ldap/servers/plugins/replication/repl5_schedule.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_tot_protocol.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_total.c4
-rw-r--r--ldap/servers/plugins/replication/repl5_updatedn_list.c4
-rw-r--r--ldap/servers/plugins/replication/repl_add.c4
-rw-r--r--ldap/servers/plugins/replication/repl_bind.c4
-rw-r--r--ldap/servers/plugins/replication/repl_compare.c4
-rw-r--r--ldap/servers/plugins/replication/repl_connext.c4
-rw-r--r--ldap/servers/plugins/replication/repl_controls.c4
-rw-r--r--ldap/servers/plugins/replication/repl_delete.c4
-rw-r--r--ldap/servers/plugins/replication/repl_entry.c4
-rw-r--r--ldap/servers/plugins/replication/repl_ext.c4
-rw-r--r--ldap/servers/plugins/replication/repl_extop.c4
-rw-r--r--ldap/servers/plugins/replication/repl_globals.c4
-rw-r--r--ldap/servers/plugins/replication/repl_helper.c4
-rw-r--r--ldap/servers/plugins/replication/repl_helper.h4
-rw-r--r--ldap/servers/plugins/replication/repl_init.c4
-rw-r--r--ldap/servers/plugins/replication/repl_modify.c4
-rw-r--r--ldap/servers/plugins/replication/repl_modrdn.c4
-rw-r--r--ldap/servers/plugins/replication/repl_monitor.c4
-rw-r--r--ldap/servers/plugins/replication/repl_objset.c4
-rw-r--r--ldap/servers/plugins/replication/repl_objset.h4
-rw-r--r--ldap/servers/plugins/replication/repl_opext.c4
-rw-r--r--ldap/servers/plugins/replication/repl_ops.c4
-rw-r--r--ldap/servers/plugins/replication/repl_rootdse.c4
-rw-r--r--ldap/servers/plugins/replication/repl_search.c4
-rw-r--r--ldap/servers/plugins/replication/repl_shared.h4
-rw-r--r--ldap/servers/plugins/replication/replication.def4
-rw-r--r--ldap/servers/plugins/replication/replutil.c4
-rw-r--r--ldap/servers/plugins/replication/tests/dnp_sim.c4
-rw-r--r--ldap/servers/plugins/replication/tests/dnp_sim2.c4
-rw-r--r--ldap/servers/plugins/replication/tests/dnp_sim3.c4
-rwxr-xr-xldap/servers/plugins/replication/tests/makesim4
-rw-r--r--ldap/servers/plugins/replication/urp.c4
-rw-r--r--ldap/servers/plugins/replication/urp.h4
-rw-r--r--ldap/servers/plugins/replication/urp_glue.c4
-rw-r--r--ldap/servers/plugins/replication/urp_tombstone.c4
-rw-r--r--ldap/servers/plugins/retrocl/Makefile4
-rw-r--r--ldap/servers/plugins/retrocl/dllmain.c4
-rw-r--r--ldap/servers/plugins/retrocl/linktest.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl.def4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl.h4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl.txt4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl_cn.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl_create.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl_po.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl_rootdse.c4
-rw-r--r--ldap/servers/plugins/retrocl/retrocl_trim.c4
-rw-r--r--ldap/servers/plugins/rever/Makefile4
-rw-r--r--ldap/servers/plugins/rever/des.c4
-rw-r--r--ldap/servers/plugins/rever/dllmain.c4
-rw-r--r--ldap/servers/plugins/rever/libdes.def4
-rw-r--r--ldap/servers/plugins/rever/rever.c4
-rw-r--r--ldap/servers/plugins/rever/rever.h4
-rw-r--r--ldap/servers/plugins/roles/Makefile4
-rw-r--r--ldap/servers/plugins/roles/dllmain.c4
-rw-r--r--ldap/servers/plugins/roles/roles.def4
-rw-r--r--ldap/servers/plugins/roles/roles_cache.c4
-rw-r--r--ldap/servers/plugins/roles/roles_cache.h4
-rw-r--r--ldap/servers/plugins/roles/roles_plugin.c4
-rw-r--r--ldap/servers/plugins/shared/Makefile4
-rw-r--r--ldap/servers/plugins/shared/plugin-utils.h4
-rw-r--r--ldap/servers/plugins/shared/utils.c4
-rw-r--r--ldap/servers/plugins/statechange/Makefile4
-rw-r--r--ldap/servers/plugins/statechange/dllmain.c4
-rw-r--r--ldap/servers/plugins/statechange/statechange.c4
-rw-r--r--ldap/servers/plugins/statechange/statechange.def4
-rw-r--r--ldap/servers/plugins/syntaxes/Makefile4
-rw-r--r--ldap/servers/plugins/syntaxes/bin.c4
-rw-r--r--ldap/servers/plugins/syntaxes/ces.c4
-rw-r--r--ldap/servers/plugins/syntaxes/cis.c4
-rw-r--r--ldap/servers/plugins/syntaxes/debug.c4
-rw-r--r--ldap/servers/plugins/syntaxes/dllmain.c4
-rw-r--r--ldap/servers/plugins/syntaxes/dn.c4
-rw-r--r--ldap/servers/plugins/syntaxes/int.c4
-rw-r--r--ldap/servers/plugins/syntaxes/libsyntax.def4
-rw-r--r--ldap/servers/plugins/syntaxes/phonetic.c4
-rw-r--r--ldap/servers/plugins/syntaxes/sicis.c2
-rw-r--r--ldap/servers/plugins/syntaxes/string.c4
-rw-r--r--ldap/servers/plugins/syntaxes/syntax.h4
-rw-r--r--ldap/servers/plugins/syntaxes/tel.c4
-rw-r--r--ldap/servers/plugins/syntaxes/value.c4
-rw-r--r--ldap/servers/plugins/uiduniq/7bit.c4
-rw-r--r--ldap/servers/plugins/uiduniq/Makefile4
-rw-r--r--ldap/servers/plugins/uiduniq/UID-Notes4
-rw-r--r--ldap/servers/plugins/uiduniq/libuiduniq.def4
-rw-r--r--ldap/servers/plugins/uiduniq/uid.c4
-rw-r--r--ldap/servers/plugins/vattrsp_template/Makefile4
-rw-r--r--ldap/servers/plugins/vattrsp_template/dllmain.c4
-rw-r--r--ldap/servers/plugins/vattrsp_template/vattrsp.c4
-rw-r--r--ldap/servers/plugins/vattrsp_template/vattrsp.def4
-rw-r--r--ldap/servers/plugins/views/Makefile4
-rw-r--r--ldap/servers/plugins/views/dllmain.c4
-rw-r--r--ldap/servers/plugins/views/views.c4
-rw-r--r--ldap/servers/plugins/views/views.def4
-rw-r--r--ldap/servers/slapd/Makefile4
-rw-r--r--ldap/servers/slapd/abandon.c4
-rw-r--r--ldap/servers/slapd/add.c4
-rw-r--r--ldap/servers/slapd/agtmmap.c4
-rw-r--r--ldap/servers/slapd/agtmmap.h4
-rw-r--r--ldap/servers/slapd/apibroker.c4
-rw-r--r--ldap/servers/slapd/attr.c4
-rw-r--r--ldap/servers/slapd/attrlist.c4
-rw-r--r--ldap/servers/slapd/attrsyntax.c4
-rw-r--r--ldap/servers/slapd/auditlog.c4
-rw-r--r--ldap/servers/slapd/auth.c4
-rw-r--r--ldap/servers/slapd/auth.h4
-rw-r--r--ldap/servers/slapd/ava.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/Makefile4
-rw-r--r--ldap/servers/slapd/back-ldbm/ancestorid.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/archive.c4
-rw-r--r--ldap/servers/slapd/back-ldbm/attrcrypt.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
-rw-r--r--ldap/servers/snmp/Makefile4
-rw-r--r--ldap/servers/snmp/netscape-ldap.mib4
-rw-r--r--ldap/servers/snmp/ntagt/Makefile4
-rw-r--r--ldap/servers/snmp/ntagt/msrvdefs.mak4
-rw-r--r--ldap/servers/snmp/ntagt/nslagtcom_nt.h4
-rw-r--r--ldap/servers/snmp/ntagt/nsldapagt_nt.c4
-rw-r--r--ldap/servers/snmp/ntagt/nsldapagt_nt.def4
-rw-r--r--ldap/servers/snmp/ntagt/nsldapagt_nt.h4
-rw-r--r--ldap/servers/snmp/ntagt/nsldapmib_nt.c4
-rw-r--r--ldap/servers/snmp/ntagt/nsldapmib_nt.h4
-rw-r--r--ldap/systools/Makefile4
-rw-r--r--ldap/systools/idsktune.c4
-rw-r--r--ldap/systools/pio.c4
-rw-r--r--ldap/systools/pio.h4
-rw-r--r--ldap/systools/viewcore.c4
1001 files changed, 1990 insertions, 1979 deletions
diff --git a/ldap/Makefile b/ldap/Makefile
index 40f8c134..94b2e0ad 100644
--- a/ldap/Makefile
+++ b/ldap/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/Makefile.client b/ldap/Makefile.client
index b6688141..fc6a13ad 100644
--- a/ldap/Makefile.client
+++ b/ldap/Makefile.client
@@ -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/admin/Makefile b/ldap/admin/Makefile
index 3f8ba6e0..460c789c 100644
--- a/ldap/admin/Makefile
+++ b/ldap/admin/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/admin/include/Makefile b/ldap/admin/include/Makefile
index 77cfa706..22b331eb 100644
--- a/ldap/admin/include/Makefile
+++ b/ldap/admin/include/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/admin/include/dsalib.h b/ldap/admin/include/dsalib.h
index c00f6cb0..e7f1378e 100644
--- a/ldap/admin/include/dsalib.h
+++ b/ldap/admin/include/dsalib.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/admin/include/dsalib_pw.h b/ldap/admin/include/dsalib_pw.h
index 78c22c11..bd4fba38 100644
--- a/ldap/admin/include/dsalib_pw.h
+++ b/ldap/admin/include/dsalib_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 **/
diff --git a/ldap/admin/include/dsalib_schema.h b/ldap/admin/include/dsalib_schema.h
index ff3488eb..913ac0b1 100644
--- a/ldap/admin/include/dsalib_schema.h
+++ b/ldap/admin/include/dsalib_schema.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/admin/include/nterrors.h b/ldap/admin/include/nterrors.h
index a15c9ea0..c2d26a22 100644
--- a/ldap/admin/include/nterrors.h
+++ b/ldap/admin/include/nterrors.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 **/
/* DO NOT EDIT THIS FILE - it is automatically generated */
diff --git a/ldap/admin/lib/Makefile b/ldap/admin/lib/Makefile
index b5b6b0f8..7f5e7011 100644
--- a/ldap/admin/lib/Makefile
+++ b/ldap/admin/lib/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/admin/lib/dsalib_conf.c b/ldap/admin/lib/dsalib_conf.c
index cc331619..c9156020 100644
--- a/ldap/admin/lib/dsalib_conf.c
+++ b/ldap/admin/lib/dsalib_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 **/
#if defined( XP_WIN32 )
diff --git a/ldap/admin/lib/dsalib_confs.c b/ldap/admin/lib/dsalib_confs.c
index ccaf8bd9..565315dd 100644
--- a/ldap/admin/lib/dsalib_confs.c
+++ b/ldap/admin/lib/dsalib_confs.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/admin/lib/dsalib_db.c b/ldap/admin/lib/dsalib_db.c
index 02d9498f..dbef2a6f 100644
--- a/ldap/admin/lib/dsalib_db.c
+++ b/ldap/admin/lib/dsalib_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 **/
#if defined( XP_WIN32 )
diff --git a/ldap/admin/lib/dsalib_debug.c b/ldap/admin/lib/dsalib_debug.c
index 4819a94d..fd0ae631 100644
--- a/ldap/admin/lib/dsalib_debug.c
+++ b/ldap/admin/lib/dsalib_debug.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( XP_WIN32 )
diff --git a/ldap/admin/lib/dsalib_dn.c b/ldap/admin/lib/dsalib_dn.c
index d7de36d9..89f03f1f 100644
--- a/ldap/admin/lib/dsalib_dn.c
+++ b/ldap/admin/lib/dsalib_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 **/
diff --git a/ldap/admin/lib/dsalib_filename.c b/ldap/admin/lib/dsalib_filename.c
index e7ecfb12..bce6e3f4 100644
--- a/ldap/admin/lib/dsalib_filename.c
+++ b/ldap/admin/lib/dsalib_filename.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( XP_WIN32 )
diff --git a/ldap/admin/lib/dsalib_html.c b/ldap/admin/lib/dsalib_html.c
index cffae406..5ed44f0c 100644
--- a/ldap/admin/lib/dsalib_html.c
+++ b/ldap/admin/lib/dsalib_html.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( XP_WIN32 )
diff --git a/ldap/admin/lib/dsalib_ldif.c b/ldap/admin/lib/dsalib_ldif.c
index 94c0d77f..262cbc9c 100644
--- a/ldap/admin/lib/dsalib_ldif.c
+++ b/ldap/admin/lib/dsalib_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 **/
#if defined( XP_WIN32 )
diff --git a/ldap/admin/lib/dsalib_location.c b/ldap/admin/lib/dsalib_location.c
index 06cbafb5..53dc5a2f 100644
--- a/ldap/admin/lib/dsalib_location.c
+++ b/ldap/admin/lib/dsalib_location.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( XP_WIN32 )
diff --git a/ldap/admin/lib/dsalib_pw.c b/ldap/admin/lib/dsalib_pw.c
index 21fd8ecb..6b224514 100644
--- a/ldap/admin/lib/dsalib_pw.c
+++ b/ldap/admin/lib/dsalib_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/admin/lib/dsalib_tailf.c b/ldap/admin/lib/dsalib_tailf.c
index 04e04578..db539479 100644
--- a/ldap/admin/lib/dsalib_tailf.c
+++ b/ldap/admin/lib/dsalib_tailf.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( XP_WIN32 )
diff --git a/ldap/admin/lib/dsalib_updown.c b/ldap/admin/lib/dsalib_updown.c
index 4f041208..e151e963 100644
--- a/ldap/admin/lib/dsalib_updown.c
+++ b/ldap/admin/lib/dsalib_updown.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( XP_WIN32 )
diff --git a/ldap/admin/lib/dsalib_util.c b/ldap/admin/lib/dsalib_util.c
index a6cf4bee..6c6f336c 100644
--- a/ldap/admin/lib/dsalib_util.c
+++ b/ldap/admin/lib/dsalib_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 **/
#if defined( XP_WIN32 )
diff --git a/ldap/admin/src/AddPerlHeader.pl b/ldap/admin/src/AddPerlHeader.pl
index a3be11b5..0cee179c 100644
--- a/ldap/admin/src/AddPerlHeader.pl
+++ b/ldap/admin/src/AddPerlHeader.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/admin/src/Base.def b/ldap/admin/src/Base.def
index ff1d1451..38fbd9f1 100644
--- a/ldap/admin/src/Base.def
+++ b/ldap/admin/src/Base.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/admin/src/Base.pm b/ldap/admin/src/Base.pm
index cbebf192..84ce9c89 100644
--- a/ldap/admin/src/Base.pm
+++ b/ldap/admin/src/Base.pm
@@ -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/admin/src/CGI_ENV b/ldap/admin/src/CGI_ENV
index d96d3ff8..d56007de 100644
--- a/ldap/admin/src/CGI_ENV
+++ b/ldap/admin/src/CGI_ENV
@@ -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/admin/src/Cgi.pm b/ldap/admin/src/Cgi.pm
index aba11e75..d4f0ba6a 100644
--- a/ldap/admin/src/Cgi.pm
+++ b/ldap/admin/src/Cgi.pm
@@ -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/admin/src/CreateInstall.pl b/ldap/admin/src/CreateInstall.pl
index 51714683..5309f74d 100644
--- a/ldap/admin/src/CreateInstall.pl
+++ b/ldap/admin/src/CreateInstall.pl
@@ -1,8 +1,8 @@
#!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/admin/src/DSAdmin.def b/ldap/admin/src/DSAdmin.def
index a27ea129..b9300e86 100644
--- a/ldap/admin/src/DSAdmin.def
+++ b/ldap/admin/src/DSAdmin.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/admin/src/DSAdmin.mk b/ldap/admin/src/DSAdmin.mk
index a48ca84e..65fab488 100644
--- a/ldap/admin/src/DSAdmin.mk
+++ b/ldap/admin/src/DSAdmin.mk
@@ -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/admin/src/DSAdmin.pm b/ldap/admin/src/DSAdmin.pm
index a8578a32..8464ebf4 100644
--- a/ldap/admin/src/DSAdmin.pm
+++ b/ldap/admin/src/DSAdmin.pm
@@ -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/admin/src/DSAdmin.xs b/ldap/admin/src/DSAdmin.xs
index 22d862ce..257691a0 100644
--- a/ldap/admin/src/DSAdmin.xs
+++ b/ldap/admin/src/DSAdmin.xs
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 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/admin/src/Inf.pm b/ldap/admin/src/Inf.pm
index 41d6458a..d89ce16a 100644
--- a/ldap/admin/src/Inf.pm
+++ b/ldap/admin/src/Inf.pm
@@ -1,8 +1,8 @@
#!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/admin/src/Makefile b/ldap/admin/src/Makefile
index dacce7c8..a9e44e2e 100644
--- a/ldap/admin/src/Makefile
+++ b/ldap/admin/src/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/admin/src/addindex.c b/ldap/admin/src/addindex.c
index 7e9e2671..71813524 100644
--- a/ldap/admin/src/addindex.c
+++ b/ldap/admin/src/addindex.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/admin/src/cfg_sspt.c b/ldap/admin/src/cfg_sspt.c
index 2ff883d3..d6cb060a 100644
--- a/ldap/admin/src/cfg_sspt.c
+++ b/ldap/admin/src/cfg_sspt.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/admin/src/cfg_sspt.h b/ldap/admin/src/cfg_sspt.h
index a27d9891..0a86fb1a 100644
--- a/ldap/admin/src/cfg_sspt.h
+++ b/ldap/admin/src/cfg_sspt.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 __cfg_sspt_h
diff --git a/ldap/admin/src/configure_instance.cpp b/ldap/admin/src/configure_instance.cpp
index f66c8015..860e8c78 100644
--- a/ldap/admin/src/configure_instance.cpp
+++ b/ldap/admin/src/configure_instance.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/admin/src/configure_instance.h b/ldap/admin/src/configure_instance.h
index 3da7670d..33a0e2d4 100644
--- a/ldap/admin/src/configure_instance.h
+++ b/ldap/admin/src/configure_instance.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/admin/src/create_instance.c b/ldap/admin/src/create_instance.c
index d2f4f7c5..ce713040 100644
--- a/ldap/admin/src/create_instance.c
+++ b/ldap/admin/src/create_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 **/
/*
diff --git a/ldap/admin/src/create_instance.h b/ldap/admin/src/create_instance.h
index d1f7c5c3..a4799fb1 100644
--- a/ldap/admin/src/create_instance.h
+++ b/ldap/admin/src/create_instance.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/admin/src/ds_bak2db.c b/ldap/admin/src/ds_bak2db.c
index d4ce49e4..26c54a78 100644
--- a/ldap/admin/src/ds_bak2db.c
+++ b/ldap/admin/src/ds_bak2db.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/admin/src/ds_db2bak.c b/ldap/admin/src/ds_db2bak.c
index bca6bce5..2a40273d 100644
--- a/ldap/admin/src/ds_db2bak.c
+++ b/ldap/admin/src/ds_db2bak.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/admin/src/ds_db2ldif.c b/ldap/admin/src/ds_db2ldif.c
index 42c755a4..95d18685 100644
--- a/ldap/admin/src/ds_db2ldif.c
+++ b/ldap/admin/src/ds_db2ldif.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/admin/src/ds_ldif2db.c b/ldap/admin/src/ds_ldif2db.c
index f98c47da..ef1ee4f0 100644
--- a/ldap/admin/src/ds_ldif2db.c
+++ b/ldap/admin/src/ds_ldif2db.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/admin/src/ds_listdb.c b/ldap/admin/src/ds_listdb.c
index 5d0c06ad..1f4b1531 100644
--- a/ldap/admin/src/ds_listdb.c
+++ b/ldap/admin/src/ds_listdb.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/admin/src/ds_remove.c b/ldap/admin/src/ds_remove.c
index c9fa8020..bb920ab9 100644
--- a/ldap/admin/src/ds_remove.c
+++ b/ldap/admin/src/ds_remove.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/admin/src/ds_remove_uninst.cpp b/ldap/admin/src/ds_remove_uninst.cpp
index d38de4fa..a2495f43 100644
--- a/ldap/admin/src/ds_remove_uninst.cpp
+++ b/ldap/admin/src/ds_remove_uninst.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 **/
// ds_remove_uninst.cpp
diff --git a/ldap/admin/src/ds_remove_uninst.h b/ldap/admin/src/ds_remove_uninst.h
index 15c28c59..6ae7e4bb 100644
--- a/ldap/admin/src/ds_remove_uninst.h
+++ b/ldap/admin/src/ds_remove_uninst.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 **/
/* ds_remove_uninst.h */
diff --git a/ldap/admin/src/ds_rmdb.c b/ldap/admin/src/ds_rmdb.c
index 08a1bb7c..a2701781 100644
--- a/ldap/admin/src/ds_rmdb.c
+++ b/ldap/admin/src/ds_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/admin/src/ds_snmpctrl.c b/ldap/admin/src/ds_snmpctrl.c
index e2a40b6d..83c32a1d 100644
--- a/ldap/admin/src/ds_snmpctrl.c
+++ b/ldap/admin/src/ds_snmpctrl.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/admin/src/ds_viewlog.pl b/ldap/admin/src/ds_viewlog.pl
index d5f171ef..1ec8ff25 100644
--- a/ldap/admin/src/ds_viewlog.pl
+++ b/ldap/admin/src/ds_viewlog.pl
@@ -1,8 +1,8 @@
#!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/admin/src/getConfigInfo b/ldap/admin/src/getConfigInfo
index 5ba1d20d..c3874dd9 100644
--- a/ldap/admin/src/getConfigInfo
+++ b/ldap/admin/src/getConfigInfo
@@ -1,8 +1,8 @@
#!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/admin/src/import2info b/ldap/admin/src/import2info
index 5429d71d..5204a59b 100755
--- a/ldap/admin/src/import2info
+++ b/ldap/admin/src/import2info
@@ -1,8 +1,8 @@
#!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/admin/src/init_ds_env.c b/ldap/admin/src/init_ds_env.c
index 554f1cec..f2eed60c 100644
--- a/ldap/admin/src/init_ds_env.c
+++ b/ldap/admin/src/init_ds_env.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/admin/src/init_ds_env.h b/ldap/admin/src/init_ds_env.h
index 99dba832..cd579111 100644
--- a/ldap/admin/src/init_ds_env.h
+++ b/ldap/admin/src/init_ds_env.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/admin/src/install_keywords.h b/ldap/admin/src/install_keywords.h
index b855db30..51ca274e 100644
--- a/ldap/admin/src/install_keywords.h
+++ b/ldap/admin/src/install_keywords.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/admin/src/instindex.cpp b/ldap/admin/src/instindex.cpp
index ecde4fad..181b4962 100644
--- a/ldap/admin/src/instindex.cpp
+++ b/ldap/admin/src/instindex.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/admin/src/java/com/netscape/xmltools/DSML2LDIF.java b/ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.java
index 42eb02fb..afce47c4 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSML2LDIF.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/admin/src/java/com/netscape/xmltools/DSMLReader.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLReader.java
index f6080433..10bd8fdd 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLReader.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLReader.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/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java
index 4f85d2db..44f7d8f6 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXBuilder.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 **/
package com.netscape.xmltools;
diff --git a/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java
index 73b067d7..7e54b912 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLSAXHandler.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 **/
package com.netscape.xmltools;
diff --git a/ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java b/ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java
index 82ebc3d0..48d4c55a 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/DSMLWriter.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/admin/src/java/com/netscape/xmltools/GetOpt.java b/ldap/admin/src/java/com/netscape/xmltools/GetOpt.java
index 91d17e18..a8f11b7f 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/GetOpt.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/GetOpt.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 **/
package com.netscape.xmltools;
diff --git a/ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java b/ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java
index ae4ada4f..8fa5a0fd 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.java
+++ b/ldap/admin/src/java/com/netscape/xmltools/LDIF2DSML.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/admin/src/java/com/netscape/xmltools/Makefile b/ldap/admin/src/java/com/netscape/xmltools/Makefile
index 22083770..5f7e9530 100644
--- a/ldap/admin/src/java/com/netscape/xmltools/Makefile
+++ b/ldap/admin/src/java/com/netscape/xmltools/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/admin/src/java/install b/ldap/admin/src/java/install
index e307f782..7d3581d1 100755
--- a/ldap/admin/src/java/install
+++ b/ldap/admin/src/java/install
@@ -1,8 +1,8 @@
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/admin/src/java/mcc b/ldap/admin/src/java/mcc
index 080ffb98..ecff4208 100755
--- a/ldap/admin/src/java/mcc
+++ b/ldap/admin/src/java/mcc
@@ -1,8 +1,8 @@
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/admin/src/java/mcc.bat b/ldap/admin/src/java/mcc.bat
index 4caccf18..f91e5924 100644
--- a/ldap/admin/src/java/mcc.bat
+++ b/ldap/admin/src/java/mcc.bat
@@ -1,7 +1,7 @@
@rem //
@rem // BEGIN COPYRIGHT BLOCK
-@rem // Copyright 2001 Sun Microsystems, Inc.
-@rem // Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+@rem // Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+@rem // Copyright (C) 2005 Red Hat, Inc.
@rem // All rights reserved.
@rem // END COPYRIGHT BLOCK
@rem //
diff --git a/ldap/admin/src/key.rc b/ldap/admin/src/key.rc
index 7568ac91..1f1c93b2 100644
--- a/ldap/admin/src/key.rc
+++ b/ldap/admin/src/key.rc
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
//Microsoft Visual C++ generated resource script.
diff --git a/ldap/admin/src/latest_file.c b/ldap/admin/src/latest_file.c
index 5a6be701..5703d794 100644
--- a/ldap/admin/src/latest_file.c
+++ b/ldap/admin/src/latest_file.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/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
index 0d41cfb0..0ce0b789 100755
--- a/ldap/admin/src/logconv.pl
+++ b/ldap/admin/src/logconv.pl
@@ -2,8 +2,8 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001 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/admin/src/makemccvlvindexes b/ldap/admin/src/makemccvlvindexes
index a8e46efd..bf35917b 100644
--- a/ldap/admin/src/makemccvlvindexes
+++ b/ldap/admin/src/makemccvlvindexes
@@ -1,8 +1,8 @@
#!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/admin/src/makevlvindex b/ldap/admin/src/makevlvindex
index ef68798c..2d4d007c 100644
--- a/ldap/admin/src/makevlvindex
+++ b/ldap/admin/src/makevlvindex
@@ -1,8 +1,8 @@
#!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/admin/src/makevlvsearch b/ldap/admin/src/makevlvsearch
index 45616e02..6154686b 100644
--- a/ldap/admin/src/makevlvsearch
+++ b/ldap/admin/src/makevlvsearch
@@ -1,8 +1,8 @@
#!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/admin/src/migrateInstance b/ldap/admin/src/migrateInstance
index 0480ec47..807bd3a3 100644
--- a/ldap/admin/src/migrateInstance
+++ b/ldap/admin/src/migrateInstance
@@ -1,8 +1,8 @@
#!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/admin/src/migrateLocalDB b/ldap/admin/src/migrateLocalDB
index 3dfeb106..b5e197e6 100644
--- a/ldap/admin/src/migrateLocalDB
+++ b/ldap/admin/src/migrateLocalDB
@@ -1,8 +1,8 @@
#!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/admin/src/migratePwdFile b/ldap/admin/src/migratePwdFile
index 45b90629..7c3b0e60 100644
--- a/ldap/admin/src/migratePwdFile
+++ b/ldap/admin/src/migratePwdFile
@@ -1,8 +1,8 @@
#!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/admin/src/migrateTo4 b/ldap/admin/src/migrateTo4
index 862bfff2..8ba1bd41 100644
--- a/ldap/admin/src/migrateTo4
+++ b/ldap/admin/src/migrateTo4
@@ -1,8 +1,8 @@
#!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/admin/src/migratedsgw b/ldap/admin/src/migratedsgw
index 8874c02d..f8f78694 100755
--- a/ldap/admin/src/migratedsgw
+++ b/ldap/admin/src/migratedsgw
@@ -1,8 +1,8 @@
#!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/admin/src/namegen.c b/ldap/admin/src/namegen.c
index 6fc6d22f..3b24873b 100644
--- a/ldap/admin/src/namegen.c
+++ b/ldap/admin/src/namegen.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 **/
/* namegen.c - utility program to generate name *
diff --git a/ldap/admin/src/ns-newpwpolicy.pl b/ldap/admin/src/ns-newpwpolicy.pl
index 5cc6a6ec..9ccc9d22 100644
--- a/ldap/admin/src/ns-newpwpolicy.pl
+++ b/ldap/admin/src/ns-newpwpolicy.pl
@@ -1,8 +1,8 @@
# perl script
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/admin/src/restart.c b/ldap/admin/src/restart.c
index 44d80a49..daa7b65a 100644
--- a/ldap/admin/src/restart.c
+++ b/ldap/admin/src/restart.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/admin/src/script-gen.c b/ldap/admin/src/script-gen.c
index e2caab4c..e3f5e33f 100644
--- a/ldap/admin/src/script-gen.c
+++ b/ldap/admin/src/script-gen.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/admin/src/scripts/template-bak2db.pl b/ldap/admin/src/scripts/template-bak2db.pl
index cdb51c74..836e42a1 100644
--- a/ldap/admin/src/scripts/template-bak2db.pl
+++ b/ldap/admin/src/scripts/template-bak2db.pl
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-db2bak.pl b/ldap/admin/src/scripts/template-db2bak.pl
index f9514997..7a7224f8 100644
--- a/ldap/admin/src/scripts/template-db2bak.pl
+++ b/ldap/admin/src/scripts/template-db2bak.pl
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-db2index.pl b/ldap/admin/src/scripts/template-db2index.pl
index 237cf952..6e3b31c5 100644
--- a/ldap/admin/src/scripts/template-db2index.pl
+++ b/ldap/admin/src/scripts/template-db2index.pl
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-db2ldif.pl b/ldap/admin/src/scripts/template-db2ldif.pl
index cd5b6065..c09c8bbe 100644
--- a/ldap/admin/src/scripts/template-db2ldif.pl
+++ b/ldap/admin/src/scripts/template-db2ldif.pl
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-ldif2db.pl b/ldap/admin/src/scripts/template-ldif2db.pl
index c552af69..ff8c133d 100644
--- a/ldap/admin/src/scripts/template-ldif2db.pl
+++ b/ldap/admin/src/scripts/template-ldif2db.pl
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-migrate50to51 b/ldap/admin/src/scripts/template-migrate50to51
index c9c32276..b956c4b5 100644
--- a/ldap/admin/src/scripts/template-migrate50to51
+++ b/ldap/admin/src/scripts/template-migrate50to51
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-migrate5to6 b/ldap/admin/src/scripts/template-migrate5to6
index 3cc5bd58..ec3aa024 100644
--- a/ldap/admin/src/scripts/template-migrate5to6
+++ b/ldap/admin/src/scripts/template-migrate5to6
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-migrate5to7 b/ldap/admin/src/scripts/template-migrate5to7
index 50aead79..d7f899ce 100644
--- a/ldap/admin/src/scripts/template-migrate5to7
+++ b/ldap/admin/src/scripts/template-migrate5to7
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-migrate6to7 b/ldap/admin/src/scripts/template-migrate6to7
index 26f117b6..de58c85f 100644
--- a/ldap/admin/src/scripts/template-migrate6to7
+++ b/ldap/admin/src/scripts/template-migrate6to7
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-migrateInstance5 b/ldap/admin/src/scripts/template-migrateInstance5
index 3d3396c2..1afe3320 100644
--- a/ldap/admin/src/scripts/template-migrateInstance5
+++ b/ldap/admin/src/scripts/template-migrateInstance5
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-migrateInstance6 b/ldap/admin/src/scripts/template-migrateInstance6
index faaf6363..d916d977 100644
--- a/ldap/admin/src/scripts/template-migrateInstance6
+++ b/ldap/admin/src/scripts/template-migrateInstance6
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-migrateInstance7 b/ldap/admin/src/scripts/template-migrateInstance7
index 2a754b10..62752778 100644
--- a/ldap/admin/src/scripts/template-migrateInstance7
+++ b/ldap/admin/src/scripts/template-migrateInstance7
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-migrateTo5 b/ldap/admin/src/scripts/template-migrateTo5
index f02a6279..effd5bb0 100755
--- a/ldap/admin/src/scripts/template-migrateTo5
+++ b/ldap/admin/src/scripts/template-migrateTo5
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-migrateTo6 b/ldap/admin/src/scripts/template-migrateTo6
index 91174b41..c00d3c07 100644
--- a/ldap/admin/src/scripts/template-migrateTo6
+++ b/ldap/admin/src/scripts/template-migrateTo6
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-migrateTo7 b/ldap/admin/src/scripts/template-migrateTo7
index 73f71ab9..bf06372d 100644
--- a/ldap/admin/src/scripts/template-migrateTo7
+++ b/ldap/admin/src/scripts/template-migrateTo7
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-ns-accountstatus.pl b/ldap/admin/src/scripts/template-ns-accountstatus.pl
index 5913f7ad..554df128 100644
--- a/ldap/admin/src/scripts/template-ns-accountstatus.pl
+++ b/ldap/admin/src/scripts/template-ns-accountstatus.pl
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-ns-activate.pl b/ldap/admin/src/scripts/template-ns-activate.pl
index 5913f7ad..554df128 100644
--- a/ldap/admin/src/scripts/template-ns-activate.pl
+++ b/ldap/admin/src/scripts/template-ns-activate.pl
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-ns-inactivate.pl b/ldap/admin/src/scripts/template-ns-inactivate.pl
index 5913f7ad..554df128 100644
--- a/ldap/admin/src/scripts/template-ns-inactivate.pl
+++ b/ldap/admin/src/scripts/template-ns-inactivate.pl
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-ns-newpwpolicy.pl b/ldap/admin/src/scripts/template-ns-newpwpolicy.pl
index dd57c944..ed1caebf 100755
--- a/ldap/admin/src/scripts/template-ns-newpwpolicy.pl
+++ b/ldap/admin/src/scripts/template-ns-newpwpolicy.pl
@@ -1,8 +1,8 @@
#{{PERL-EXEC}}
#
# 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/admin/src/scripts/template-repl-monitor-cgi.pl b/ldap/admin/src/scripts/template-repl-monitor-cgi.pl
index b9494d0d..3a9f2c8f 100755
--- a/ldap/admin/src/scripts/template-repl-monitor-cgi.pl
+++ b/ldap/admin/src/scripts/template-repl-monitor-cgi.pl
@@ -1,7 +1,7 @@
#{{PERL-EXEC}}
#
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2002-2004 Netscape Communications Corporation.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/admin/src/scripts/template-verify-db.pl b/ldap/admin/src/scripts/template-verify-db.pl
index a6cd98ca..b582847e 100644
--- a/ldap/admin/src/scripts/template-verify-db.pl
+++ b/ldap/admin/src/scripts/template-verify-db.pl
@@ -1,7 +1,7 @@
#{{PERL-EXEC}}
#
# BEGIN COPYRIGHT BLOCK
-# Copyright (C) 2003-2004 AOL, Inc.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/admin/src/shutdown.c b/ldap/admin/src/shutdown.c
index 0ed55c1c..2025fb7b 100644
--- a/ldap/admin/src/shutdown.c
+++ b/ldap/admin/src/shutdown.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/admin/src/start.c b/ldap/admin/src/start.c
index 8a0e4289..011289f8 100644
--- a/ldap/admin/src/start.c
+++ b/ldap/admin/src/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/admin/src/uname.lib b/ldap/admin/src/uname.lib
index f3269e65..bef5219d 100644
--- a/ldap/admin/src/uname.lib
+++ b/ldap/admin/src/uname.lib
@@ -1,8 +1,8 @@
#!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/admin/src/updatedsgw b/ldap/admin/src/updatedsgw
index d3f65db5..d740f319 100755
--- a/ldap/admin/src/updatedsgw
+++ b/ldap/admin/src/updatedsgw
@@ -1,8 +1,8 @@
#!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/admin/src/upgradeServer b/ldap/admin/src/upgradeServer
index d6bec4a7..dbe35008 100755
--- a/ldap/admin/src/upgradeServer
+++ b/ldap/admin/src/upgradeServer
@@ -1,8 +1,8 @@
#!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/admin/src/vlvindex.c b/ldap/admin/src/vlvindex.c
index e1be972c..56f92e99 100644
--- a/ldap/admin/src/vlvindex.c
+++ b/ldap/admin/src/vlvindex.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/clients/Makefile b/ldap/clients/Makefile
index 089ce483..469b9593 100644
--- a/ldap/clients/Makefile
+++ b/ldap/clients/Makefile
@@ -1,8 +1,8 @@
# Build Directory client apps
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/cm/Makefile b/ldap/cm/Makefile
index b87d4788..f51ed80d 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/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/cm/filterfiles.sh b/ldap/cm/filterfiles.sh
index 7ab1e3c9..8db89d3c 100644
--- a/ldap/cm/filterfiles.sh
+++ b/ldap/cm/filterfiles.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/cm/fixBaseInf.pl b/ldap/cm/fixBaseInf.pl
index cadbfa74..d759533a 100644
--- a/ldap/cm/fixBaseInf.pl
+++ b/ldap/cm/fixBaseInf.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/cm/fixNSPerlInf.pl b/ldap/cm/fixNSPerlInf.pl
index afdf00eb..9f72e89b 100644
--- a/ldap/cm/fixNSPerlInf.pl
+++ b/ldap/cm/fixNSPerlInf.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/cm/fixPerlDAPInf.pl b/ldap/cm/fixPerlDAPInf.pl
index fe87dad0..cf1f9fb7 100644
--- a/ldap/cm/fixPerlDAPInf.pl
+++ b/ldap/cm/fixPerlDAPInf.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/cm/fixSetupInf.pl b/ldap/cm/fixSetupInf.pl
index 7f1da7d7..bd10f5c6 100644
--- a/ldap/cm/fixSetupInf.pl
+++ b/ldap/cm/fixSetupInf.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/cm/ldapjava.mpw b/ldap/cm/ldapjava.mpw
index 914dbfd5..aba0974f 100644
--- a/ldap/cm/ldapjava.mpw
+++ b/ldap/cm/ldapjava.mpw
@@ -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/cm/nbsp2utf8.sh b/ldap/cm/nbsp2utf8.sh
index 1f7df9b1..bec478b1 100644
--- a/ldap/cm/nbsp2utf8.sh
+++ b/ldap/cm/nbsp2utf8.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/cm/newinst/Makefile b/ldap/cm/newinst/Makefile
index 762ccfcb..9ce7c96b 100644
--- a/ldap/cm/newinst/Makefile
+++ b/ldap/cm/newinst/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/cm/newinst/fixINF.pl b/ldap/cm/newinst/fixINF.pl
index 0861a9b9..fbc53021 100644
--- a/ldap/cm/newinst/fixINF.pl
+++ b/ldap/cm/newinst/fixINF.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/cm/newinst/ns-keygen b/ldap/cm/newinst/ns-keygen
index 2c7c3d0d..e01d43a4 100755
--- a/ldap/cm/newinst/ns-keygen
+++ b/ldap/cm/newinst/ns-keygen
@@ -1,8 +1,8 @@
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/cm/newinst/ns-update b/ldap/cm/newinst/ns-update
index a4c86788..b521aebd 100755
--- a/ldap/cm/newinst/ns-update
+++ b/ldap/cm/newinst/ns-update
@@ -1,8 +1,8 @@
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/cm/newinst/replaceToken.pl b/ldap/cm/newinst/replaceToken.pl
index 13265efe..c6c6d8ad 100644
--- a/ldap/cm/newinst/replaceToken.pl
+++ b/ldap/cm/newinst/replaceToken.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/cm/newinst/setup b/ldap/cm/newinst/setup
index 1adc2b3b..87e20270 100755
--- a/ldap/cm/newinst/setup
+++ b/ldap/cm/newinst/setup
@@ -1,7 +1,7 @@
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2005 Red Hat Inc.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/cm/newinst/slapd.inf b/ldap/cm/newinst/slapd.inf
index a481b6c8..5c450f07 100644
--- a/ldap/cm/newinst/slapd.inf
+++ b/ldap/cm/newinst/slapd.inf
@@ -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/cm/newinst/uninstall b/ldap/cm/newinst/uninstall
index cdcc2491..e47822d5 100755
--- a/ldap/cm/newinst/uninstall
+++ b/ldap/cm/newinst/uninstall
@@ -1,8 +1,8 @@
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/cm/newinst/ux-config.cc b/ldap/cm/newinst/ux-config.cc
index 531b479b..9ce37470 100644
--- a/ldap/cm/newinst/ux-config.cc
+++ b/ldap/cm/newinst/ux-config.cc
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 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/cm/newinst/ux-config.h b/ldap/cm/newinst/ux-config.h
index ecba9d48..ed2c2423 100644
--- a/ldap/cm/newinst/ux-config.h
+++ b/ldap/cm/newinst/ux-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 **/
/*********************************************************************
@@ -16,6 +16,9 @@
**
** HISTORY:
** $Log: ux-config.h,v $
+** Revision 1.3 2005/02/28 23:37:49 nkinder
+** 149951 - Updated source code copyrights
+**
** Revision 1.2 2005/02/02 19:35:43 nhosoi
** [146919] De-brand the Directory Server as "brandx"
**
diff --git a/ldap/cm/newinst/ux-dialog.cc b/ldap/cm/newinst/ux-dialog.cc
index 0dc53b54..294b0468 100644
--- a/ldap/cm/newinst/ux-dialog.cc
+++ b/ldap/cm/newinst/ux-dialog.cc
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 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/cm/newinst/ux-dialog.h b/ldap/cm/newinst/ux-dialog.h
index bc8b47b8..780c1264 100644
--- a/ldap/cm/newinst/ux-dialog.h
+++ b/ldap/cm/newinst/ux-dialog.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/cm/newinst/ux-dsalib_dn.c b/ldap/cm/newinst/ux-dsalib_dn.c
index 535bf53f..6a35c630 100644
--- a/ldap/cm/newinst/ux-dsalib_dn.c
+++ b/ldap/cm/newinst/ux-dsalib_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 **/
diff --git a/ldap/cm/newinst/ux-guesses.cc b/ldap/cm/newinst/ux-guesses.cc
index 6b54127c..3323a0a1 100644
--- a/ldap/cm/newinst/ux-guesses.cc
+++ b/ldap/cm/newinst/ux-guesses.cc
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
@@ -8,11 +8,14 @@
-/* $RCSfile: ux-guesses.cc,v $ $Revision: 1.1 $ $Date: 2005/01/21 00:40:49 $ $State: Exp $ */
+/* $RCSfile: ux-guesses.cc,v $ $Revision: 1.2 $ $Date: 2005/02/28 23:37:49 $ $State: Exp $ */
/*
* $Log: ux-guesses.cc,v $
- * Revision 1.1 2005/01/21 00:40:49 cvsadm
- * Initial revision
+ * Revision 1.2 2005/02/28 23:37:49 nkinder
+ * 149951 - Updated source code copyrights
+ *
+ * Revision 1.1.1.1 2005/01/21 00:40:49 cvsadm
+ * Moving NSCP Directory Server from DirectoryBranch to TRUNK, initial drop. (foxworth)
*
* Revision 1.1.2.4 2004/07/14 01:39:20 dboreham
* changes to make newer C++ compilers happy
diff --git a/ldap/cm/newinstnt/Makefile b/ldap/cm/newinstnt/Makefile
index 5d711c90..f491b99b 100644
--- a/ldap/cm/newinstnt/Makefile
+++ b/ldap/cm/newinstnt/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/cm/newinstnt/consolinst.c b/ldap/cm/newinstnt/consolinst.c
index 9fc5a6f5..1dc118a4 100644
--- a/ldap/cm/newinstnt/consolinst.c
+++ b/ldap/cm/newinstnt/consolinst.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/cm/newinstnt/consolinst.h b/ldap/cm/newinstnt/consolinst.h
index 6bd3f4e4..a61aafda 100644
--- a/ldap/cm/newinstnt/consolinst.h
+++ b/ldap/cm/newinstnt/consolinst.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/cm/newinstnt/dsinst.c b/ldap/cm/newinstnt/dsinst.c
index 2e61a51e..f693e8ab 100644
--- a/ldap/cm/newinstnt/dsinst.c
+++ b/ldap/cm/newinstnt/dsinst.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/cm/newinstnt/dsinst.h b/ldap/cm/newinstnt/dsinst.h
index 0788a398..67c9246e 100644
--- a/ldap/cm/newinstnt/dsinst.h
+++ b/ldap/cm/newinstnt/dsinst.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/cm/newinstnt/dsinst_dsalib_dn.c b/ldap/cm/newinstnt/dsinst_dsalib_dn.c
index 4d2c358c..7a60d99f 100644
--- a/ldap/cm/newinstnt/dsinst_dsalib_dn.c
+++ b/ldap/cm/newinstnt/dsinst_dsalib_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 **/
diff --git a/ldap/cm/newinstnt/libinst.c b/ldap/cm/newinstnt/libinst.c
index 81c04930..40994795 100644
--- a/ldap/cm/newinstnt/libinst.c
+++ b/ldap/cm/newinstnt/libinst.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 "libinst.h"
diff --git a/ldap/cm/newinstnt/libinst.h b/ldap/cm/newinstnt/libinst.h
index fd161031..23c0ad40 100644
--- a/ldap/cm/newinstnt/libinst.h
+++ b/ldap/cm/newinstnt/libinst.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/cm/newinstnt/setup.inf b/ldap/cm/newinstnt/setup.inf
index 6f3bfb64..389baab3 100644
--- a/ldap/cm/newinstnt/setup.inf
+++ b/ldap/cm/newinstnt/setup.inf
@@ -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/cm/newinstnt/slapd.inf b/ldap/cm/newinstnt/slapd.inf
index 0bb48c4b..24ed10fa 100644
--- a/ldap/cm/newinstnt/slapd.inf
+++ b/ldap/cm/newinstnt/slapd.inf
@@ -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/cm/ntpack.sh b/ldap/cm/ntpack.sh
index b99f87ee..b2cac5e7 100644
--- a/ldap/cm/ntpack.sh
+++ b/ldap/cm/ntpack.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/cm/unixstrip b/ldap/cm/unixstrip
index 102c5c4c..21901da4 100755
--- a/ldap/cm/unixstrip
+++ b/ldap/cm/unixstrip
@@ -1,8 +1,8 @@
#!/bin/sh
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/cm/unixstrip.pl b/ldap/cm/unixstrip.pl
index 9d9ae308..e8e8ad74 100644
--- a/ldap/cm/unixstrip.pl
+++ b/ldap/cm/unixstrip.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/cm/v1confs/ns-calendar-globopt.conf b/ldap/cm/v1confs/ns-calendar-globopt.conf
index 752d8574..93e14807 100644
--- a/ldap/cm/v1confs/ns-calendar-globopt.conf
+++ b/ldap/cm/v1confs/ns-calendar-globopt.conf
@@ -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/cm/v1confs/ns-calendar-schema.conf b/ldap/cm/v1confs/ns-calendar-schema.conf
index 16e3f222..8aff5d37 100644
--- a/ldap/cm/v1confs/ns-calendar-schema.conf
+++ b/ldap/cm/v1confs/ns-calendar-schema.conf
@@ -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/cm/v1confs/ns-certificate-globopt.conf b/ldap/cm/v1confs/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v1confs/ns-certificate-globopt.conf
+++ b/ldap/cm/v1confs/ns-certificate-globopt.conf
@@ -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/cm/v1confs/ns-certificate-schema.conf b/ldap/cm/v1confs/ns-certificate-schema.conf
index 173a6d75..a0a9e83f 100644
--- a/ldap/cm/v1confs/ns-certificate-schema.conf
+++ b/ldap/cm/v1confs/ns-certificate-schema.conf
@@ -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/cm/v1confs/ns-compass-globopt.conf b/ldap/cm/v1confs/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v1confs/ns-compass-globopt.conf
+++ b/ldap/cm/v1confs/ns-compass-globopt.conf
@@ -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/cm/v1confs/ns-compass-schema.conf b/ldap/cm/v1confs/ns-compass-schema.conf
index 3875f41b..7aaff35a 100644
--- a/ldap/cm/v1confs/ns-compass-schema.conf
+++ b/ldap/cm/v1confs/ns-compass-schema.conf
@@ -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/cm/v1confs/ns-directory-globopt.conf b/ldap/cm/v1confs/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v1confs/ns-directory-globopt.conf
+++ b/ldap/cm/v1confs/ns-directory-globopt.conf
@@ -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/cm/v1confs/ns-directory-schema.conf b/ldap/cm/v1confs/ns-directory-schema.conf
index 9aaf263a..839780b0 100644
--- a/ldap/cm/v1confs/ns-directory-schema.conf
+++ b/ldap/cm/v1confs/ns-directory-schema.conf
@@ -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/cm/v1confs/ns-mail-globopt.conf b/ldap/cm/v1confs/ns-mail-globopt.conf
index 1c4ef195..acb4ca39 100644
--- a/ldap/cm/v1confs/ns-mail-globopt.conf
+++ b/ldap/cm/v1confs/ns-mail-globopt.conf
@@ -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/cm/v1confs/ns-mail-schema.conf b/ldap/cm/v1confs/ns-mail-schema.conf
index bd069bfa..cdba6928 100644
--- a/ldap/cm/v1confs/ns-mail-schema.conf
+++ b/ldap/cm/v1confs/ns-mail-schema.conf
@@ -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/cm/v1confs/ns-media-globopt.conf b/ldap/cm/v1confs/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v1confs/ns-media-globopt.conf
+++ b/ldap/cm/v1confs/ns-media-globopt.conf
@@ -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/cm/v1confs/ns-media-schema.conf b/ldap/cm/v1confs/ns-media-schema.conf
index bc3bca5d..a42a54db 100644
--- a/ldap/cm/v1confs/ns-media-schema.conf
+++ b/ldap/cm/v1confs/ns-media-schema.conf
@@ -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/cm/v1confs/ns-news-globopt.conf b/ldap/cm/v1confs/ns-news-globopt.conf
index 7e5d8ca3..069241fe 100644
--- a/ldap/cm/v1confs/ns-news-globopt.conf
+++ b/ldap/cm/v1confs/ns-news-globopt.conf
@@ -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/cm/v1confs/ns-news-schema.conf b/ldap/cm/v1confs/ns-news-schema.conf
index 381ed6ff..03166f30 100644
--- a/ldap/cm/v1confs/ns-news-schema.conf
+++ b/ldap/cm/v1confs/ns-news-schema.conf
@@ -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/cm/v1confs/ns-proxy-globopt.conf b/ldap/cm/v1confs/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v1confs/ns-proxy-globopt.conf
+++ b/ldap/cm/v1confs/ns-proxy-globopt.conf
@@ -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/cm/v1confs/ns-proxy-schema.conf b/ldap/cm/v1confs/ns-proxy-schema.conf
index 878348cd..e8af8c3d 100644
--- a/ldap/cm/v1confs/ns-proxy-schema.conf
+++ b/ldap/cm/v1confs/ns-proxy-schema.conf
@@ -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/cm/v1confs/ns-web-globopt.conf b/ldap/cm/v1confs/ns-web-globopt.conf
index 7e5d8ca3..069241fe 100644
--- a/ldap/cm/v1confs/ns-web-globopt.conf
+++ b/ldap/cm/v1confs/ns-web-globopt.conf
@@ -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/cm/v1confs/ns-web-schema.conf b/ldap/cm/v1confs/ns-web-schema.conf
index af8002b0..4dcb2b50 100644
--- a/ldap/cm/v1confs/ns-web-schema.conf
+++ b/ldap/cm/v1confs/ns-web-schema.conf
@@ -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/cm/v1confs/slapd.at.conf b/ldap/cm/v1confs/slapd.at.conf
index 28509c3f..2694d4dc 100644
--- a/ldap/cm/v1confs/slapd.at.conf
+++ b/ldap/cm/v1confs/slapd.at.conf
@@ -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/cm/v1confs/slapd.oc.conf b/ldap/cm/v1confs/slapd.oc.conf
index cf673f78..a6b2ccbf 100644
--- a/ldap/cm/v1confs/slapd.oc.conf
+++ b/ldap/cm/v1confs/slapd.oc.conf
@@ -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/cm/v3confs/ns-calendar-globopt.conf b/ldap/cm/v3confs/ns-calendar-globopt.conf
index 0bdb7dd9..a07781c9 100644
--- a/ldap/cm/v3confs/ns-calendar-globopt.conf
+++ b/ldap/cm/v3confs/ns-calendar-globopt.conf
@@ -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/cm/v3confs/ns-calendar-schema.conf b/ldap/cm/v3confs/ns-calendar-schema.conf
index f36574a4..6e82d8b6 100644
--- a/ldap/cm/v3confs/ns-calendar-schema.conf
+++ b/ldap/cm/v3confs/ns-calendar-schema.conf
@@ -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/cm/v3confs/ns-certificate-globopt.conf b/ldap/cm/v3confs/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v3confs/ns-certificate-globopt.conf
+++ b/ldap/cm/v3confs/ns-certificate-globopt.conf
@@ -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/cm/v3confs/ns-certificate-schema.conf b/ldap/cm/v3confs/ns-certificate-schema.conf
index f4578018..7261ba6f 100644
--- a/ldap/cm/v3confs/ns-certificate-schema.conf
+++ b/ldap/cm/v3confs/ns-certificate-schema.conf
@@ -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/cm/v3confs/ns-compass-globopt.conf b/ldap/cm/v3confs/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v3confs/ns-compass-globopt.conf
+++ b/ldap/cm/v3confs/ns-compass-globopt.conf
@@ -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/cm/v3confs/ns-compass-schema.conf b/ldap/cm/v3confs/ns-compass-schema.conf
index be13bc44..bf11a7d0 100644
--- a/ldap/cm/v3confs/ns-compass-schema.conf
+++ b/ldap/cm/v3confs/ns-compass-schema.conf
@@ -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/cm/v3confs/ns-directory-globopt.conf b/ldap/cm/v3confs/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v3confs/ns-directory-globopt.conf
+++ b/ldap/cm/v3confs/ns-directory-globopt.conf
@@ -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/cm/v3confs/ns-directory-schema.conf b/ldap/cm/v3confs/ns-directory-schema.conf
index 7c0611ee..619bbf7e 100644
--- a/ldap/cm/v3confs/ns-directory-schema.conf
+++ b/ldap/cm/v3confs/ns-directory-schema.conf
@@ -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/cm/v3confs/ns-mail-globopt.conf b/ldap/cm/v3confs/ns-mail-globopt.conf
index 1c4ef195..acb4ca39 100644
--- a/ldap/cm/v3confs/ns-mail-globopt.conf
+++ b/ldap/cm/v3confs/ns-mail-globopt.conf
@@ -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/cm/v3confs/ns-mail-schema.conf b/ldap/cm/v3confs/ns-mail-schema.conf
index 076cc065..a886404b 100644
--- a/ldap/cm/v3confs/ns-mail-schema.conf
+++ b/ldap/cm/v3confs/ns-mail-schema.conf
@@ -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/cm/v3confs/ns-media-globopt.conf b/ldap/cm/v3confs/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v3confs/ns-media-globopt.conf
+++ b/ldap/cm/v3confs/ns-media-globopt.conf
@@ -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/cm/v3confs/ns-media-schema.conf b/ldap/cm/v3confs/ns-media-schema.conf
index d4afa271..629f28b9 100644
--- a/ldap/cm/v3confs/ns-media-schema.conf
+++ b/ldap/cm/v3confs/ns-media-schema.conf
@@ -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/cm/v3confs/ns-news-globopt.conf b/ldap/cm/v3confs/ns-news-globopt.conf
index 7e5d8ca3..069241fe 100644
--- a/ldap/cm/v3confs/ns-news-globopt.conf
+++ b/ldap/cm/v3confs/ns-news-globopt.conf
@@ -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/cm/v3confs/ns-news-schema.conf b/ldap/cm/v3confs/ns-news-schema.conf
index 777f339a..ba735ee5 100644
--- a/ldap/cm/v3confs/ns-news-schema.conf
+++ b/ldap/cm/v3confs/ns-news-schema.conf
@@ -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/cm/v3confs/ns-proxy-globopt.conf b/ldap/cm/v3confs/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v3confs/ns-proxy-globopt.conf
+++ b/ldap/cm/v3confs/ns-proxy-globopt.conf
@@ -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/cm/v3confs/ns-proxy-schema.conf b/ldap/cm/v3confs/ns-proxy-schema.conf
index 3d26bacb..e3556fd9 100644
--- a/ldap/cm/v3confs/ns-proxy-schema.conf
+++ b/ldap/cm/v3confs/ns-proxy-schema.conf
@@ -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/cm/v3confs/ns-web-globopt.conf b/ldap/cm/v3confs/ns-web-globopt.conf
index 7e5d8ca3..069241fe 100644
--- a/ldap/cm/v3confs/ns-web-globopt.conf
+++ b/ldap/cm/v3confs/ns-web-globopt.conf
@@ -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/cm/v3confs/ns-web-schema.conf b/ldap/cm/v3confs/ns-web-schema.conf
index ce5c2b16..7b581348 100644
--- a/ldap/cm/v3confs/ns-web-schema.conf
+++ b/ldap/cm/v3confs/ns-web-schema.conf
@@ -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/cm/v3confs/slapd.at.conf b/ldap/cm/v3confs/slapd.at.conf
index 01e31155..4308e095 100644
--- a/ldap/cm/v3confs/slapd.at.conf
+++ b/ldap/cm/v3confs/slapd.at.conf
@@ -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/cm/v3confs/slapd.oc.conf b/ldap/cm/v3confs/slapd.oc.conf
index 57e05f4b..5a423141 100644
--- a/ldap/cm/v3confs/slapd.oc.conf
+++ b/ldap/cm/v3confs/slapd.oc.conf
@@ -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/cm/v4confs/40/java-object-schema.conf b/ldap/cm/v4confs/40/java-object-schema.conf
index 1ba36b8c..bd65232b 100644
--- a/ldap/cm/v4confs/40/java-object-schema.conf
+++ b/ldap/cm/v4confs/40/java-object-schema.conf
@@ -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/cm/v4confs/40/ns-admin-schema.conf b/ldap/cm/v4confs/40/ns-admin-schema.conf
index 0bd125de..8c7858ff 100644
--- a/ldap/cm/v4confs/40/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/40/ns-admin-schema.conf
Binary files differ
diff --git a/ldap/cm/v4confs/40/ns-calendar-globopt.conf b/ldap/cm/v4confs/40/ns-calendar-globopt.conf
index 0bdb7dd9..a07781c9 100644
--- a/ldap/cm/v4confs/40/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-calendar-globopt.conf
@@ -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/cm/v4confs/40/ns-calendar-schema.conf b/ldap/cm/v4confs/40/ns-calendar-schema.conf
index 2a35ae3c..431bb66a 100644
--- a/ldap/cm/v4confs/40/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/40/ns-calendar-schema.conf
@@ -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/cm/v4confs/40/ns-certificate-globopt.conf b/ldap/cm/v4confs/40/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/40/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-certificate-globopt.conf
@@ -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/cm/v4confs/40/ns-certificate-schema.conf b/ldap/cm/v4confs/40/ns-certificate-schema.conf
index a9ef7b9d..6631f3bd 100644
--- a/ldap/cm/v4confs/40/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/40/ns-certificate-schema.conf
@@ -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/cm/v4confs/40/ns-common-schema.conf b/ldap/cm/v4confs/40/ns-common-schema.conf
index 3b934a1a..ae204259 100644
--- a/ldap/cm/v4confs/40/ns-common-schema.conf
+++ b/ldap/cm/v4confs/40/ns-common-schema.conf
@@ -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/cm/v4confs/40/ns-compass-globopt.conf b/ldap/cm/v4confs/40/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v4confs/40/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-compass-globopt.conf
@@ -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/cm/v4confs/40/ns-compass-schema.conf b/ldap/cm/v4confs/40/ns-compass-schema.conf
index be13bc44..bf11a7d0 100644
--- a/ldap/cm/v4confs/40/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/40/ns-compass-schema.conf
@@ -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/cm/v4confs/40/ns-cos-schema.conf b/ldap/cm/v4confs/40/ns-cos-schema.conf
index 3d0f9f1a..9bc9243a 100644
--- a/ldap/cm/v4confs/40/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/40/ns-cos-schema.conf
@@ -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/cm/v4confs/40/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf
index b25c9146..d6304c93 100644
--- a/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf
@@ -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/cm/v4confs/40/ns-directory-globopt.conf b/ldap/cm/v4confs/40/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/40/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-directory-globopt.conf
@@ -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/cm/v4confs/40/ns-directory-schema.conf b/ldap/cm/v4confs/40/ns-directory-schema.conf
index d928081f..ce814775 100644
--- a/ldap/cm/v4confs/40/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/40/ns-directory-schema.conf
@@ -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/cm/v4confs/40/ns-legacy-schema.conf b/ldap/cm/v4confs/40/ns-legacy-schema.conf
index 88424b82..74bfaefc 100644
--- a/ldap/cm/v4confs/40/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/40/ns-legacy-schema.conf
@@ -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/cm/v4confs/40/ns-mail-globopt.conf b/ldap/cm/v4confs/40/ns-mail-globopt.conf
index 2e6cac65..e69dc715 100644
--- a/ldap/cm/v4confs/40/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-mail-globopt.conf
@@ -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/cm/v4confs/40/ns-mail-schema.conf b/ldap/cm/v4confs/40/ns-mail-schema.conf
index 13af6135..e710a5f7 100644
--- a/ldap/cm/v4confs/40/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mail-schema.conf
@@ -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/cm/v4confs/40/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf
index dd2e228f..349f06c2 100644
--- a/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf
@@ -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/cm/v4confs/40/ns-mcd-config-schema.conf b/ldap/cm/v4confs/40/ns-mcd-config-schema.conf
index 7076bbc7..52823979 100644
--- a/ldap/cm/v4confs/40/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-config-schema.conf
@@ -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/cm/v4confs/40/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf
index 57a75555..f2e92332 100644
--- a/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf
@@ -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/cm/v4confs/40/ns-mcd-li-schema.conf b/ldap/cm/v4confs/40/ns-mcd-li-schema.conf
index 272d90e2..a046e50c 100644
--- a/ldap/cm/v4confs/40/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-li-schema.conf
@@ -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/cm/v4confs/40/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf
index 12d42c0b..896c7454 100644
--- a/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf
@@ -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/cm/v4confs/40/ns-media-globopt.conf b/ldap/cm/v4confs/40/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/40/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-media-globopt.conf
@@ -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/cm/v4confs/40/ns-media-schema.conf b/ldap/cm/v4confs/40/ns-media-schema.conf
index d4afa271..629f28b9 100644
--- a/ldap/cm/v4confs/40/ns-media-schema.conf
+++ b/ldap/cm/v4confs/40/ns-media-schema.conf
@@ -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/cm/v4confs/40/ns-mlm-schema.conf b/ldap/cm/v4confs/40/ns-mlm-schema.conf
index 4aa8fc07..a09128b2 100644
--- a/ldap/cm/v4confs/40/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mlm-schema.conf
@@ -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/cm/v4confs/40/ns-msg-schema.conf b/ldap/cm/v4confs/40/ns-msg-schema.conf
index b35df739..313295a5 100644
--- a/ldap/cm/v4confs/40/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/40/ns-msg-schema.conf
@@ -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/cm/v4confs/40/ns-netshare-schema.conf b/ldap/cm/v4confs/40/ns-netshare-schema.conf
index b1201ef0..ebcdb7b0 100644
--- a/ldap/cm/v4confs/40/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/40/ns-netshare-schema.conf
@@ -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/cm/v4confs/40/ns-news-globopt.conf b/ldap/cm/v4confs/40/ns-news-globopt.conf
index b35e2a83..bb9f4495 100644
--- a/ldap/cm/v4confs/40/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-news-globopt.conf
@@ -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/cm/v4confs/40/ns-news-schema.conf b/ldap/cm/v4confs/40/ns-news-schema.conf
index 777f339a..ba735ee5 100644
--- a/ldap/cm/v4confs/40/ns-news-schema.conf
+++ b/ldap/cm/v4confs/40/ns-news-schema.conf
@@ -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/cm/v4confs/40/ns-proxy-globopt.conf b/ldap/cm/v4confs/40/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/40/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-proxy-globopt.conf
@@ -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/cm/v4confs/40/ns-proxy-schema.conf b/ldap/cm/v4confs/40/ns-proxy-schema.conf
index 3d26bacb..e3556fd9 100644
--- a/ldap/cm/v4confs/40/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/40/ns-proxy-schema.conf
@@ -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/cm/v4confs/40/ns-value-schema.conf b/ldap/cm/v4confs/40/ns-value-schema.conf
index c4b9d3c9..c6088cfb 100644
--- a/ldap/cm/v4confs/40/ns-value-schema.conf
+++ b/ldap/cm/v4confs/40/ns-value-schema.conf
@@ -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/cm/v4confs/40/ns-wcal-globopt.conf b/ldap/cm/v4confs/40/ns-wcal-globopt.conf
index 72b108c7..2cfbd017 100644
--- a/ldap/cm/v4confs/40/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-wcal-globopt.conf
@@ -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/cm/v4confs/40/ns-wcal-schema.conf b/ldap/cm/v4confs/40/ns-wcal-schema.conf
index 97a6d12d..9be425be 100644
--- a/ldap/cm/v4confs/40/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/40/ns-wcal-schema.conf
@@ -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/cm/v4confs/40/ns-web-globopt.conf b/ldap/cm/v4confs/40/ns-web-globopt.conf
index 4db72fe2..904c063e 100644
--- a/ldap/cm/v4confs/40/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-web-globopt.conf
@@ -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/cm/v4confs/40/ns-web-schema.conf b/ldap/cm/v4confs/40/ns-web-schema.conf
index d5e74ed8..6e76c29f 100644
--- a/ldap/cm/v4confs/40/ns-web-schema.conf
+++ b/ldap/cm/v4confs/40/ns-web-schema.conf
@@ -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/cm/v4confs/40/slapd.at.conf b/ldap/cm/v4confs/40/slapd.at.conf
index 0b14ecbe..54eaf6f9 100644
--- a/ldap/cm/v4confs/40/slapd.at.conf
+++ b/ldap/cm/v4confs/40/slapd.at.conf
@@ -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/cm/v4confs/40/slapd.oc.conf b/ldap/cm/v4confs/40/slapd.oc.conf
index 44a95121..f6b1c2fc 100644
--- a/ldap/cm/v4confs/40/slapd.oc.conf
+++ b/ldap/cm/v4confs/40/slapd.oc.conf
@@ -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/cm/v4confs/41/java-object-schema.conf b/ldap/cm/v4confs/41/java-object-schema.conf
index 73f6f836..095021cc 100644
--- a/ldap/cm/v4confs/41/java-object-schema.conf
+++ b/ldap/cm/v4confs/41/java-object-schema.conf
@@ -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/cm/v4confs/41/ns-admin-schema.conf b/ldap/cm/v4confs/41/ns-admin-schema.conf
index 6bd0a9d0..1fcf50a6 100644
--- a/ldap/cm/v4confs/41/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/41/ns-admin-schema.conf
@@ -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/cm/v4confs/41/ns-calendar-globopt.conf b/ldap/cm/v4confs/41/ns-calendar-globopt.conf
index 0bdb7dd9..a07781c9 100644
--- a/ldap/cm/v4confs/41/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-calendar-globopt.conf
@@ -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/cm/v4confs/41/ns-calendar-schema.conf b/ldap/cm/v4confs/41/ns-calendar-schema.conf
index 2a35ae3c..431bb66a 100644
--- a/ldap/cm/v4confs/41/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/41/ns-calendar-schema.conf
@@ -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/cm/v4confs/41/ns-certificate-globopt.conf b/ldap/cm/v4confs/41/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/41/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-certificate-globopt.conf
@@ -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/cm/v4confs/41/ns-certificate-schema.conf b/ldap/cm/v4confs/41/ns-certificate-schema.conf
index a9ef7b9d..6631f3bd 100644
--- a/ldap/cm/v4confs/41/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/41/ns-certificate-schema.conf
@@ -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/cm/v4confs/41/ns-common-schema.conf b/ldap/cm/v4confs/41/ns-common-schema.conf
index a8d7b00c..cb13fcec 100644
--- a/ldap/cm/v4confs/41/ns-common-schema.conf
+++ b/ldap/cm/v4confs/41/ns-common-schema.conf
@@ -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/cm/v4confs/41/ns-compass-globopt.conf b/ldap/cm/v4confs/41/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v4confs/41/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-compass-globopt.conf
@@ -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/cm/v4confs/41/ns-compass-schema.conf b/ldap/cm/v4confs/41/ns-compass-schema.conf
index be13bc44..bf11a7d0 100644
--- a/ldap/cm/v4confs/41/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/41/ns-compass-schema.conf
@@ -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/cm/v4confs/41/ns-cos-schema.conf b/ldap/cm/v4confs/41/ns-cos-schema.conf
index 3d0f9f1a..9bc9243a 100644
--- a/ldap/cm/v4confs/41/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/41/ns-cos-schema.conf
@@ -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/cm/v4confs/41/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf
index b25c9146..d6304c93 100644
--- a/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf
@@ -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/cm/v4confs/41/ns-directory-globopt.conf b/ldap/cm/v4confs/41/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/41/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-directory-globopt.conf
@@ -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/cm/v4confs/41/ns-directory-schema.conf b/ldap/cm/v4confs/41/ns-directory-schema.conf
index d928081f..ce814775 100644
--- a/ldap/cm/v4confs/41/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/41/ns-directory-schema.conf
@@ -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/cm/v4confs/41/ns-legacy-schema.conf b/ldap/cm/v4confs/41/ns-legacy-schema.conf
index 4f7c4ac4..a4d3c999 100644
--- a/ldap/cm/v4confs/41/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/41/ns-legacy-schema.conf
@@ -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/cm/v4confs/41/ns-mail-globopt.conf b/ldap/cm/v4confs/41/ns-mail-globopt.conf
index 2e6cac65..e69dc715 100644
--- a/ldap/cm/v4confs/41/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-mail-globopt.conf
@@ -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/cm/v4confs/41/ns-mail-schema.conf b/ldap/cm/v4confs/41/ns-mail-schema.conf
index ca0fdc5d..3696bfc4 100644
--- a/ldap/cm/v4confs/41/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mail-schema.conf
@@ -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/cm/v4confs/41/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf
index dd2e228f..349f06c2 100644
--- a/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf
@@ -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/cm/v4confs/41/ns-mcd-config-schema.conf b/ldap/cm/v4confs/41/ns-mcd-config-schema.conf
index 7076bbc7..52823979 100644
--- a/ldap/cm/v4confs/41/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-config-schema.conf
@@ -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/cm/v4confs/41/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf
index 57a75555..f2e92332 100644
--- a/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf
@@ -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/cm/v4confs/41/ns-mcd-li-schema.conf b/ldap/cm/v4confs/41/ns-mcd-li-schema.conf
index 272d90e2..a046e50c 100644
--- a/ldap/cm/v4confs/41/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-li-schema.conf
@@ -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/cm/v4confs/41/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf
index 12d42c0b..896c7454 100644
--- a/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf
@@ -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/cm/v4confs/41/ns-media-globopt.conf b/ldap/cm/v4confs/41/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/41/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-media-globopt.conf
@@ -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/cm/v4confs/41/ns-media-schema.conf b/ldap/cm/v4confs/41/ns-media-schema.conf
index d4afa271..629f28b9 100644
--- a/ldap/cm/v4confs/41/ns-media-schema.conf
+++ b/ldap/cm/v4confs/41/ns-media-schema.conf
@@ -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/cm/v4confs/41/ns-mlm-schema.conf b/ldap/cm/v4confs/41/ns-mlm-schema.conf
index e1c4ef78..fe069b6a 100644
--- a/ldap/cm/v4confs/41/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mlm-schema.conf
@@ -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/cm/v4confs/41/ns-msg-schema.conf b/ldap/cm/v4confs/41/ns-msg-schema.conf
index 3800edbd..93065393 100644
--- a/ldap/cm/v4confs/41/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/41/ns-msg-schema.conf
@@ -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/cm/v4confs/41/ns-netshare-schema.conf b/ldap/cm/v4confs/41/ns-netshare-schema.conf
index b1201ef0..ebcdb7b0 100644
--- a/ldap/cm/v4confs/41/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/41/ns-netshare-schema.conf
@@ -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/cm/v4confs/41/ns-news-globopt.conf b/ldap/cm/v4confs/41/ns-news-globopt.conf
index b35e2a83..bb9f4495 100644
--- a/ldap/cm/v4confs/41/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-news-globopt.conf
@@ -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/cm/v4confs/41/ns-news-schema.conf b/ldap/cm/v4confs/41/ns-news-schema.conf
index 777f339a..ba735ee5 100644
--- a/ldap/cm/v4confs/41/ns-news-schema.conf
+++ b/ldap/cm/v4confs/41/ns-news-schema.conf
@@ -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/cm/v4confs/41/ns-proxy-globopt.conf b/ldap/cm/v4confs/41/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/41/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-proxy-globopt.conf
@@ -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/cm/v4confs/41/ns-proxy-schema.conf b/ldap/cm/v4confs/41/ns-proxy-schema.conf
index 3d26bacb..e3556fd9 100644
--- a/ldap/cm/v4confs/41/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/41/ns-proxy-schema.conf
@@ -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/cm/v4confs/41/ns-value-schema.conf b/ldap/cm/v4confs/41/ns-value-schema.conf
index c4b9d3c9..c6088cfb 100644
--- a/ldap/cm/v4confs/41/ns-value-schema.conf
+++ b/ldap/cm/v4confs/41/ns-value-schema.conf
@@ -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/cm/v4confs/41/ns-wcal-globopt.conf b/ldap/cm/v4confs/41/ns-wcal-globopt.conf
index 72b108c7..2cfbd017 100644
--- a/ldap/cm/v4confs/41/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-wcal-globopt.conf
@@ -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/cm/v4confs/41/ns-wcal-schema.conf b/ldap/cm/v4confs/41/ns-wcal-schema.conf
index 97a6d12d..9be425be 100644
--- a/ldap/cm/v4confs/41/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/41/ns-wcal-schema.conf
@@ -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/cm/v4confs/41/ns-web-globopt.conf b/ldap/cm/v4confs/41/ns-web-globopt.conf
index 4db72fe2..904c063e 100644
--- a/ldap/cm/v4confs/41/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-web-globopt.conf
@@ -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/cm/v4confs/41/ns-web-schema.conf b/ldap/cm/v4confs/41/ns-web-schema.conf
index d5e74ed8..6e76c29f 100644
--- a/ldap/cm/v4confs/41/ns-web-schema.conf
+++ b/ldap/cm/v4confs/41/ns-web-schema.conf
@@ -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/cm/v4confs/41/slapd.at.conf b/ldap/cm/v4confs/41/slapd.at.conf
index 87c3e342..dad505c8 100644
--- a/ldap/cm/v4confs/41/slapd.at.conf
+++ b/ldap/cm/v4confs/41/slapd.at.conf
@@ -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/cm/v4confs/41/slapd.oc.conf b/ldap/cm/v4confs/41/slapd.oc.conf
index 1e8c451b..c05b786e 100644
--- a/ldap/cm/v4confs/41/slapd.oc.conf
+++ b/ldap/cm/v4confs/41/slapd.oc.conf
@@ -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/cm/v4confs/411/java-object-schema.conf b/ldap/cm/v4confs/411/java-object-schema.conf
index 1ba36b8c..bd65232b 100644
--- a/ldap/cm/v4confs/411/java-object-schema.conf
+++ b/ldap/cm/v4confs/411/java-object-schema.conf
@@ -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/cm/v4confs/411/ns-admin-schema.conf b/ldap/cm/v4confs/411/ns-admin-schema.conf
index 6bd0a9d0..1fcf50a6 100644
--- a/ldap/cm/v4confs/411/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/411/ns-admin-schema.conf
@@ -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/cm/v4confs/411/ns-calendar-globopt.conf b/ldap/cm/v4confs/411/ns-calendar-globopt.conf
index 0bdb7dd9..a07781c9 100644
--- a/ldap/cm/v4confs/411/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-calendar-globopt.conf
@@ -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/cm/v4confs/411/ns-calendar-schema.conf b/ldap/cm/v4confs/411/ns-calendar-schema.conf
index 2a35ae3c..431bb66a 100644
--- a/ldap/cm/v4confs/411/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/411/ns-calendar-schema.conf
@@ -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/cm/v4confs/411/ns-certificate-globopt.conf b/ldap/cm/v4confs/411/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/411/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-certificate-globopt.conf
@@ -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/cm/v4confs/411/ns-certificate-schema.conf b/ldap/cm/v4confs/411/ns-certificate-schema.conf
index a9ef7b9d..6631f3bd 100644
--- a/ldap/cm/v4confs/411/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/411/ns-certificate-schema.conf
@@ -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/cm/v4confs/411/ns-common-schema.conf b/ldap/cm/v4confs/411/ns-common-schema.conf
index a8d7b00c..cb13fcec 100644
--- a/ldap/cm/v4confs/411/ns-common-schema.conf
+++ b/ldap/cm/v4confs/411/ns-common-schema.conf
@@ -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/cm/v4confs/411/ns-compass-globopt.conf b/ldap/cm/v4confs/411/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v4confs/411/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-compass-globopt.conf
@@ -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/cm/v4confs/411/ns-compass-schema.conf b/ldap/cm/v4confs/411/ns-compass-schema.conf
index be13bc44..bf11a7d0 100644
--- a/ldap/cm/v4confs/411/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/411/ns-compass-schema.conf
@@ -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/cm/v4confs/411/ns-cos-schema.conf b/ldap/cm/v4confs/411/ns-cos-schema.conf
index 3d0f9f1a..9bc9243a 100644
--- a/ldap/cm/v4confs/411/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/411/ns-cos-schema.conf
@@ -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/cm/v4confs/411/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf
index 773d7069..e48b5362 100644
--- a/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf
@@ -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/cm/v4confs/411/ns-directory-globopt.conf b/ldap/cm/v4confs/411/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/411/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-directory-globopt.conf
@@ -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/cm/v4confs/411/ns-directory-schema.conf b/ldap/cm/v4confs/411/ns-directory-schema.conf
index d928081f..ce814775 100644
--- a/ldap/cm/v4confs/411/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/411/ns-directory-schema.conf
@@ -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/cm/v4confs/411/ns-legacy-schema.conf b/ldap/cm/v4confs/411/ns-legacy-schema.conf
index 4f7c4ac4..a4d3c999 100644
--- a/ldap/cm/v4confs/411/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/411/ns-legacy-schema.conf
@@ -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/cm/v4confs/411/ns-mail-globopt.conf b/ldap/cm/v4confs/411/ns-mail-globopt.conf
index 2e6cac65..e69dc715 100644
--- a/ldap/cm/v4confs/411/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-mail-globopt.conf
@@ -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/cm/v4confs/411/ns-mail-schema.conf b/ldap/cm/v4confs/411/ns-mail-schema.conf
index ca0fdc5d..3696bfc4 100644
--- a/ldap/cm/v4confs/411/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mail-schema.conf
@@ -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/cm/v4confs/411/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf
index dd2e228f..349f06c2 100644
--- a/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf
@@ -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/cm/v4confs/411/ns-mcd-config-schema.conf b/ldap/cm/v4confs/411/ns-mcd-config-schema.conf
index 7076bbc7..52823979 100644
--- a/ldap/cm/v4confs/411/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-config-schema.conf
@@ -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/cm/v4confs/411/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf
index 57a75555..f2e92332 100644
--- a/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf
@@ -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/cm/v4confs/411/ns-mcd-li-schema.conf b/ldap/cm/v4confs/411/ns-mcd-li-schema.conf
index 272d90e2..a046e50c 100644
--- a/ldap/cm/v4confs/411/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-li-schema.conf
@@ -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/cm/v4confs/411/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf
index 12d42c0b..896c7454 100644
--- a/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf
@@ -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/cm/v4confs/411/ns-media-globopt.conf b/ldap/cm/v4confs/411/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/411/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-media-globopt.conf
@@ -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/cm/v4confs/411/ns-media-schema.conf b/ldap/cm/v4confs/411/ns-media-schema.conf
index d4afa271..629f28b9 100644
--- a/ldap/cm/v4confs/411/ns-media-schema.conf
+++ b/ldap/cm/v4confs/411/ns-media-schema.conf
@@ -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/cm/v4confs/411/ns-mlm-schema.conf b/ldap/cm/v4confs/411/ns-mlm-schema.conf
index e1c4ef78..fe069b6a 100644
--- a/ldap/cm/v4confs/411/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mlm-schema.conf
@@ -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/cm/v4confs/411/ns-msg-schema.conf b/ldap/cm/v4confs/411/ns-msg-schema.conf
index 3800edbd..93065393 100644
--- a/ldap/cm/v4confs/411/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/411/ns-msg-schema.conf
@@ -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/cm/v4confs/411/ns-netshare-schema.conf b/ldap/cm/v4confs/411/ns-netshare-schema.conf
index b1201ef0..ebcdb7b0 100644
--- a/ldap/cm/v4confs/411/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/411/ns-netshare-schema.conf
@@ -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/cm/v4confs/411/ns-news-globopt.conf b/ldap/cm/v4confs/411/ns-news-globopt.conf
index b35e2a83..bb9f4495 100644
--- a/ldap/cm/v4confs/411/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-news-globopt.conf
@@ -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/cm/v4confs/411/ns-news-schema.conf b/ldap/cm/v4confs/411/ns-news-schema.conf
index 777f339a..ba735ee5 100644
--- a/ldap/cm/v4confs/411/ns-news-schema.conf
+++ b/ldap/cm/v4confs/411/ns-news-schema.conf
@@ -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/cm/v4confs/411/ns-proxy-globopt.conf b/ldap/cm/v4confs/411/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/411/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-proxy-globopt.conf
@@ -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/cm/v4confs/411/ns-proxy-schema.conf b/ldap/cm/v4confs/411/ns-proxy-schema.conf
index 3d26bacb..e3556fd9 100644
--- a/ldap/cm/v4confs/411/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/411/ns-proxy-schema.conf
@@ -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/cm/v4confs/411/ns-value-schema.conf b/ldap/cm/v4confs/411/ns-value-schema.conf
index c4b9d3c9..c6088cfb 100644
--- a/ldap/cm/v4confs/411/ns-value-schema.conf
+++ b/ldap/cm/v4confs/411/ns-value-schema.conf
@@ -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/cm/v4confs/411/ns-wcal-globopt.conf b/ldap/cm/v4confs/411/ns-wcal-globopt.conf
index 72b108c7..2cfbd017 100644
--- a/ldap/cm/v4confs/411/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-wcal-globopt.conf
@@ -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/cm/v4confs/411/ns-wcal-schema.conf b/ldap/cm/v4confs/411/ns-wcal-schema.conf
index 97a6d12d..9be425be 100644
--- a/ldap/cm/v4confs/411/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/411/ns-wcal-schema.conf
@@ -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/cm/v4confs/411/ns-web-globopt.conf b/ldap/cm/v4confs/411/ns-web-globopt.conf
index 4db72fe2..904c063e 100644
--- a/ldap/cm/v4confs/411/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-web-globopt.conf
@@ -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/cm/v4confs/411/ns-web-schema.conf b/ldap/cm/v4confs/411/ns-web-schema.conf
index d5e74ed8..6e76c29f 100644
--- a/ldap/cm/v4confs/411/ns-web-schema.conf
+++ b/ldap/cm/v4confs/411/ns-web-schema.conf
@@ -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/cm/v4confs/411/slapd.at.conf b/ldap/cm/v4confs/411/slapd.at.conf
index 87c3e342..dad505c8 100644
--- a/ldap/cm/v4confs/411/slapd.at.conf
+++ b/ldap/cm/v4confs/411/slapd.at.conf
@@ -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/cm/v4confs/411/slapd.oc.conf b/ldap/cm/v4confs/411/slapd.oc.conf
index 1e8c451b..c05b786e 100644
--- a/ldap/cm/v4confs/411/slapd.oc.conf
+++ b/ldap/cm/v4confs/411/slapd.oc.conf
@@ -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/cm/v4confs/412/java-object-schema.conf b/ldap/cm/v4confs/412/java-object-schema.conf
index 1ba36b8c..bd65232b 100644
--- a/ldap/cm/v4confs/412/java-object-schema.conf
+++ b/ldap/cm/v4confs/412/java-object-schema.conf
@@ -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/cm/v4confs/412/ns-admin-schema.conf b/ldap/cm/v4confs/412/ns-admin-schema.conf
index 6bd0a9d0..1fcf50a6 100644
--- a/ldap/cm/v4confs/412/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/412/ns-admin-schema.conf
@@ -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/cm/v4confs/412/ns-calendar-globopt.conf b/ldap/cm/v4confs/412/ns-calendar-globopt.conf
index 0bdb7dd9..a07781c9 100644
--- a/ldap/cm/v4confs/412/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-calendar-globopt.conf
@@ -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/cm/v4confs/412/ns-calendar-schema.conf b/ldap/cm/v4confs/412/ns-calendar-schema.conf
index 2a35ae3c..431bb66a 100644
--- a/ldap/cm/v4confs/412/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/412/ns-calendar-schema.conf
@@ -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/cm/v4confs/412/ns-certificate-globopt.conf b/ldap/cm/v4confs/412/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/412/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-certificate-globopt.conf
@@ -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/cm/v4confs/412/ns-certificate-schema.conf b/ldap/cm/v4confs/412/ns-certificate-schema.conf
index a9ef7b9d..6631f3bd 100644
--- a/ldap/cm/v4confs/412/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/412/ns-certificate-schema.conf
@@ -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/cm/v4confs/412/ns-common-schema.conf b/ldap/cm/v4confs/412/ns-common-schema.conf
index a8d7b00c..cb13fcec 100644
--- a/ldap/cm/v4confs/412/ns-common-schema.conf
+++ b/ldap/cm/v4confs/412/ns-common-schema.conf
@@ -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/cm/v4confs/412/ns-compass-globopt.conf b/ldap/cm/v4confs/412/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v4confs/412/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-compass-globopt.conf
@@ -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/cm/v4confs/412/ns-compass-schema.conf b/ldap/cm/v4confs/412/ns-compass-schema.conf
index be13bc44..bf11a7d0 100644
--- a/ldap/cm/v4confs/412/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/412/ns-compass-schema.conf
@@ -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/cm/v4confs/412/ns-cos-schema.conf b/ldap/cm/v4confs/412/ns-cos-schema.conf
index 3d0f9f1a..9bc9243a 100644
--- a/ldap/cm/v4confs/412/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/412/ns-cos-schema.conf
@@ -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/cm/v4confs/412/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf
index 788c156f..a2a0f697 100644
--- a/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf
@@ -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/cm/v4confs/412/ns-directory-globopt.conf b/ldap/cm/v4confs/412/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/412/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-directory-globopt.conf
@@ -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/cm/v4confs/412/ns-directory-schema.conf b/ldap/cm/v4confs/412/ns-directory-schema.conf
index d928081f..ce814775 100644
--- a/ldap/cm/v4confs/412/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/412/ns-directory-schema.conf
@@ -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/cm/v4confs/412/ns-legacy-schema.conf b/ldap/cm/v4confs/412/ns-legacy-schema.conf
index 4f7c4ac4..a4d3c999 100644
--- a/ldap/cm/v4confs/412/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/412/ns-legacy-schema.conf
@@ -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/cm/v4confs/412/ns-mail-globopt.conf b/ldap/cm/v4confs/412/ns-mail-globopt.conf
index 2e6cac65..e69dc715 100644
--- a/ldap/cm/v4confs/412/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-mail-globopt.conf
@@ -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/cm/v4confs/412/ns-mail-schema.conf b/ldap/cm/v4confs/412/ns-mail-schema.conf
index ca0fdc5d..3696bfc4 100644
--- a/ldap/cm/v4confs/412/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mail-schema.conf
@@ -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/cm/v4confs/412/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf
index dd2e228f..349f06c2 100644
--- a/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf
@@ -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/cm/v4confs/412/ns-mcd-config-schema.conf b/ldap/cm/v4confs/412/ns-mcd-config-schema.conf
index 7076bbc7..52823979 100644
--- a/ldap/cm/v4confs/412/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-config-schema.conf
@@ -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/cm/v4confs/412/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf
index 57a75555..f2e92332 100644
--- a/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf
@@ -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/cm/v4confs/412/ns-mcd-li-schema.conf b/ldap/cm/v4confs/412/ns-mcd-li-schema.conf
index 272d90e2..a046e50c 100644
--- a/ldap/cm/v4confs/412/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-li-schema.conf
@@ -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/cm/v4confs/412/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf
index 12d42c0b..896c7454 100644
--- a/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf
@@ -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/cm/v4confs/412/ns-media-globopt.conf b/ldap/cm/v4confs/412/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/412/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-media-globopt.conf
@@ -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/cm/v4confs/412/ns-media-schema.conf b/ldap/cm/v4confs/412/ns-media-schema.conf
index d4afa271..629f28b9 100644
--- a/ldap/cm/v4confs/412/ns-media-schema.conf
+++ b/ldap/cm/v4confs/412/ns-media-schema.conf
@@ -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/cm/v4confs/412/ns-mlm-schema.conf b/ldap/cm/v4confs/412/ns-mlm-schema.conf
index e1c4ef78..fe069b6a 100644
--- a/ldap/cm/v4confs/412/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mlm-schema.conf
@@ -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/cm/v4confs/412/ns-msg-schema.conf b/ldap/cm/v4confs/412/ns-msg-schema.conf
index 3800edbd..93065393 100644
--- a/ldap/cm/v4confs/412/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/412/ns-msg-schema.conf
@@ -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/cm/v4confs/412/ns-netshare-schema.conf b/ldap/cm/v4confs/412/ns-netshare-schema.conf
index b1201ef0..ebcdb7b0 100644
--- a/ldap/cm/v4confs/412/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/412/ns-netshare-schema.conf
@@ -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/cm/v4confs/412/ns-news-globopt.conf b/ldap/cm/v4confs/412/ns-news-globopt.conf
index b35e2a83..bb9f4495 100644
--- a/ldap/cm/v4confs/412/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-news-globopt.conf
@@ -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/cm/v4confs/412/ns-news-schema.conf b/ldap/cm/v4confs/412/ns-news-schema.conf
index 777f339a..ba735ee5 100644
--- a/ldap/cm/v4confs/412/ns-news-schema.conf
+++ b/ldap/cm/v4confs/412/ns-news-schema.conf
@@ -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/cm/v4confs/412/ns-proxy-globopt.conf b/ldap/cm/v4confs/412/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/412/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-proxy-globopt.conf
@@ -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/cm/v4confs/412/ns-proxy-schema.conf b/ldap/cm/v4confs/412/ns-proxy-schema.conf
index 3d26bacb..e3556fd9 100644
--- a/ldap/cm/v4confs/412/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/412/ns-proxy-schema.conf
@@ -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/cm/v4confs/412/ns-value-schema.conf b/ldap/cm/v4confs/412/ns-value-schema.conf
index c4b9d3c9..c6088cfb 100644
--- a/ldap/cm/v4confs/412/ns-value-schema.conf
+++ b/ldap/cm/v4confs/412/ns-value-schema.conf
@@ -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/cm/v4confs/412/ns-wcal-globopt.conf b/ldap/cm/v4confs/412/ns-wcal-globopt.conf
index 72b108c7..2cfbd017 100644
--- a/ldap/cm/v4confs/412/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-wcal-globopt.conf
@@ -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/cm/v4confs/412/ns-wcal-schema.conf b/ldap/cm/v4confs/412/ns-wcal-schema.conf
index 97a6d12d..9be425be 100644
--- a/ldap/cm/v4confs/412/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/412/ns-wcal-schema.conf
@@ -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/cm/v4confs/412/ns-web-globopt.conf b/ldap/cm/v4confs/412/ns-web-globopt.conf
index 4db72fe2..904c063e 100644
--- a/ldap/cm/v4confs/412/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-web-globopt.conf
@@ -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/cm/v4confs/412/ns-web-schema.conf b/ldap/cm/v4confs/412/ns-web-schema.conf
index d5e74ed8..6e76c29f 100644
--- a/ldap/cm/v4confs/412/ns-web-schema.conf
+++ b/ldap/cm/v4confs/412/ns-web-schema.conf
@@ -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/cm/v4confs/412/slapd.at.conf b/ldap/cm/v4confs/412/slapd.at.conf
index 1772f1fe..09671c6d 100644
--- a/ldap/cm/v4confs/412/slapd.at.conf
+++ b/ldap/cm/v4confs/412/slapd.at.conf
@@ -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/cm/v4confs/412/slapd.oc.conf b/ldap/cm/v4confs/412/slapd.oc.conf
index 1e8c451b..c05b786e 100644
--- a/ldap/cm/v4confs/412/slapd.oc.conf
+++ b/ldap/cm/v4confs/412/slapd.oc.conf
@@ -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/dsml/European.dsml b/ldap/dsml/European.dsml
index 9e088409..c663b9fa 100644
--- a/ldap/dsml/European.dsml
+++ b/ldap/dsml/European.dsml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- BEGIN COPYRIGHT BLOCK
- Copyright 2001 Sun Microsystems, Inc.
- Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
END COPYRIGHT BLOCK -->
<dsml:dsml xmlns:dsml="http://www.dsml.org/DSML">
diff --git a/ldap/dsml/Example-roles.dsml b/ldap/dsml/Example-roles.dsml
index dc3abffc..61a15135 100644
--- a/ldap/dsml/Example-roles.dsml
+++ b/ldap/dsml/Example-roles.dsml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- BEGIN COPYRIGHT BLOCK
- Copyright 2001 Sun Microsystems, Inc.
- Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
END COPYRIGHT BLOCK -->
<dsml:dsml xmlns:dsml="http://www.dsml.org/DSML">
diff --git a/ldap/dsml/Example.dsml b/ldap/dsml/Example.dsml
index cb903e00..070b4c9f 100644
--- a/ldap/dsml/Example.dsml
+++ b/ldap/dsml/Example.dsml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!-- BEGIN COPYRIGHT BLOCK
- Copyright 2001 Sun Microsystems, Inc.
- Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ Copyright (C) 2005 Red Hat, Inc.
All rights reserved.
END COPYRIGHT BLOCK -->
<dsml:dsml xmlns:dsml="http://www.dsml.org/DSML">
diff --git a/ldap/include/Makefile b/ldap/include/Makefile
index 0a18d59f..d4ab5bf9 100644
--- a/ldap/include/Makefile
+++ b/ldap/include/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/include/Makefile.client b/ldap/include/Makefile.client
index 2864fce9..83031445 100644
--- a/ldap/include/Makefile.client
+++ b/ldap/include/Makefile.client
@@ -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/include/avl.h b/ldap/include/avl.h
index 4b11d5ae..e550ec6e 100644
--- a/ldap/include/avl.h
+++ b/ldap/include/avl.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 **/
/* avl.h - avl tree definitions */
diff --git a/ldap/include/dblayer.h b/ldap/include/dblayer.h
index 92ab5144..797254b4 100644
--- a/ldap/include/dblayer.h
+++ b/ldap/include/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 **/
diff --git a/ldap/include/dirlite_strings.h b/ldap/include/dirlite_strings.h
index 96c211bf..c4edf0fa 100644
--- a/ldap/include/dirlite_strings.h
+++ b/ldap/include/dirlite_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 **/
/* dirlite_strings.h - strings used for Directory Lite */
diff --git a/ldap/include/disptmpl.h b/ldap/include/disptmpl.h
index 6fdbfc22..18ad1f9f 100644
--- a/ldap/include/disptmpl.h
+++ b/ldap/include/disptmpl.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/include/ldaplog.h b/ldap/include/ldaplog.h
index 3d4a6fb1..d2744987 100644
--- a/ldap/include/ldaplog.h
+++ b/ldap/include/ldaplog.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 _LDAPLOG_H
diff --git a/ldap/include/ldaprot.h b/ldap/include/ldaprot.h
index ae4042d4..784bb840 100644
--- a/ldap/include/ldaprot.h
+++ b/ldap/include/ldaprot.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 _LDAPROT_H
diff --git a/ldap/include/ldbm.h b/ldap/include/ldbm.h
index 2221071b..565325f7 100644
--- a/ldap/include/ldbm.h
+++ b/ldap/include/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 **/
/* ldbm.h - ldap dbm compatibility routine header file */
diff --git a/ldap/include/ldif.h b/ldap/include/ldif.h
index 5c154749..797ead7c 100644
--- a/ldap/include/ldif.h
+++ b/ldap/include/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/include/litekey.h b/ldap/include/litekey.h
index 43dd0f4f..720108ce 100644
--- a/ldap/include/litekey.h
+++ b/ldap/include/litekey.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/include/lthread.h b/ldap/include/lthread.h
index 8f24a08c..d91278b0 100644
--- a/ldap/include/lthread.h
+++ b/ldap/include/lthread.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 **/
/* lthread.h - ldap threads header file */
diff --git a/ldap/include/ntslapdregparms.h b/ldap/include/ntslapdregparms.h
index 8f235032..8d0b6e5f 100644
--- a/ldap/include/ntslapdregparms.h
+++ b/ldap/include/ntslapdregparms.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/include/ntwatchdog.h b/ldap/include/ntwatchdog.h
index ced95daa..7c652b2d 100644
--- a/ldap/include/ntwatchdog.h
+++ b/ldap/include/ntwatchdog.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/include/portable.h b/ldap/include/portable.h
index 2934db6d..f1e4a11f 100644
--- a/ldap/include/portable.h
+++ b/ldap/include/portable.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/include/proto-ntutil.h b/ldap/include/proto-ntutil.h
index 879387b3..f6d0d107 100644
--- a/ldap/include/proto-ntutil.h
+++ b/ldap/include/proto-ntutil.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/include/regex.h b/ldap/include/regex.h
index cc1c3e1d..188b92af 100644
--- a/ldap/include/regex.h
+++ b/ldap/include/regex.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 **/
#if defined( macintosh ) || defined( DOS ) || defined( _WINDOWS ) || defined( NEED_BSDREGEX )
diff --git a/ldap/include/srchpref.h b/ldap/include/srchpref.h
index e78f4441..4bb7e884 100644
--- a/ldap/include/srchpref.h
+++ b/ldap/include/srchpref.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/include/sysexits-compat.h b/ldap/include/sysexits-compat.h
index be6884d5..4bee0537 100644
--- a/ldap/include/sysexits-compat.h
+++ b/ldap/include/sysexits-compat.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/javarules.mk b/ldap/javarules.mk
index 210a24c6..44953704 100644
--- a/ldap/javarules.mk
+++ b/ldap/javarules.mk
@@ -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/ldif/Ace.ldif b/ldap/ldif/Ace.ldif
index 187288a2..61ef4d76 100644
--- a/ldap/ldif/Ace.ldif
+++ b/ldap/ldif/Ace.ldif
@@ -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/ldif/European.ldif b/ldap/ldif/European.ldif
index 1908e605..a99719fd 100644
--- a/ldap/ldif/European.ldif
+++ b/ldap/ldif/European.ldif
@@ -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/ldif/Eurosuffix.ldif b/ldap/ldif/Eurosuffix.ldif
index 6eedb529..2e5e3259 100644
--- a/ldap/ldif/Eurosuffix.ldif
+++ b/ldap/ldif/Eurosuffix.ldif
@@ -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/ldif/Example-roles.ldif b/ldap/ldif/Example-roles.ldif
index e6543819..e02cfd0d 100644
--- a/ldap/ldif/Example-roles.ldif
+++ b/ldap/ldif/Example-roles.ldif
@@ -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/ldif/Example-views.ldif b/ldap/ldif/Example-views.ldif
index 57e1c70f..89331d5c 100644
--- a/ldap/ldif/Example-views.ldif
+++ b/ldap/ldif/Example-views.ldif
@@ -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/ldif/Example.ldif b/ldap/ldif/Example.ldif
index e6b3db21..5bd188aa 100644
--- a/ldap/ldif/Example.ldif
+++ b/ldap/ldif/Example.ldif
@@ -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/ldif/commonTasks.ldif b/ldap/ldif/commonTasks.ldif
index 0b0d468c..bb9220f9 100644
--- a/ldap/ldif/commonTasks.ldif
+++ b/ldap/ldif/commonTasks.ldif
@@ -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/ldif/roledit.ldif b/ldap/ldif/roledit.ldif
index f7afdc90..4108435e 100644
--- a/ldap/ldif/roledit.ldif
+++ b/ldap/ldif/roledit.ldif
@@ -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/ldif/tasks.ldif b/ldap/ldif/tasks.ldif
index c83b5a29..71158f71 100644
--- a/ldap/ldif/tasks.ldif
+++ b/ldap/ldif/tasks.ldif
@@ -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/ldif/template.ldif b/ldap/ldif/template.ldif
index 7620f2cb..04fc7d95 100644
--- a/ldap/ldif/template.ldif
+++ b/ldap/ldif/template.ldif
@@ -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/libraries/Makefile b/ldap/libraries/Makefile
index 4ea2dcd2..ff1099d8 100644
--- a/ldap/libraries/Makefile
+++ b/ldap/libraries/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/libraries/Makefile.client b/ldap/libraries/Makefile.client
index 139698fd..08d5206e 100644
--- a/ldap/libraries/Makefile.client
+++ b/ldap/libraries/Makefile.client
@@ -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/libraries/libavl/Makefile b/ldap/libraries/libavl/Makefile
index 44a8c8f0..8ead01dc 100644
--- a/ldap/libraries/libavl/Makefile
+++ b/ldap/libraries/libavl/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/libraries/libavl/avl.c b/ldap/libraries/libavl/avl.c
index f6fb61ad..3e9fb4a6 100644
--- a/ldap/libraries/libavl/avl.c
+++ b/ldap/libraries/libavl/avl.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 **/
/* avl.c - routines to implement an avl tree */
diff --git a/ldap/libraries/libavl/testavl.c b/ldap/libraries/libavl/testavl.c
index 6efe8c84..88ec5b6a 100644
--- a/ldap/libraries/libavl/testavl.c
+++ b/ldap/libraries/libavl/testavl.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 **/
/* testavl.c - Test Tim Howes AVL code */
diff --git a/ldap/libraries/libldif/Makefile b/ldap/libraries/libldif/Makefile
index 726c559b..0ec8cddb 100644
--- a/ldap/libraries/libldif/Makefile
+++ b/ldap/libraries/libldif/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/libraries/libldif/fileurl.c b/ldap/libraries/libldif/fileurl.c
index b8c65aba..cdf89809 100644
--- a/ldap/libraries/libldif/fileurl.c
+++ b/ldap/libraries/libldif/fileurl.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/libraries/libldif/fileurl.h b/ldap/libraries/libldif/fileurl.h
index 727a641c..9b1ac50b 100644
--- a/ldap/libraries/libldif/fileurl.h
+++ b/ldap/libraries/libldif/fileurl.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/libraries/liblitekey/Makefile b/ldap/libraries/liblitekey/Makefile
index 92577d1a..ac926410 100644
--- a/ldap/libraries/liblitekey/Makefile
+++ b/ldap/libraries/liblitekey/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/libraries/liblitekey/keycheck.c b/ldap/libraries/liblitekey/keycheck.c
index 4f3ee505..16fed899 100644
--- a/ldap/libraries/liblitekey/keycheck.c
+++ b/ldap/libraries/liblitekey/keycheck.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/libraries/libutil/Makefile b/ldap/libraries/libutil/Makefile
index cf9d9a91..54e1f9d5 100644
--- a/ldap/libraries/libutil/Makefile
+++ b/ldap/libraries/libutil/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/libraries/libutil/ntdebug.c b/ldap/libraries/libutil/ntdebug.c
index d0347e2d..50b7ea1a 100644
--- a/ldap/libraries/libutil/ntdebug.c
+++ b/ldap/libraries/libutil/ntdebug.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/libraries/libutil/ntevent.c b/ldap/libraries/libutil/ntevent.c
index 2b05dd9d..2ace2979 100644
--- a/ldap/libraries/libutil/ntevent.c
+++ b/ldap/libraries/libutil/ntevent.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/libraries/libutil/ntreg.c b/ldap/libraries/libutil/ntreg.c
index 53313075..6c2a8f4e 100644
--- a/ldap/libraries/libutil/ntreg.c
+++ b/ldap/libraries/libutil/ntreg.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/libraries/libutil/ntresource.h b/ldap/libraries/libutil/ntresource.h
index c2e375c5..be7d5967 100644
--- a/ldap/libraries/libutil/ntresource.h
+++ b/ldap/libraries/libutil/ntresource.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 **/
//{{NO_DEPENDENCIES}}
diff --git a/ldap/libraries/libutil/ntstubs.c b/ldap/libraries/libutil/ntstubs.c
index 5d18ad38..21651f90 100644
--- a/ldap/libraries/libutil/ntstubs.c
+++ b/ldap/libraries/libutil/ntstubs.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/nsdeps.mk b/ldap/nsdeps.mk
index 3a5f792f..ff2d30a9 100644
--- a/ldap/nsdeps.mk
+++ b/ldap/nsdeps.mk
@@ -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/nsldap.mk b/ldap/nsldap.mk
index 144aa978..6f70ebd8 100644
--- a/ldap/nsldap.mk
+++ b/ldap/nsldap.mk
@@ -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/schema/00core.ldif b/ldap/schema/00core.ldif
index edc562ce..6713d92b 100644
--- a/ldap/schema/00core.ldif
+++ b/ldap/schema/00core.ldif
@@ -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/schema/05rfc2247.ldif b/ldap/schema/05rfc2247.ldif
index b566cfaa..dcfa301e 100644
--- a/ldap/schema/05rfc2247.ldif
+++ b/ldap/schema/05rfc2247.ldif
@@ -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/schema/05rfc2927.ldif b/ldap/schema/05rfc2927.ldif
index c999890f..bee97949 100644
--- a/ldap/schema/05rfc2927.ldif
+++ b/ldap/schema/05rfc2927.ldif
@@ -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/schema/10presence.ldif b/ldap/schema/10presence.ldif
index 52aad52d..ec3afba5 100644
--- a/ldap/schema/10presence.ldif
+++ b/ldap/schema/10presence.ldif
@@ -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/schema/10rfc2307.ldif b/ldap/schema/10rfc2307.ldif
index 9a0dfc2a..4afc3ab8 100644
--- a/ldap/schema/10rfc2307.ldif
+++ b/ldap/schema/10rfc2307.ldif
@@ -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/schema/20subscriber.ldif b/ldap/schema/20subscriber.ldif
index 5c679e3d..cd64567b 100644
--- a/ldap/schema/20subscriber.ldif
+++ b/ldap/schema/20subscriber.ldif
@@ -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/schema/25java-object.ldif b/ldap/schema/25java-object.ldif
index 5ecf2d3d..53e049d6 100644
--- a/ldap/schema/25java-object.ldif
+++ b/ldap/schema/25java-object.ldif
@@ -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/schema/28pilot.ldif b/ldap/schema/28pilot.ldif
index d4dcbf8e..acd74b68 100644
--- a/ldap/schema/28pilot.ldif
+++ b/ldap/schema/28pilot.ldif
@@ -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/schema/30ns-common.ldif b/ldap/schema/30ns-common.ldif
index d480e732..f3b16f36 100644
--- a/ldap/schema/30ns-common.ldif
+++ b/ldap/schema/30ns-common.ldif
@@ -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/schema/50ns-admin.ldif b/ldap/schema/50ns-admin.ldif
index 3b849709..b98d3554 100644
--- a/ldap/schema/50ns-admin.ldif
+++ b/ldap/schema/50ns-admin.ldif
@@ -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/schema/50ns-calendar.ldif b/ldap/schema/50ns-calendar.ldif
index ae579bdd..9c1b045e 100644
--- a/ldap/schema/50ns-calendar.ldif
+++ b/ldap/schema/50ns-calendar.ldif
@@ -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/schema/50ns-certificate.ldif b/ldap/schema/50ns-certificate.ldif
index 8cb7b595..1d321b5f 100644
--- a/ldap/schema/50ns-certificate.ldif
+++ b/ldap/schema/50ns-certificate.ldif
@@ -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/schema/50ns-compass.ldif b/ldap/schema/50ns-compass.ldif
index 9b3c17ea..b2de9c7f 100644
--- a/ldap/schema/50ns-compass.ldif
+++ b/ldap/schema/50ns-compass.ldif
@@ -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/schema/50ns-delegated-admin.ldif b/ldap/schema/50ns-delegated-admin.ldif
index aea5bbe4..812890d9 100644
--- a/ldap/schema/50ns-delegated-admin.ldif
+++ b/ldap/schema/50ns-delegated-admin.ldif
@@ -1,6 +1,6 @@
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2002 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/schema/50ns-directory.ldif b/ldap/schema/50ns-directory.ldif
index 2e44079d..d74084d1 100644
--- a/ldap/schema/50ns-directory.ldif
+++ b/ldap/schema/50ns-directory.ldif
@@ -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/schema/50ns-legacy.ldif b/ldap/schema/50ns-legacy.ldif
index 13116217..c60e8b2a 100644
--- a/ldap/schema/50ns-legacy.ldif
+++ b/ldap/schema/50ns-legacy.ldif
@@ -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/schema/50ns-mail.ldif b/ldap/schema/50ns-mail.ldif
index ca2d1018..94188df6 100644
--- a/ldap/schema/50ns-mail.ldif
+++ b/ldap/schema/50ns-mail.ldif
@@ -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/schema/50ns-mcd-browser.ldif b/ldap/schema/50ns-mcd-browser.ldif
index 20753400..3b32677e 100644
--- a/ldap/schema/50ns-mcd-browser.ldif
+++ b/ldap/schema/50ns-mcd-browser.ldif
@@ -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/schema/50ns-mcd-config.ldif b/ldap/schema/50ns-mcd-config.ldif
index 6d72272b..6aa2565c 100644
--- a/ldap/schema/50ns-mcd-config.ldif
+++ b/ldap/schema/50ns-mcd-config.ldif
@@ -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/schema/50ns-mcd-li.ldif b/ldap/schema/50ns-mcd-li.ldif
index 12af630f..22dee291 100644
--- a/ldap/schema/50ns-mcd-li.ldif
+++ b/ldap/schema/50ns-mcd-li.ldif
@@ -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/schema/50ns-mcd-mail.ldif b/ldap/schema/50ns-mcd-mail.ldif
index 900c1f9b..1c3919d6 100644
--- a/ldap/schema/50ns-mcd-mail.ldif
+++ b/ldap/schema/50ns-mcd-mail.ldif
@@ -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/schema/50ns-media.ldif b/ldap/schema/50ns-media.ldif
index 7023f0b9..b5682fbb 100644
--- a/ldap/schema/50ns-media.ldif
+++ b/ldap/schema/50ns-media.ldif
@@ -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/schema/50ns-mlm.ldif b/ldap/schema/50ns-mlm.ldif
index ffc446ba..9caab497 100644
--- a/ldap/schema/50ns-mlm.ldif
+++ b/ldap/schema/50ns-mlm.ldif
@@ -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/schema/50ns-msg.ldif b/ldap/schema/50ns-msg.ldif
index 16256539..66e5ca7d 100644
--- a/ldap/schema/50ns-msg.ldif
+++ b/ldap/schema/50ns-msg.ldif
@@ -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/schema/50ns-netshare.ldif b/ldap/schema/50ns-netshare.ldif
index 215a77b5..c971b430 100644
--- a/ldap/schema/50ns-netshare.ldif
+++ b/ldap/schema/50ns-netshare.ldif
@@ -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/schema/50ns-news.ldif b/ldap/schema/50ns-news.ldif
index 806b7a8d..863e15a9 100644
--- a/ldap/schema/50ns-news.ldif
+++ b/ldap/schema/50ns-news.ldif
@@ -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/schema/50ns-proxy.ldif b/ldap/schema/50ns-proxy.ldif
index d9bc6d7e..456be095 100644
--- a/ldap/schema/50ns-proxy.ldif
+++ b/ldap/schema/50ns-proxy.ldif
@@ -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/schema/50ns-value.ldif b/ldap/schema/50ns-value.ldif
index 36aea5d3..168d3aa6 100644
--- a/ldap/schema/50ns-value.ldif
+++ b/ldap/schema/50ns-value.ldif
@@ -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/schema/50ns-wcal.ldif b/ldap/schema/50ns-wcal.ldif
index 40dacb3e..4e6e76e7 100644
--- a/ldap/schema/50ns-wcal.ldif
+++ b/ldap/schema/50ns-wcal.ldif
@@ -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/schema/50ns-web.ldif b/ldap/schema/50ns-web.ldif
index 33a80db7..b53dcffd 100644
--- a/ldap/schema/50ns-web.ldif
+++ b/ldap/schema/50ns-web.ldif
@@ -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/schema/51ns-calendar.ldif b/ldap/schema/51ns-calendar.ldif
index 63bd4217..82b9396f 100644
--- a/ldap/schema/51ns-calendar.ldif
+++ b/ldap/schema/51ns-calendar.ldif
@@ -1,6 +1,6 @@
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/schema/60pam-plugin.ldif b/ldap/schema/60pam-plugin.ldif
index 89f18e19..7adc6c8d 100644
--- a/ldap/schema/60pam-plugin.ldif
+++ b/ldap/schema/60pam-plugin.ldif
@@ -1,6 +1,6 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2005 Red Hat Inc.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/schema/99user.ldif b/ldap/schema/99user.ldif
index f3abb9d3..a9eb5a15 100644
--- a/ldap/schema/99user.ldif
+++ b/ldap/schema/99user.ldif
@@ -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/schema/ns-calendar-globopt.conf b/ldap/schema/ns-calendar-globopt.conf
index a6bca0ad..2d465c21 100644
--- a/ldap/schema/ns-calendar-globopt.conf
+++ b/ldap/schema/ns-calendar-globopt.conf
@@ -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/schema/ns-certificate-globopt.conf b/ldap/schema/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/schema/ns-certificate-globopt.conf
+++ b/ldap/schema/ns-certificate-globopt.conf
@@ -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/schema/ns-compass-globopt.conf b/ldap/schema/ns-compass-globopt.conf
index 99c5ccbf..74a77104 100644
--- a/ldap/schema/ns-compass-globopt.conf
+++ b/ldap/schema/ns-compass-globopt.conf
@@ -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/schema/ns-directory-globopt.conf b/ldap/schema/ns-directory-globopt.conf
index 90121aed..2050853a 100644
--- a/ldap/schema/ns-directory-globopt.conf
+++ b/ldap/schema/ns-directory-globopt.conf
@@ -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/schema/ns-mail-globopt.conf b/ldap/schema/ns-mail-globopt.conf
index 7318651e..55051dbc 100644
--- a/ldap/schema/ns-mail-globopt.conf
+++ b/ldap/schema/ns-mail-globopt.conf
@@ -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/schema/ns-mcd-li-globopt.conf b/ldap/schema/ns-mcd-li-globopt.conf
index 57a75555..f2e92332 100644
--- a/ldap/schema/ns-mcd-li-globopt.conf
+++ b/ldap/schema/ns-mcd-li-globopt.conf
@@ -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/schema/ns-media-globopt.conf b/ldap/schema/ns-media-globopt.conf
index 90121aed..2050853a 100644
--- a/ldap/schema/ns-media-globopt.conf
+++ b/ldap/schema/ns-media-globopt.conf
@@ -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/schema/ns-news-globopt.conf b/ldap/schema/ns-news-globopt.conf
index b21de8c4..13fed51e 100644
--- a/ldap/schema/ns-news-globopt.conf
+++ b/ldap/schema/ns-news-globopt.conf
@@ -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/schema/ns-proxy-globopt.conf b/ldap/schema/ns-proxy-globopt.conf
index 90121aed..2050853a 100644
--- a/ldap/schema/ns-proxy-globopt.conf
+++ b/ldap/schema/ns-proxy-globopt.conf
@@ -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/schema/ns-wcal-globopt.conf b/ldap/schema/ns-wcal-globopt.conf
index d6a035d8..9b8ac815 100644
--- a/ldap/schema/ns-wcal-globopt.conf
+++ b/ldap/schema/ns-wcal-globopt.conf
@@ -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/schema/ns-web-globopt.conf b/ldap/schema/ns-web-globopt.conf
index 14c8f2ff..38f8257d 100644
--- a/ldap/schema/ns-web-globopt.conf
+++ b/ldap/schema/ns-web-globopt.conf
@@ -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/schema/slapd-collations.conf b/ldap/schema/slapd-collations.conf
index cba57648..3501945b 100644
--- a/ldap/schema/slapd-collations.conf
+++ b/ldap/schema/slapd-collations.conf
@@ -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/Makefile b/ldap/servers/Makefile
index 65a20698..013325f6 100644
--- a/ldap/servers/Makefile
+++ b/ldap/servers/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/plugins/Makefile b/ldap/servers/plugins/Makefile
index 638dd87a..5abb48f0 100644
--- a/ldap/servers/plugins/Makefile
+++ b/ldap/servers/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/plugins/acl/ACL-Notes b/ldap/servers/plugins/acl/ACL-Notes
index e275c967..87e5cff3 100644
--- a/ldap/servers/plugins/acl/ACL-Notes
+++ b/ldap/servers/plugins/acl/ACL-Notes
@@ -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/plugins/acl/Makefile b/ldap/servers/plugins/acl/Makefile
index 78edc433..cce65611 100644
--- a/ldap/servers/plugins/acl/Makefile
+++ b/ldap/servers/plugins/acl/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/plugins/acl/acl.c b/ldap/servers/plugins/acl/acl.c
index 8dfbd52a..24848efa 100644
--- a/ldap/servers/plugins/acl/acl.c
+++ b/ldap/servers/plugins/acl/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 **/
#include "acl.h"
diff --git a/ldap/servers/plugins/acl/acl.h b/ldap/servers/plugins/acl/acl.h
index 5e16a0bd..793925f4 100644
--- a/ldap/servers/plugins/acl/acl.h
+++ b/ldap/servers/plugins/acl/acl.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/plugins/acl/acl_ext.c b/ldap/servers/plugins/acl/acl_ext.c
index 28a9ce18..129c7f54 100644
--- a/ldap/servers/plugins/acl/acl_ext.c
+++ b/ldap/servers/plugins/acl/acl_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 **/
#include "acl.h"
diff --git a/ldap/servers/plugins/acl/aclanom.c b/ldap/servers/plugins/acl/aclanom.c
index 71b0c68a..1161a4bd 100644
--- a/ldap/servers/plugins/acl/aclanom.c
+++ b/ldap/servers/plugins/acl/aclanom.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 "acl.h"
diff --git a/ldap/servers/plugins/acl/acldllmain.c b/ldap/servers/plugins/acl/acldllmain.c
index 21ab60c4..e67caf02 100644
--- a/ldap/servers/plugins/acl/acldllmain.c
+++ b/ldap/servers/plugins/acl/acldllmain.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 "acl.h"
diff --git a/ldap/servers/plugins/acl/acleffectiverights.c b/ldap/servers/plugins/acl/acleffectiverights.c
index 1e250e96..98d08ee9 100644
--- a/ldap/servers/plugins/acl/acleffectiverights.c
+++ b/ldap/servers/plugins/acl/acleffectiverights.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/plugins/acl/aclgroup.c b/ldap/servers/plugins/acl/aclgroup.c
index 4cd7039f..1e5c3c49 100644
--- a/ldap/servers/plugins/acl/aclgroup.c
+++ b/ldap/servers/plugins/acl/aclgroup.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 "acl.h"
diff --git a/ldap/servers/plugins/acl/aclinit.c b/ldap/servers/plugins/acl/aclinit.c
index 21e54337..a2e8c6ae 100644
--- a/ldap/servers/plugins/acl/aclinit.c
+++ b/ldap/servers/plugins/acl/aclinit.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 "acl.h"
diff --git a/ldap/servers/plugins/acl/acllas.c b/ldap/servers/plugins/acl/acllas.c
index 0179b0e6..88913ae6 100644
--- a/ldap/servers/plugins/acl/acllas.c
+++ b/ldap/servers/plugins/acl/acllas.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/plugins/acl/acllist.c b/ldap/servers/plugins/acl/acllist.c
index 0147626d..1c7bfe49 100644
--- a/ldap/servers/plugins/acl/acllist.c
+++ b/ldap/servers/plugins/acl/acllist.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/plugins/acl/aclparse.c b/ldap/servers/plugins/acl/aclparse.c
index 2247471a..f3c333fa 100644
--- a/ldap/servers/plugins/acl/aclparse.c
+++ b/ldap/servers/plugins/acl/aclparse.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 "acl.h"
diff --git a/ldap/servers/plugins/acl/aclplugin.c b/ldap/servers/plugins/acl/aclplugin.c
index a39ef3cd..bd948165 100644
--- a/ldap/servers/plugins/acl/aclplugin.c
+++ b/ldap/servers/plugins/acl/aclplugin.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/plugins/acl/aclproxy.c b/ldap/servers/plugins/acl/aclproxy.c
index 9065bddc..c44d58e1 100644
--- a/ldap/servers/plugins/acl/aclproxy.c
+++ b/ldap/servers/plugins/acl/aclproxy.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 "acl.h"
diff --git a/ldap/servers/plugins/acl/aclutil.c b/ldap/servers/plugins/acl/aclutil.c
index 168ca482..d1eb9a67 100644
--- a/ldap/servers/plugins/acl/aclutil.c
+++ b/ldap/servers/plugins/acl/aclutil.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 "acl.h"
diff --git a/ldap/servers/plugins/acl/libacl.def b/ldap/servers/plugins/acl/libacl.def
index 08b38c64..b032de32 100644
--- a/ldap/servers/plugins/acl/libacl.def
+++ b/ldap/servers/plugins/acl/libacl.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/plugins/chainingdb/Makefile b/ldap/servers/plugins/chainingdb/Makefile
index 14e7f598..fb3c1894 100644
--- a/ldap/servers/plugins/chainingdb/Makefile
+++ b/ldap/servers/plugins/chainingdb/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/plugins/chainingdb/cb.h b/ldap/servers/plugins/chainingdb/cb.h
index 8aed412c..167d2ed4 100644
--- a/ldap/servers/plugins/chainingdb/cb.h
+++ b/ldap/servers/plugins/chainingdb/cb.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 CBHFILE
diff --git a/ldap/servers/plugins/chainingdb/cb_abandon.c b/ldap/servers/plugins/chainingdb/cb_abandon.c
index ca0cfc09..2fb5a8a1 100644
--- a/ldap/servers/plugins/chainingdb/cb_abandon.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_acl.c b/ldap/servers/plugins/chainingdb/cb_acl.c
index ce0a6793..db27d209 100644
--- a/ldap/servers/plugins/chainingdb/cb_acl.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_add.c b/ldap/servers/plugins/chainingdb/cb_add.c
index e0b49f7c..4a0fcad0 100644
--- a/ldap/servers/plugins/chainingdb/cb_add.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_bind.c b/ldap/servers/plugins/chainingdb/cb_bind.c
index 495b672f..7f80507a 100644
--- a/ldap/servers/plugins/chainingdb/cb_bind.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_cleanup.c b/ldap/servers/plugins/chainingdb/cb_cleanup.c
index b034b0a1..6062a6fb 100644
--- a/ldap/servers/plugins/chainingdb/cb_cleanup.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_close.c b/ldap/servers/plugins/chainingdb/cb_close.c
index 3ef52e32..4280041e 100644
--- a/ldap/servers/plugins/chainingdb/cb_close.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_compare.c b/ldap/servers/plugins/chainingdb/cb_compare.c
index ebce1645..0163c946 100644
--- a/ldap/servers/plugins/chainingdb/cb_compare.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_config.c b/ldap/servers/plugins/chainingdb/cb_config.c
index 13dd7b22..3f12cccd 100644
--- a/ldap/servers/plugins/chainingdb/cb_config.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_conn_stateless.c b/ldap/servers/plugins/chainingdb/cb_conn_stateless.c
index d97f947e..dd017d02 100644
--- a/ldap/servers/plugins/chainingdb/cb_conn_stateless.c
+++ b/ldap/servers/plugins/chainingdb/cb_conn_stateless.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 "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_controls.c b/ldap/servers/plugins/chainingdb/cb_controls.c
index ab612099..c8a5d457 100644
--- a/ldap/servers/plugins/chainingdb/cb_controls.c
+++ b/ldap/servers/plugins/chainingdb/cb_controls.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 "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_debug.c b/ldap/servers/plugins/chainingdb/cb_debug.c
index 8a33e440..48fe6abb 100644
--- a/ldap/servers/plugins/chainingdb/cb_debug.c
+++ b/ldap/servers/plugins/chainingdb/cb_debug.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/plugins/chainingdb/cb_delete.c b/ldap/servers/plugins/chainingdb/cb_delete.c
index f7eb77f6..fe0e72a4 100644
--- a/ldap/servers/plugins/chainingdb/cb_delete.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_init.c b/ldap/servers/plugins/chainingdb/cb_init.c
index 70af3d42..3b0c20ea 100644
--- a/ldap/servers/plugins/chainingdb/cb_init.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_instance.c b/ldap/servers/plugins/chainingdb/cb_instance.c
index 60af726f..2b6f6368 100644
--- a/ldap/servers/plugins/chainingdb/cb_instance.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_modify.c b/ldap/servers/plugins/chainingdb/cb_modify.c
index 51aed6a3..91b3b9ae 100644
--- a/ldap/servers/plugins/chainingdb/cb_modify.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_modrdn.c b/ldap/servers/plugins/chainingdb/cb_modrdn.c
index e6b5dadb..8e1b0747 100644
--- a/ldap/servers/plugins/chainingdb/cb_modrdn.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_monitor.c b/ldap/servers/plugins/chainingdb/cb_monitor.c
index 11ef3bda..8b6eca69 100644
--- a/ldap/servers/plugins/chainingdb/cb_monitor.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_schema.c b/ldap/servers/plugins/chainingdb/cb_schema.c
index 2337b977..4321f4d2 100644
--- a/ldap/servers/plugins/chainingdb/cb_schema.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_search.c b/ldap/servers/plugins/chainingdb/cb_search.c
index d9cf6ef7..dcb80798 100644
--- a/ldap/servers/plugins/chainingdb/cb_search.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_size.c b/ldap/servers/plugins/chainingdb/cb_size.c
index a6f1fb20..2cfee511 100644
--- a/ldap/servers/plugins/chainingdb/cb_size.c
+++ b/ldap/servers/plugins/chainingdb/cb_size.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 "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_start.c b/ldap/servers/plugins/chainingdb/cb_start.c
index c4a4538b..aa64435b 100644
--- a/ldap/servers/plugins/chainingdb/cb_start.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_temp.c b/ldap/servers/plugins/chainingdb/cb_temp.c
index fc5407ff..13a13924 100644
--- a/ldap/servers/plugins/chainingdb/cb_temp.c
+++ b/ldap/servers/plugins/chainingdb/cb_temp.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 "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_test.c b/ldap/servers/plugins/chainingdb/cb_test.c
index cb075664..7f561a80 100644
--- a/ldap/servers/plugins/chainingdb/cb_test.c
+++ b/ldap/servers/plugins/chainingdb/cb_test.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 "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_unbind.c b/ldap/servers/plugins/chainingdb/cb_unbind.c
index 1400ae1f..9dd6b8e8 100644
--- a/ldap/servers/plugins/chainingdb/cb_unbind.c
+++ b/ldap/servers/plugins/chainingdb/cb_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 **/
#include "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cb_utils.c b/ldap/servers/plugins/chainingdb/cb_utils.c
index b73effd0..4ba278eb 100644
--- a/ldap/servers/plugins/chainingdb/cb_utils.c
+++ b/ldap/servers/plugins/chainingdb/cb_utils.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 "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/cbdllmain.c b/ldap/servers/plugins/chainingdb/cbdllmain.c
index cacf9cb5..b36239c4 100644
--- a/ldap/servers/plugins/chainingdb/cbdllmain.c
+++ b/ldap/servers/plugins/chainingdb/cbdllmain.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 "cb.h"
diff --git a/ldap/servers/plugins/chainingdb/libcb.def b/ldap/servers/plugins/chainingdb/libcb.def
index 9b82ad38..4af437c1 100644
--- a/ldap/servers/plugins/chainingdb/libcb.def
+++ b/ldap/servers/plugins/chainingdb/libcb.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/plugins/collation/Makefile b/ldap/servers/plugins/collation/Makefile
index 927faf6d..2cea440e 100644
--- a/ldap/servers/plugins/collation/Makefile
+++ b/ldap/servers/plugins/collation/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/plugins/collation/collate.c b/ldap/servers/plugins/collation/collate.c
index 603caf53..90dad328 100644
--- a/ldap/servers/plugins/collation/collate.c
+++ b/ldap/servers/plugins/collation/collate.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 **/
/* collate.c - implementation of indexing, using a Collation */
diff --git a/ldap/servers/plugins/collation/collate.h b/ldap/servers/plugins/collation/collate.h
index 29e51022..679cb039 100644
--- a/ldap/servers/plugins/collation/collate.h
+++ b/ldap/servers/plugins/collation/collate.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/plugins/collation/collation.def b/ldap/servers/plugins/collation/collation.def
index 02733ec8..76dc59e3 100644
--- a/ldap/servers/plugins/collation/collation.def
+++ b/ldap/servers/plugins/collation/collation.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/plugins/collation/config.c b/ldap/servers/plugins/collation/config.c
index ef3e66cf..3bfd35e4 100644
--- a/ldap/servers/plugins/collation/config.c
+++ b/ldap/servers/plugins/collation/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 **/
#include "collate.h"
diff --git a/ldap/servers/plugins/collation/config.h b/ldap/servers/plugins/collation/config.h
index 1a4aef66..d64d1f9c 100644
--- a/ldap/servers/plugins/collation/config.h
+++ b/ldap/servers/plugins/collation/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 _COLL_CONFIG_H_
diff --git a/ldap/servers/plugins/collation/debug.c b/ldap/servers/plugins/collation/debug.c
index 99266a33..c97bb59a 100644
--- a/ldap/servers/plugins/collation/debug.c
+++ b/ldap/servers/plugins/collation/debug.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 **/
#ifdef _WIN32
diff --git a/ldap/servers/plugins/collation/dllmain.c b/ldap/servers/plugins/collation/dllmain.c
index fa158500..2f6068ee 100644
--- a/ldap/servers/plugins/collation/dllmain.c
+++ b/ldap/servers/plugins/collation/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/plugins/collation/orfilter.c b/ldap/servers/plugins/collation/orfilter.c
index 65222baa..572441db 100644
--- a/ldap/servers/plugins/collation/orfilter.c
+++ b/ldap/servers/plugins/collation/orfilter.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 **/
/* orfilter.c - implementation of ordering rule filter */
diff --git a/ldap/servers/plugins/collation/orfilter.h b/ldap/servers/plugins/collation/orfilter.h
index 85a32592..0b84a368 100644
--- a/ldap/servers/plugins/collation/orfilter.h
+++ b/ldap/servers/plugins/collation/orfilter.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/plugins/cos/Makefile b/ldap/servers/plugins/cos/Makefile
index 7f4779e3..8d437b66 100644
--- a/ldap/servers/plugins/cos/Makefile
+++ b/ldap/servers/plugins/cos/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/plugins/cos/cos.c b/ldap/servers/plugins/cos/cos.c
index 5a077646..d283da0b 100644
--- a/ldap/servers/plugins/cos/cos.c
+++ b/ldap/servers/plugins/cos/cos.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/plugins/cos/cos.def b/ldap/servers/plugins/cos/cos.def
index e1b6551a..49214f90 100644
--- a/ldap/servers/plugins/cos/cos.def
+++ b/ldap/servers/plugins/cos/cos.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/plugins/cos/cos_cache.c b/ldap/servers/plugins/cos/cos_cache.c
index 165f47d1..e88156d3 100644
--- a/ldap/servers/plugins/cos/cos_cache.c
+++ b/ldap/servers/plugins/cos/cos_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 **/
/*
diff --git a/ldap/servers/plugins/cos/cos_cache.h b/ldap/servers/plugins/cos/cos_cache.h
index ef47a9ab..6b4a397c 100644
--- a/ldap/servers/plugins/cos/cos_cache.h
+++ b/ldap/servers/plugins/cos/cos_cache.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/plugins/cos/dllmain.c b/ldap/servers/plugins/cos/dllmain.c
index fabf8677..155207c2 100644
--- a/ldap/servers/plugins/cos/dllmain.c
+++ b/ldap/servers/plugins/cos/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/plugins/pam_passthru/Makefile b/ldap/servers/plugins/pam_passthru/Makefile
index c71fdea7..a128b360 100644
--- a/ldap/servers/plugins/pam_passthru/Makefile
+++ b/ldap/servers/plugins/pam_passthru/Makefile
@@ -1,6 +1,6 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2005 Red Hat
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/plugins/pam_passthru/README b/ldap/servers/plugins/pam_passthru/README
index efbc48a3..6d080ec7 100644
--- a/ldap/servers/plugins/pam_passthru/README
+++ b/ldap/servers/plugins/pam_passthru/README
@@ -1,6 +1,6 @@
#
# BEGIN COPYRIGHT BLOCK
-# Copyright 2005 Red Hat
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
# END COPYRIGHT BLOCK
#
diff --git a/ldap/servers/plugins/pam_passthru/libpam_passthru.def b/ldap/servers/plugins/pam_passthru/libpam_passthru.def
index 02c2f0f7..0e5a8884 100644
--- a/ldap/servers/plugins/pam_passthru/libpam_passthru.def
+++ b/ldap/servers/plugins/pam_passthru/libpam_passthru.def
@@ -1,5 +1,5 @@
; BEGIN COPYRIGHT BLOCK
-; Copyright 2005 Red Hat
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
; END COPYRIGHT BLOCK
;
diff --git a/ldap/servers/plugins/pam_passthru/pam_passthru.h b/ldap/servers/plugins/pam_passthru/pam_passthru.h
index 5b437880..7a62a197 100644
--- a/ldap/servers/plugins/pam_passthru/pam_passthru.h
+++ b/ldap/servers/plugins/pam_passthru/pam_passthru.h
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2005 Red Hat
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/plugins/pam_passthru/pam_ptconfig.c b/ldap/servers/plugins/pam_passthru/pam_ptconfig.c
index 4ba28f9c..50aafef8 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptconfig.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptconfig.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2005 Red Hat
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/plugins/pam_passthru/pam_ptdebug.c b/ldap/servers/plugins/pam_passthru/pam_ptdebug.c
index dec8632d..3d712573 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptdebug.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptdebug.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2005 Red Hat
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/plugins/pam_passthru/pam_ptdllmain.c b/ldap/servers/plugins/pam_passthru/pam_ptdllmain.c
index 28d8d805..4c5e555d 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptdllmain.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptdllmain.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2005 Red Hat
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
#include "ldap.h"
diff --git a/ldap/servers/plugins/pam_passthru/pam_ptimpl.c b/ldap/servers/plugins/pam_passthru/pam_ptimpl.c
index a8b2eaee..c6b35a48 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptimpl.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptimpl.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2005 Red Hat
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/plugins/pam_passthru/pam_ptpreop.c b/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
index 71ee4973..59395755 100644
--- a/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
+++ b/ldap/servers/plugins/pam_passthru/pam_ptpreop.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2005 Red Hat
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
/*
diff --git a/ldap/servers/plugins/passthru/Makefile b/ldap/servers/plugins/passthru/Makefile
index 2a099591..cf83ced1 100644
--- a/ldap/servers/plugins/passthru/Makefile
+++ b/ldap/servers/plugins/passthru/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/plugins/passthru/PT-Notes b/ldap/servers/plugins/passthru/PT-Notes
index 2e3cea10..5ba622db 100644
--- a/ldap/servers/plugins/passthru/PT-Notes
+++ b/ldap/servers/plugins/passthru/PT-Notes
@@ -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/plugins/passthru/libpassthru.def b/ldap/servers/plugins/passthru/libpassthru.def
index f1b04c7e..3127d931 100644
--- a/ldap/servers/plugins/passthru/libpassthru.def
+++ b/ldap/servers/plugins/passthru/libpassthru.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/plugins/passthru/passthru.h b/ldap/servers/plugins/passthru/passthru.h
index fdf30d65..243ab810 100644
--- a/ldap/servers/plugins/passthru/passthru.h
+++ b/ldap/servers/plugins/passthru/passthru.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/plugins/passthru/ptbind.c b/ldap/servers/plugins/passthru/ptbind.c
index f9da57a1..f0ad178b 100644
--- a/ldap/servers/plugins/passthru/ptbind.c
+++ b/ldap/servers/plugins/passthru/ptbind.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/plugins/passthru/ptconfig.c b/ldap/servers/plugins/passthru/ptconfig.c
index c3653f66..74a5ed4b 100644
--- a/ldap/servers/plugins/passthru/ptconfig.c
+++ b/ldap/servers/plugins/passthru/ptconfig.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/plugins/passthru/ptconn.c b/ldap/servers/plugins/passthru/ptconn.c
index 56e2e0cc..67efb2de 100644
--- a/ldap/servers/plugins/passthru/ptconn.c
+++ b/ldap/servers/plugins/passthru/ptconn.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/plugins/passthru/ptdebug.c b/ldap/servers/plugins/passthru/ptdebug.c
index 0f01c4a7..2eef53b6 100644
--- a/ldap/servers/plugins/passthru/ptdebug.c
+++ b/ldap/servers/plugins/passthru/ptdebug.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/plugins/passthru/ptdllmain.c b/ldap/servers/plugins/passthru/ptdllmain.c
index 0e9eaccf..c58f0349 100644
--- a/ldap/servers/plugins/passthru/ptdllmain.c
+++ b/ldap/servers/plugins/passthru/ptdllmain.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 "ldap.h"
diff --git a/ldap/servers/plugins/passthru/ptpreop.c b/ldap/servers/plugins/passthru/ptpreop.c
index aaad0621..8825a313 100644
--- a/ldap/servers/plugins/passthru/ptpreop.c
+++ b/ldap/servers/plugins/passthru/ptpreop.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/plugins/passthru/ptutil.c b/ldap/servers/plugins/passthru/ptutil.c
index 4a1b307b..c03198bc 100644
--- a/ldap/servers/plugins/passthru/ptutil.c
+++ b/ldap/servers/plugins/passthru/ptutil.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/plugins/presence/Makefile b/ldap/servers/plugins/presence/Makefile
index 2ffbeedf..66247ef6 100644
--- a/ldap/servers/plugins/presence/Makefile
+++ b/ldap/servers/plugins/presence/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/plugins/presence/dllmain.c b/ldap/servers/plugins/presence/dllmain.c
index fabf8677..155207c2 100644
--- a/ldap/servers/plugins/presence/dllmain.c
+++ b/ldap/servers/plugins/presence/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/plugins/presence/presence.c b/ldap/servers/plugins/presence/presence.c
index 6c75e745..7ba203d9 100644
--- a/ldap/servers/plugins/presence/presence.c
+++ b/ldap/servers/plugins/presence/presence.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/plugins/presence/presence.def b/ldap/servers/plugins/presence/presence.def
index 4d083d26..f44814d7 100644
--- a/ldap/servers/plugins/presence/presence.def
+++ b/ldap/servers/plugins/presence/presence.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/plugins/pwdstorage/Makefile b/ldap/servers/plugins/pwdstorage/Makefile
index 1478dca2..3ec656be 100644
--- a/ldap/servers/plugins/pwdstorage/Makefile
+++ b/ldap/servers/plugins/pwdstorage/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/plugins/pwdstorage/clear_pwd.c b/ldap/servers/plugins/pwdstorage/clear_pwd.c
index 4b2a3ca5..0b07e7ad 100644
--- a/ldap/servers/plugins/pwdstorage/clear_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/clear_pwd.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/plugins/pwdstorage/crypt_pwd.c b/ldap/servers/plugins/pwdstorage/crypt_pwd.c
index df179ef6..4c0f1221 100644
--- a/ldap/servers/plugins/pwdstorage/crypt_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/crypt_pwd.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/plugins/pwdstorage/dllmain.c b/ldap/servers/plugins/pwdstorage/dllmain.c
index 71530805..f65b11a9 100644
--- a/ldap/servers/plugins/pwdstorage/dllmain.c
+++ b/ldap/servers/plugins/pwdstorage/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/plugins/pwdstorage/libpwdstorage.def b/ldap/servers/plugins/pwdstorage/libpwdstorage.def
index 846905d2..50c1466f 100644
--- a/ldap/servers/plugins/pwdstorage/libpwdstorage.def
+++ b/ldap/servers/plugins/pwdstorage/libpwdstorage.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/plugins/pwdstorage/md5.h b/ldap/servers/plugins/pwdstorage/md5.h
index 6f7ec036..eaec1fe0 100644
--- a/ldap/servers/plugins/pwdstorage/md5.h
+++ b/ldap/servers/plugins/pwdstorage/md5.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/plugins/pwdstorage/md5c.c b/ldap/servers/plugins/pwdstorage/md5c.c
index d78b772c..a9732785 100644
--- a/ldap/servers/plugins/pwdstorage/md5c.c
+++ b/ldap/servers/plugins/pwdstorage/md5c.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 **/
/* MD5 code taken from reference implementation published in RFC 1321 */
diff --git a/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.bu b/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.bu
index 7cdd74b3..f94c4c84 100644
--- a/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.bu
+++ b/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.bu
@@ -1,6 +1,6 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 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/plugins/pwdstorage/ns-mta-md5_pwd.c b/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.c
index f3c11a10..fa0e9908 100644
--- a/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/ns-mta-md5_pwd.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/plugins/pwdstorage/pwd_init.c b/ldap/servers/plugins/pwdstorage/pwd_init.c
index 4ee5138b..ba6ef385 100644
--- a/ldap/servers/plugins/pwdstorage/pwd_init.c
+++ b/ldap/servers/plugins/pwdstorage/pwd_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/plugins/pwdstorage/pwdstorage.h b/ldap/servers/plugins/pwdstorage/pwdstorage.h
index 0e938cb9..92eb7680 100644
--- a/ldap/servers/plugins/pwdstorage/pwdstorage.h
+++ b/ldap/servers/plugins/pwdstorage/pwdstorage.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 _PWDSTORAGE_H
diff --git a/ldap/servers/plugins/pwdstorage/sha_pwd.c b/ldap/servers/plugins/pwdstorage/sha_pwd.c
index c8cf435d..ff91f6e6 100644
--- a/ldap/servers/plugins/pwdstorage/sha_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/sha_pwd.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/plugins/pwdstorage/ssha_pwd.c b/ldap/servers/plugins/pwdstorage/ssha_pwd.c
index b3c82d6d..194ee817 100644
--- a/ldap/servers/plugins/pwdstorage/ssha_pwd.c
+++ b/ldap/servers/plugins/pwdstorage/ssha_pwd.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/plugins/referint/Makefile b/ldap/servers/plugins/referint/Makefile
index be2f99e7..d955ba3a 100644
--- a/ldap/servers/plugins/referint/Makefile
+++ b/ldap/servers/plugins/referint/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/plugins/referint/dllmain.c b/ldap/servers/plugins/referint/dllmain.c
index 96bfcbb0..a7388684 100644
--- a/ldap/servers/plugins/referint/dllmain.c
+++ b/ldap/servers/plugins/referint/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/plugins/referint/referint.c b/ldap/servers/plugins/referint/referint.c
index e0ad15fd..5bd11214 100644
--- a/ldap/servers/plugins/referint/referint.c
+++ b/ldap/servers/plugins/referint/referint.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/plugins/referint/referint.def b/ldap/servers/plugins/referint/referint.def
index 3dcd618a..d99eb393 100644
--- a/ldap/servers/plugins/referint/referint.def
+++ b/ldap/servers/plugins/referint/referint.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/plugins/replication/Makefile b/ldap/servers/plugins/replication/Makefile
index cdcc4f7d..e39d18d4 100644
--- a/ldap/servers/plugins/replication/Makefile
+++ b/ldap/servers/plugins/replication/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/plugins/replication/cl4.h b/ldap/servers/plugins/replication/cl4.h
index 0dbcece2..77e4dc57 100644
--- a/ldap/servers/plugins/replication/cl4.h
+++ b/ldap/servers/plugins/replication/cl4.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 **/
/* cl4.h - global declarations used by the 4.0 style changelog module
diff --git a/ldap/servers/plugins/replication/cl4_api.c b/ldap/servers/plugins/replication/cl4_api.c
index 135b4a5b..f60eb91e 100644
--- a/ldap/servers/plugins/replication/cl4_api.c
+++ b/ldap/servers/plugins/replication/cl4_api.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 **/
/* cl4_api.h - implementation of the minimal interface to 4.0 changelog necessary to
diff --git a/ldap/servers/plugins/replication/cl4_api.h b/ldap/servers/plugins/replication/cl4_api.h
index c0b20e57..36c171df 100644
--- a/ldap/servers/plugins/replication/cl4_api.h
+++ b/ldap/servers/plugins/replication/cl4_api.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 **/
/* cl4_api.h - minimal interface to 4.0 changelog necessary to link 4.0 changelog
diff --git a/ldap/servers/plugins/replication/cl4_init.c b/ldap/servers/plugins/replication/cl4_init.c
index 6c12f0b0..7ed3c47d 100644
--- a/ldap/servers/plugins/replication/cl4_init.c
+++ b/ldap/servers/plugins/replication/cl4_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/plugins/replication/cl5.h b/ldap/servers/plugins/replication/cl5.h
index a80c666b..e5e0d777 100644
--- a/ldap/servers/plugins/replication/cl5.h
+++ b/ldap/servers/plugins/replication/cl5.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 **/
/* cl5.h - changelog related function */
diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
index 792d3646..e8c01157 100644
--- a/ldap/servers/plugins/replication/cl5_api.c
+++ b/ldap/servers/plugins/replication/cl5_api.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/plugins/replication/cl5_api.h b/ldap/servers/plugins/replication/cl5_api.h
index 49296df2..fa815261 100644
--- a/ldap/servers/plugins/replication/cl5_api.h
+++ b/ldap/servers/plugins/replication/cl5_api.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 **/
/* cl5_api.h - interface to 5.0 changelog */
diff --git a/ldap/servers/plugins/replication/cl5_clcache.c b/ldap/servers/plugins/replication/cl5_clcache.c
index 585a7266..17eb8e59 100644
--- a/ldap/servers/plugins/replication/cl5_clcache.c
+++ b/ldap/servers/plugins/replication/cl5_clcache.c
@@ -1,5 +1,5 @@
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2003 Netscape Communications Corporation
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
* END COPYRIGHT BLOCK **/
diff --git a/ldap/servers/plugins/replication/cl5_clcache.h b/ldap/servers/plugins/replication/cl5_clcache.h
index 93024d1e..4a8ce52c 100644
--- a/ldap/servers/plugins/replication/cl5_clcache.h
+++ b/ldap/servers/plugins/replication/cl5_clcache.h
@@ -2,8 +2,8 @@
#define CL5_CLCACHE_H
/** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 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/plugins/replication/cl5_config.c b/ldap/servers/plugins/replication/cl5_config.c
index 58c79dc1..846f39fe 100644
--- a/ldap/servers/plugins/replication/cl5_config.c
+++ b/ldap/servers/plugins/replication/cl5_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 **/
/* cl5_config.c - functions to process changelog configuration
diff --git a/ldap/servers/plugins/replication/cl5_init.c b/ldap/servers/plugins/replication/cl5_init.c
index 435299c0..bcde6cba 100644
--- a/ldap/servers/plugins/replication/cl5_init.c
+++ b/ldap/servers/plugins/replication/cl5_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/plugins/replication/cl5_test.c b/ldap/servers/plugins/replication/cl5_test.c
index b64a60f5..e8605fab 100644
--- a/ldap/servers/plugins/replication/cl5_test.c
+++ b/ldap/servers/plugins/replication/cl5_test.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 **/
/* cl5_test.c - changelog test cases */
diff --git a/ldap/servers/plugins/replication/cl5_test.h b/ldap/servers/plugins/replication/cl5_test.h
index 57d8435c..cf1b3e27 100644
--- a/ldap/servers/plugins/replication/cl5_test.h
+++ b/ldap/servers/plugins/replication/cl5_test.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 **/
/* cl5_test.h - changelog test cases */
diff --git a/ldap/servers/plugins/replication/csnpl.c b/ldap/servers/plugins/replication/csnpl.c
index 7180af67..08c6bcf6 100644
--- a/ldap/servers/plugins/replication/csnpl.c
+++ b/ldap/servers/plugins/replication/csnpl.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/plugins/replication/csnpl.h b/ldap/servers/plugins/replication/csnpl.h
index ae1b4c85..c29cfc98 100644
--- a/ldap/servers/plugins/replication/csnpl.h
+++ b/ldap/servers/plugins/replication/csnpl.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 **/
/* csnpl.h - interface for csn pending list */
diff --git a/ldap/servers/plugins/replication/dllmain.c b/ldap/servers/plugins/replication/dllmain.c
index 3f17b14c..f55f5d75 100644
--- a/ldap/servers/plugins/replication/dllmain.c
+++ b/ldap/servers/plugins/replication/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/plugins/replication/legacy_consumer.c b/ldap/servers/plugins/replication/legacy_consumer.c
index 8bf45ee1..f04d8ed2 100644
--- a/ldap/servers/plugins/replication/legacy_consumer.c
+++ b/ldap/servers/plugins/replication/legacy_consumer.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/plugins/replication/llist.c b/ldap/servers/plugins/replication/llist.c
index 175ea48f..dc363d83 100644
--- a/ldap/servers/plugins/replication/llist.c
+++ b/ldap/servers/plugins/replication/llist.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 **/
/* llist.c - single link list implementation */
diff --git a/ldap/servers/plugins/replication/llist.h b/ldap/servers/plugins/replication/llist.h
index 3b196ef8..d8fc0fe7 100644
--- a/ldap/servers/plugins/replication/llist.h
+++ b/ldap/servers/plugins/replication/llist.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 **/
/* llist.h - single link list interface */
diff --git a/ldap/servers/plugins/replication/profile.c b/ldap/servers/plugins/replication/profile.c
index 0a7de374..af233355 100644
--- a/ldap/servers/plugins/replication/profile.c
+++ b/ldap/servers/plugins/replication/profile.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/plugins/replication/repl.h b/ldap/servers/plugins/replication/repl.h
index 8e502816..07d8b1f7 100644
--- a/ldap/servers/plugins/replication/repl.h
+++ b/ldap/servers/plugins/replication/repl.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/plugins/replication/repl5.h b/ldap/servers/plugins/replication/repl5.h
index f5d6943a..d899025d 100644
--- a/ldap/servers/plugins/replication/repl5.h
+++ b/ldap/servers/plugins/replication/repl5.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/plugins/replication/repl5_agmt.c b/ldap/servers/plugins/replication/repl5_agmt.c
index 2992fc11..b8bd09a3 100644
--- a/ldap/servers/plugins/replication/repl5_agmt.c
+++ b/ldap/servers/plugins/replication/repl5_agmt.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 **/
/* repl5_agmt.c */
diff --git a/ldap/servers/plugins/replication/repl5_agmtlist.c b/ldap/servers/plugins/replication/repl5_agmtlist.c
index 5c7213a6..e821ae2b 100644
--- a/ldap/servers/plugins/replication/repl5_agmtlist.c
+++ b/ldap/servers/plugins/replication/repl5_agmtlist.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 **/
/* repl5_agmtlist.c */
diff --git a/ldap/servers/plugins/replication/repl5_backoff.c b/ldap/servers/plugins/replication/repl5_backoff.c
index d0a90878..edb30d1a 100644
--- a/ldap/servers/plugins/replication/repl5_backoff.c
+++ b/ldap/servers/plugins/replication/repl5_backoff.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 **/
/* repl5_backoff.c */
diff --git a/ldap/servers/plugins/replication/repl5_connection.c b/ldap/servers/plugins/replication/repl5_connection.c
index a50c163a..cd6c45ae 100644
--- a/ldap/servers/plugins/replication/repl5_connection.c
+++ b/ldap/servers/plugins/replication/repl5_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 **/
diff --git a/ldap/servers/plugins/replication/repl5_inc_protocol.c b/ldap/servers/plugins/replication/repl5_inc_protocol.c
index a9905a34..c5601c67 100644
--- a/ldap/servers/plugins/replication/repl5_inc_protocol.c
+++ b/ldap/servers/plugins/replication/repl5_inc_protocol.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/plugins/replication/repl5_init.c b/ldap/servers/plugins/replication/repl5_init.c
index eae3b238..8aead52d 100644
--- a/ldap/servers/plugins/replication/repl5_init.c
+++ b/ldap/servers/plugins/replication/repl5_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/plugins/replication/repl5_mtnode_ext.c b/ldap/servers/plugins/replication/repl5_mtnode_ext.c
index e677927c..b6c01d6e 100644
--- a/ldap/servers/plugins/replication/repl5_mtnode_ext.c
+++ b/ldap/servers/plugins/replication/repl5_mtnode_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/plugins/replication/repl5_plugins.c b/ldap/servers/plugins/replication/repl5_plugins.c
index afee321a..c929fafd 100644
--- a/ldap/servers/plugins/replication/repl5_plugins.c
+++ b/ldap/servers/plugins/replication/repl5_plugins.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/plugins/replication/repl5_prot_private.h b/ldap/servers/plugins/replication/repl5_prot_private.h
index fbaf96e4..a4823822 100644
--- a/ldap/servers/plugins/replication/repl5_prot_private.h
+++ b/ldap/servers/plugins/replication/repl5_prot_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 **/
diff --git a/ldap/servers/plugins/replication/repl5_protocol.c b/ldap/servers/plugins/replication/repl5_protocol.c
index 725bf3f2..c1aa16a9 100644
--- a/ldap/servers/plugins/replication/repl5_protocol.c
+++ b/ldap/servers/plugins/replication/repl5_protocol.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/plugins/replication/repl5_protocol_util.c b/ldap/servers/plugins/replication/repl5_protocol_util.c
index 16f65485..fdf7769f 100644
--- a/ldap/servers/plugins/replication/repl5_protocol_util.c
+++ b/ldap/servers/plugins/replication/repl5_protocol_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 **/
diff --git a/ldap/servers/plugins/replication/repl5_replica.c b/ldap/servers/plugins/replication/repl5_replica.c
index 028bec2e..525fe10d 100644
--- a/ldap/servers/plugins/replication/repl5_replica.c
+++ b/ldap/servers/plugins/replication/repl5_replica.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 **/
/* repl5_replica.c */
diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c
index 65533dd5..e93ec640 100644
--- a/ldap/servers/plugins/replication/repl5_replica_config.c
+++ b/ldap/servers/plugins/replication/repl5_replica_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/plugins/replication/repl5_replica_dnhash.c b/ldap/servers/plugins/replication/repl5_replica_dnhash.c
index 4b9f42b9..66d2404f 100644
--- a/ldap/servers/plugins/replication/repl5_replica_dnhash.c
+++ b/ldap/servers/plugins/replication/repl5_replica_dnhash.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 **/
/* repl5_replica_dnhash.c */
diff --git a/ldap/servers/plugins/replication/repl5_replica_hash.c b/ldap/servers/plugins/replication/repl5_replica_hash.c
index 92ea87f4..baec7c84 100644
--- a/ldap/servers/plugins/replication/repl5_replica_hash.c
+++ b/ldap/servers/plugins/replication/repl5_replica_hash.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/plugins/replication/repl5_replsupplier.c b/ldap/servers/plugins/replication/repl5_replsupplier.c
index e98d0e58..8fcc8c16 100644
--- a/ldap/servers/plugins/replication/repl5_replsupplier.c
+++ b/ldap/servers/plugins/replication/repl5_replsupplier.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 **/
/* repl5_replsupplier.c */
diff --git a/ldap/servers/plugins/replication/repl5_ruv.c b/ldap/servers/plugins/replication/repl5_ruv.c
index b8cb79c9..306c20a2 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.c
+++ b/ldap/servers/plugins/replication/repl5_ruv.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/plugins/replication/repl5_ruv.h b/ldap/servers/plugins/replication/repl5_ruv.h
index 8484e74b..29d87000 100644
--- a/ldap/servers/plugins/replication/repl5_ruv.h
+++ b/ldap/servers/plugins/replication/repl5_ruv.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/plugins/replication/repl5_schedule.c b/ldap/servers/plugins/replication/repl5_schedule.c
index 427e79a9..c07a2339 100644
--- a/ldap/servers/plugins/replication/repl5_schedule.c
+++ b/ldap/servers/plugins/replication/repl5_schedule.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 **/
/* repl5_schedule.c */
diff --git a/ldap/servers/plugins/replication/repl5_tot_protocol.c b/ldap/servers/plugins/replication/repl5_tot_protocol.c
index 45e91f3b..cbbfccf0 100644
--- a/ldap/servers/plugins/replication/repl5_tot_protocol.c
+++ b/ldap/servers/plugins/replication/repl5_tot_protocol.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/plugins/replication/repl5_total.c b/ldap/servers/plugins/replication/repl5_total.c
index 66dcc353..5524a46a 100644
--- a/ldap/servers/plugins/replication/repl5_total.c
+++ b/ldap/servers/plugins/replication/repl5_total.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/plugins/replication/repl5_updatedn_list.c b/ldap/servers/plugins/replication/repl5_updatedn_list.c
index 02304d19..83f164d6 100644
--- a/ldap/servers/plugins/replication/repl5_updatedn_list.c
+++ b/ldap/servers/plugins/replication/repl5_updatedn_list.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/plugins/replication/repl_add.c b/ldap/servers/plugins/replication/repl_add.c
index 3d47c1db..e117086f 100644
--- a/ldap/servers/plugins/replication/repl_add.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_bind.c b/ldap/servers/plugins/replication/repl_bind.c
index e317e311..8671c7bb 100644
--- a/ldap/servers/plugins/replication/repl_bind.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_compare.c b/ldap/servers/plugins/replication/repl_compare.c
index 34f2b944..3aa7980e 100644
--- a/ldap/servers/plugins/replication/repl_compare.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_connext.c b/ldap/servers/plugins/replication/repl_connext.c
index 9bda7ca4..42929e28 100644
--- a/ldap/servers/plugins/replication/repl_connext.c
+++ b/ldap/servers/plugins/replication/repl_connext.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 **/
/* repl_connext.c - replication extension to the Connection object
diff --git a/ldap/servers/plugins/replication/repl_controls.c b/ldap/servers/plugins/replication/repl_controls.c
index ae1cb119..d569afc9 100644
--- a/ldap/servers/plugins/replication/repl_controls.c
+++ b/ldap/servers/plugins/replication/repl_controls.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/plugins/replication/repl_delete.c b/ldap/servers/plugins/replication/repl_delete.c
index 6f8e07df..ffa62fad 100644
--- a/ldap/servers/plugins/replication/repl_delete.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_entry.c b/ldap/servers/plugins/replication/repl_entry.c
index 83bf2857..ebf5eaea 100644
--- a/ldap/servers/plugins/replication/repl_entry.c
+++ b/ldap/servers/plugins/replication/repl_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 **/
diff --git a/ldap/servers/plugins/replication/repl_ext.c b/ldap/servers/plugins/replication/repl_ext.c
index 4ad28726..8a65d3ba 100644
--- a/ldap/servers/plugins/replication/repl_ext.c
+++ b/ldap/servers/plugins/replication/repl_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 **/
/* repl_ext.c - manages operation extensions created by the
diff --git a/ldap/servers/plugins/replication/repl_extop.c b/ldap/servers/plugins/replication/repl_extop.c
index f972f886..cb491a39 100644
--- a/ldap/servers/plugins/replication/repl_extop.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_globals.c b/ldap/servers/plugins/replication/repl_globals.c
index bee5dc4a..4a1e6ac6 100644
--- a/ldap/servers/plugins/replication/repl_globals.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_helper.c b/ldap/servers/plugins/replication/repl_helper.c
index 05616cf1..66c2f17b 100644
--- a/ldap/servers/plugins/replication/repl_helper.c
+++ b/ldap/servers/plugins/replication/repl_helper.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 "repl_helper.h"
diff --git a/ldap/servers/plugins/replication/repl_helper.h b/ldap/servers/plugins/replication/repl_helper.h
index 076710ce..19c45278 100644
--- a/ldap/servers/plugins/replication/repl_helper.h
+++ b/ldap/servers/plugins/replication/repl_helper.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/plugins/replication/repl_init.c b/ldap/servers/plugins/replication/repl_init.c
index 42da2074..35d8bbf4 100644
--- a/ldap/servers/plugins/replication/repl_init.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_modify.c b/ldap/servers/plugins/replication/repl_modify.c
index 26753cc0..027b259b 100644
--- a/ldap/servers/plugins/replication/repl_modify.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_modrdn.c b/ldap/servers/plugins/replication/repl_modrdn.c
index 653aff0a..65927e1a 100644
--- a/ldap/servers/plugins/replication/repl_modrdn.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_monitor.c b/ldap/servers/plugins/replication/repl_monitor.c
index ec52d611..9e44a93e 100644
--- a/ldap/servers/plugins/replication/repl_monitor.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_objset.c b/ldap/servers/plugins/replication/repl_objset.c
index f0a68097..841dede1 100644
--- a/ldap/servers/plugins/replication/repl_objset.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_objset.h b/ldap/servers/plugins/replication/repl_objset.h
index 72af5109..27dc9d3c 100644
--- a/ldap/servers/plugins/replication/repl_objset.h
+++ b/ldap/servers/plugins/replication/repl_objset.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/plugins/replication/repl_opext.c b/ldap/servers/plugins/replication/repl_opext.c
index d9c8d1ed..b8d117ee 100644
--- a/ldap/servers/plugins/replication/repl_opext.c
+++ b/ldap/servers/plugins/replication/repl_opext.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 **/
/* supplier_operation_extension.c - replication extension to the Operation object
diff --git a/ldap/servers/plugins/replication/repl_ops.c b/ldap/servers/plugins/replication/repl_ops.c
index e1e51355..aaffe507 100644
--- a/ldap/servers/plugins/replication/repl_ops.c
+++ b/ldap/servers/plugins/replication/repl_ops.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/plugins/replication/repl_rootdse.c b/ldap/servers/plugins/replication/repl_rootdse.c
index 2bd1d8e8..51f04c29 100644
--- a/ldap/servers/plugins/replication/repl_rootdse.c
+++ b/ldap/servers/plugins/replication/repl_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 **/
diff --git a/ldap/servers/plugins/replication/repl_search.c b/ldap/servers/plugins/replication/repl_search.c
index cfa21222..a38d7280 100644
--- a/ldap/servers/plugins/replication/repl_search.c
+++ b/ldap/servers/plugins/replication/repl_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/plugins/replication/repl_shared.h b/ldap/servers/plugins/replication/repl_shared.h
index 0c7454ab..3e65ddff 100644
--- a/ldap/servers/plugins/replication/repl_shared.h
+++ b/ldap/servers/plugins/replication/repl_shared.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 **/
/* repl_shared.h - definitions shared between 4.0 and 5.0 replication
diff --git a/ldap/servers/plugins/replication/replication.def b/ldap/servers/plugins/replication/replication.def
index 739b49cf..09b280d2 100644
--- a/ldap/servers/plugins/replication/replication.def
+++ b/ldap/servers/plugins/replication/replication.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/plugins/replication/replutil.c b/ldap/servers/plugins/replication/replutil.c
index f8a23f93..bb6b13e4 100644
--- a/ldap/servers/plugins/replication/replutil.c
+++ b/ldap/servers/plugins/replication/replutil.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/plugins/replication/tests/dnp_sim.c b/ldap/servers/plugins/replication/tests/dnp_sim.c
index ff524988..9dee614d 100644
--- a/ldap/servers/plugins/replication/tests/dnp_sim.c
+++ b/ldap/servers/plugins/replication/tests/dnp_sim.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 **/
/* dnp_simulation.c - this file varifies the correctness of dnp algorithm
diff --git a/ldap/servers/plugins/replication/tests/dnp_sim2.c b/ldap/servers/plugins/replication/tests/dnp_sim2.c
index e1838aa6..16216cce 100644
--- a/ldap/servers/plugins/replication/tests/dnp_sim2.c
+++ b/ldap/servers/plugins/replication/tests/dnp_sim2.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 **/
/* dnp_simulation.c - this file varifies the correctness of dnp algorithm
diff --git a/ldap/servers/plugins/replication/tests/dnp_sim3.c b/ldap/servers/plugins/replication/tests/dnp_sim3.c
index d018597a..d2176b25 100644
--- a/ldap/servers/plugins/replication/tests/dnp_sim3.c
+++ b/ldap/servers/plugins/replication/tests/dnp_sim3.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 **/
/* dnp_simulation.c - this file varifies the correctness of dnp algorithm
diff --git a/ldap/servers/plugins/replication/tests/makesim b/ldap/servers/plugins/replication/tests/makesim
index b92d6970..f0bc96f2 100755
--- a/ldap/servers/plugins/replication/tests/makesim
+++ b/ldap/servers/plugins/replication/tests/makesim
@@ -1,6 +1,6 @@
# BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 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/plugins/replication/urp.c b/ldap/servers/plugins/replication/urp.c
index a4dc86f9..70f449b5 100644
--- a/ldap/servers/plugins/replication/urp.c
+++ b/ldap/servers/plugins/replication/urp.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/plugins/replication/urp.h b/ldap/servers/plugins/replication/urp.h
index 9db477bd..2cb2d2e8 100644
--- a/ldap/servers/plugins/replication/urp.h
+++ b/ldap/servers/plugins/replication/urp.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/plugins/replication/urp_glue.c b/ldap/servers/plugins/replication/urp_glue.c
index dcb2f72d..86213393 100644
--- a/ldap/servers/plugins/replication/urp_glue.c
+++ b/ldap/servers/plugins/replication/urp_glue.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/plugins/replication/urp_tombstone.c b/ldap/servers/plugins/replication/urp_tombstone.c
index 3b24b928..90e3baaa 100644
--- a/ldap/servers/plugins/replication/urp_tombstone.c
+++ b/ldap/servers/plugins/replication/urp_tombstone.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/plugins/retrocl/Makefile b/ldap/servers/plugins/retrocl/Makefile
index a4911ddd..afa07c55 100644
--- a/ldap/servers/plugins/retrocl/Makefile
+++ b/ldap/servers/plugins/retrocl/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/plugins/retrocl/dllmain.c b/ldap/servers/plugins/retrocl/dllmain.c
index 276b1fa9..f5746fce 100644
--- a/ldap/servers/plugins/retrocl/dllmain.c
+++ b/ldap/servers/plugins/retrocl/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/plugins/retrocl/linktest.c b/ldap/servers/plugins/retrocl/linktest.c
index 22812c57..867f66b5 100644
--- a/ldap/servers/plugins/retrocl/linktest.c
+++ b/ldap/servers/plugins/retrocl/linktest.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/plugins/retrocl/retrocl.c b/ldap/servers/plugins/retrocl/retrocl.c
index e0d3e325..d6b7a12d 100644
--- a/ldap/servers/plugins/retrocl/retrocl.c
+++ b/ldap/servers/plugins/retrocl/retrocl.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/plugins/retrocl/retrocl.def b/ldap/servers/plugins/retrocl/retrocl.def
index e8708361..0e2502a9 100644
--- a/ldap/servers/plugins/retrocl/retrocl.def
+++ b/ldap/servers/plugins/retrocl/retrocl.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/plugins/retrocl/retrocl.h b/ldap/servers/plugins/retrocl/retrocl.h
index f96af64c..8137f7b4 100644
--- a/ldap/servers/plugins/retrocl/retrocl.h
+++ b/ldap/servers/plugins/retrocl/retrocl.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/plugins/retrocl/retrocl.txt b/ldap/servers/plugins/retrocl/retrocl.txt
index e82368e8..e68df599 100644
--- a/ldap/servers/plugins/retrocl/retrocl.txt
+++ b/ldap/servers/plugins/retrocl/retrocl.txt
@@ -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/plugins/retrocl/retrocl_cn.c b/ldap/servers/plugins/retrocl/retrocl_cn.c
index 3623f4b3..e1cfd3c6 100644
--- a/ldap/servers/plugins/retrocl/retrocl_cn.c
+++ b/ldap/servers/plugins/retrocl/retrocl_cn.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/plugins/retrocl/retrocl_create.c b/ldap/servers/plugins/retrocl/retrocl_create.c
index fbda8e36..65238d58 100644
--- a/ldap/servers/plugins/retrocl/retrocl_create.c
+++ b/ldap/servers/plugins/retrocl/retrocl_create.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/plugins/retrocl/retrocl_po.c b/ldap/servers/plugins/retrocl/retrocl_po.c
index 96512a51..c1fbd3d8 100644
--- a/ldap/servers/plugins/retrocl/retrocl_po.c
+++ b/ldap/servers/plugins/retrocl/retrocl_po.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/plugins/retrocl/retrocl_rootdse.c b/ldap/servers/plugins/retrocl/retrocl_rootdse.c
index 602858d3..77a7abd1 100644
--- a/ldap/servers/plugins/retrocl/retrocl_rootdse.c
+++ b/ldap/servers/plugins/retrocl/retrocl_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 **/
diff --git a/ldap/servers/plugins/retrocl/retrocl_trim.c b/ldap/servers/plugins/retrocl/retrocl_trim.c
index dc3f4b34..c35f8cfe 100644
--- a/ldap/servers/plugins/retrocl/retrocl_trim.c
+++ b/ldap/servers/plugins/retrocl/retrocl_trim.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/plugins/rever/Makefile b/ldap/servers/plugins/rever/Makefile
index ce037e29..f5c15255 100644
--- a/ldap/servers/plugins/rever/Makefile
+++ b/ldap/servers/plugins/rever/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/plugins/rever/des.c b/ldap/servers/plugins/rever/des.c
index 4b70c91d..eee9d1b2 100644
--- a/ldap/servers/plugins/rever/des.c
+++ b/ldap/servers/plugins/rever/des.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 **/
/* from /usr/project/iplanet/ws/ds5.ke/ns/svrcore/pkcs7/tstarchive.c */
diff --git a/ldap/servers/plugins/rever/dllmain.c b/ldap/servers/plugins/rever/dllmain.c
index 0bb85815..8a7e646d 100644
--- a/ldap/servers/plugins/rever/dllmain.c
+++ b/ldap/servers/plugins/rever/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/plugins/rever/libdes.def b/ldap/servers/plugins/rever/libdes.def
index 048af6f4..a3cf2253 100644
--- a/ldap/servers/plugins/rever/libdes.def
+++ b/ldap/servers/plugins/rever/libdes.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/plugins/rever/rever.c b/ldap/servers/plugins/rever/rever.c
index 10767944..c769a233 100644
--- a/ldap/servers/plugins/rever/rever.c
+++ b/ldap/servers/plugins/rever/rever.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/plugins/rever/rever.h b/ldap/servers/plugins/rever/rever.h
index 0992aea7..0c9a00f1 100644
--- a/ldap/servers/plugins/rever/rever.h
+++ b/ldap/servers/plugins/rever/rever.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 _REVER_H
diff --git a/ldap/servers/plugins/roles/Makefile b/ldap/servers/plugins/roles/Makefile
index 2e1a26ca..bbc97abd 100644
--- a/ldap/servers/plugins/roles/Makefile
+++ b/ldap/servers/plugins/roles/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/plugins/roles/dllmain.c b/ldap/servers/plugins/roles/dllmain.c
index fabf8677..155207c2 100644
--- a/ldap/servers/plugins/roles/dllmain.c
+++ b/ldap/servers/plugins/roles/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/plugins/roles/roles.def b/ldap/servers/plugins/roles/roles.def
index a124811a..449e1e1c 100644
--- a/ldap/servers/plugins/roles/roles.def
+++ b/ldap/servers/plugins/roles/roles.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/plugins/roles/roles_cache.c b/ldap/servers/plugins/roles/roles_cache.c
index f4dc31c2..a4417335 100644
--- a/ldap/servers/plugins/roles/roles_cache.c
+++ b/ldap/servers/plugins/roles/roles_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 **/
#include <stdio.h>
diff --git a/ldap/servers/plugins/roles/roles_cache.h b/ldap/servers/plugins/roles/roles_cache.h
index fbe6c641..d2c96d7a 100644
--- a/ldap/servers/plugins/roles/roles_cache.h
+++ b/ldap/servers/plugins/roles/roles_cache.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/plugins/roles/roles_plugin.c b/ldap/servers/plugins/roles/roles_plugin.c
index d1ce5903..0b4785ce 100644
--- a/ldap/servers/plugins/roles/roles_plugin.c
+++ b/ldap/servers/plugins/roles/roles_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 **/
diff --git a/ldap/servers/plugins/shared/Makefile b/ldap/servers/plugins/shared/Makefile
index 0370f8e4..b8f9eb1c 100644
--- a/ldap/servers/plugins/shared/Makefile
+++ b/ldap/servers/plugins/shared/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/plugins/shared/plugin-utils.h b/ldap/servers/plugins/shared/plugin-utils.h
index 31c956f4..55c58b2c 100644
--- a/ldap/servers/plugins/shared/plugin-utils.h
+++ b/ldap/servers/plugins/shared/plugin-utils.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/plugins/shared/utils.c b/ldap/servers/plugins/shared/utils.c
index d5044b17..93bbed3a 100644
--- a/ldap/servers/plugins/shared/utils.c
+++ b/ldap/servers/plugins/shared/utils.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/plugins/statechange/Makefile b/ldap/servers/plugins/statechange/Makefile
index 07c33c5b..f082af3b 100644
--- a/ldap/servers/plugins/statechange/Makefile
+++ b/ldap/servers/plugins/statechange/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/plugins/statechange/dllmain.c b/ldap/servers/plugins/statechange/dllmain.c
index fabf8677..155207c2 100644
--- a/ldap/servers/plugins/statechange/dllmain.c
+++ b/ldap/servers/plugins/statechange/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/plugins/statechange/statechange.c b/ldap/servers/plugins/statechange/statechange.c
index c0942b41..c0e21b4b 100644
--- a/ldap/servers/plugins/statechange/statechange.c
+++ b/ldap/servers/plugins/statechange/statechange.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 which provides a callback mechanism for state changes in the DS */
diff --git a/ldap/servers/plugins/statechange/statechange.def b/ldap/servers/plugins/statechange/statechange.def
index 601f0b90..8fc6aa77 100644
--- a/ldap/servers/plugins/statechange/statechange.def
+++ b/ldap/servers/plugins/statechange/statechange.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/plugins/syntaxes/Makefile b/ldap/servers/plugins/syntaxes/Makefile
index a818e0cf..25f8ec9a 100644
--- a/ldap/servers/plugins/syntaxes/Makefile
+++ b/ldap/servers/plugins/syntaxes/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/plugins/syntaxes/bin.c b/ldap/servers/plugins/syntaxes/bin.c
index da06e55e..4abf8b57 100644
--- a/ldap/servers/plugins/syntaxes/bin.c
+++ b/ldap/servers/plugins/syntaxes/bin.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 **/
/* bin.c - bin syntax routines */
diff --git a/ldap/servers/plugins/syntaxes/ces.c b/ldap/servers/plugins/syntaxes/ces.c
index 075da03b..2decc76a 100644
--- a/ldap/servers/plugins/syntaxes/ces.c
+++ b/ldap/servers/plugins/syntaxes/ces.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 **/
/* ces.c - caseexactstring syntax routines */
diff --git a/ldap/servers/plugins/syntaxes/cis.c b/ldap/servers/plugins/syntaxes/cis.c
index e2047fbc..05666aec 100644
--- a/ldap/servers/plugins/syntaxes/cis.c
+++ b/ldap/servers/plugins/syntaxes/cis.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 **/
/* cis.c - caseignorestring syntax routines */
diff --git a/ldap/servers/plugins/syntaxes/debug.c b/ldap/servers/plugins/syntaxes/debug.c
index e4d69202..04c34481 100644
--- a/ldap/servers/plugins/syntaxes/debug.c
+++ b/ldap/servers/plugins/syntaxes/debug.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 **/
/* debug.c - syntax debug stuff */
diff --git a/ldap/servers/plugins/syntaxes/dllmain.c b/ldap/servers/plugins/syntaxes/dllmain.c
index 1f7aa331..5c395899 100644
--- a/ldap/servers/plugins/syntaxes/dllmain.c
+++ b/ldap/servers/plugins/syntaxes/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/plugins/syntaxes/dn.c b/ldap/servers/plugins/syntaxes/dn.c
index e6a90df0..0d953936 100644
--- a/ldap/servers/plugins/syntaxes/dn.c
+++ b/ldap/servers/plugins/syntaxes/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 - dn syntax routines */
diff --git a/ldap/servers/plugins/syntaxes/int.c b/ldap/servers/plugins/syntaxes/int.c
index f81167f2..4c765430 100644
--- a/ldap/servers/plugins/syntaxes/int.c
+++ b/ldap/servers/plugins/syntaxes/int.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 **/
/* int.c - integer syntax routines */
diff --git a/ldap/servers/plugins/syntaxes/libsyntax.def b/ldap/servers/plugins/syntaxes/libsyntax.def
index 63397bc7..79c0ff1d 100644
--- a/ldap/servers/plugins/syntaxes/libsyntax.def
+++ b/ldap/servers/plugins/syntaxes/libsyntax.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/plugins/syntaxes/phonetic.c b/ldap/servers/plugins/syntaxes/phonetic.c
index 1c1c8ba5..6d2d479e 100644
--- a/ldap/servers/plugins/syntaxes/phonetic.c
+++ b/ldap/servers/plugins/syntaxes/phonetic.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 **/
/* phonetic.c - routines to do phonetic matching */
diff --git a/ldap/servers/plugins/syntaxes/sicis.c b/ldap/servers/plugins/syntaxes/sicis.c
index 4bd6623d..4f82b065 100644
--- a/ldap/servers/plugins/syntaxes/sicis.c
+++ b/ldap/servers/plugins/syntaxes/sicis.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/plugins/syntaxes/string.c b/ldap/servers/plugins/syntaxes/string.c
index 36609f8f..8b39834b 100644
--- a/ldap/servers/plugins/syntaxes/string.c
+++ b/ldap/servers/plugins/syntaxes/string.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 **/
/* string.c - common string syntax routines */
diff --git a/ldap/servers/plugins/syntaxes/syntax.h b/ldap/servers/plugins/syntaxes/syntax.h
index d6d883c9..6c0648a5 100644
--- a/ldap/servers/plugins/syntaxes/syntax.h
+++ b/ldap/servers/plugins/syntaxes/syntax.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 **/
/* syntax.h - string syntax definitions */
diff --git a/ldap/servers/plugins/syntaxes/tel.c b/ldap/servers/plugins/syntaxes/tel.c
index c2c80d1a..4995ecc2 100644
--- a/ldap/servers/plugins/syntaxes/tel.c
+++ b/ldap/servers/plugins/syntaxes/tel.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 **/
/* tel.c - telephonenumber syntax routines */
diff --git a/ldap/servers/plugins/syntaxes/value.c b/ldap/servers/plugins/syntaxes/value.c
index be496091..4c201fd2 100644
--- a/ldap/servers/plugins/syntaxes/value.c
+++ b/ldap/servers/plugins/syntaxes/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 **/
/* value.c - routines for dealing with values */
diff --git a/ldap/servers/plugins/uiduniq/7bit.c b/ldap/servers/plugins/uiduniq/7bit.c
index 535dbe9c..c7448078 100644
--- a/ldap/servers/plugins/uiduniq/7bit.c
+++ b/ldap/servers/plugins/uiduniq/7bit.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/plugins/uiduniq/Makefile b/ldap/servers/plugins/uiduniq/Makefile
index 004b9642..37b8c2f1 100644
--- a/ldap/servers/plugins/uiduniq/Makefile
+++ b/ldap/servers/plugins/uiduniq/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/plugins/uiduniq/UID-Notes b/ldap/servers/plugins/uiduniq/UID-Notes
index 3d3617ff..8df5a154 100644
--- a/ldap/servers/plugins/uiduniq/UID-Notes
+++ b/ldap/servers/plugins/uiduniq/UID-Notes
@@ -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/plugins/uiduniq/libuiduniq.def b/ldap/servers/plugins/uiduniq/libuiduniq.def
index 41da527b..8c6fbe48 100644
--- a/ldap/servers/plugins/uiduniq/libuiduniq.def
+++ b/ldap/servers/plugins/uiduniq/libuiduniq.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/plugins/uiduniq/uid.c b/ldap/servers/plugins/uiduniq/uid.c
index f32e63ac..2d1c69b0 100644
--- a/ldap/servers/plugins/uiduniq/uid.c
+++ b/ldap/servers/plugins/uiduniq/uid.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/plugins/vattrsp_template/Makefile b/ldap/servers/plugins/vattrsp_template/Makefile
index fb2c9062..ea36e3f6 100644
--- a/ldap/servers/plugins/vattrsp_template/Makefile
+++ b/ldap/servers/plugins/vattrsp_template/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/plugins/vattrsp_template/dllmain.c b/ldap/servers/plugins/vattrsp_template/dllmain.c
index fabf8677..155207c2 100644
--- a/ldap/servers/plugins/vattrsp_template/dllmain.c
+++ b/ldap/servers/plugins/vattrsp_template/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/plugins/vattrsp_template/vattrsp.c b/ldap/servers/plugins/vattrsp_template/vattrsp.c
index 52534b26..b80d5a1c 100644
--- a/ldap/servers/plugins/vattrsp_template/vattrsp.c
+++ b/ldap/servers/plugins/vattrsp_template/vattrsp.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/plugins/vattrsp_template/vattrsp.def b/ldap/servers/plugins/vattrsp_template/vattrsp.def
index a0e2d8c0..12bead0c 100644
--- a/ldap/servers/plugins/vattrsp_template/vattrsp.def
+++ b/ldap/servers/plugins/vattrsp_template/vattrsp.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/plugins/views/Makefile b/ldap/servers/plugins/views/Makefile
index d0d42f06..678a0290 100644
--- a/ldap/servers/plugins/views/Makefile
+++ b/ldap/servers/plugins/views/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/plugins/views/dllmain.c b/ldap/servers/plugins/views/dllmain.c
index fabf8677..155207c2 100644
--- a/ldap/servers/plugins/views/dllmain.c
+++ b/ldap/servers/plugins/views/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/plugins/views/views.c b/ldap/servers/plugins/views/views.c
index b052167c..86c2f758 100644
--- a/ldap/servers/plugins/views/views.c
+++ b/ldap/servers/plugins/views/views.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 which implements directory server views */
diff --git a/ldap/servers/plugins/views/views.def b/ldap/servers/plugins/views/views.def
index 173f3124..2e688e26 100644
--- a/ldap/servers/plugins/views/views.def
+++ b/ldap/servers/plugins/views/views.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/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 **/
diff --git a/ldap/servers/snmp/Makefile b/ldap/servers/snmp/Makefile
index 80f7dca6..87684a13 100644
--- a/ldap/servers/snmp/Makefile
+++ b/ldap/servers/snmp/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/snmp/netscape-ldap.mib b/ldap/servers/snmp/netscape-ldap.mib
index 915b3a25..57e6174a 100644
--- a/ldap/servers/snmp/netscape-ldap.mib
+++ b/ldap/servers/snmp/netscape-ldap.mib
@@ -1,6 +1,6 @@
-- BEGIN COPYRIGHT BLOCK
--- Copyright 2001 Sun Microsystems, Inc.
--- Portions copyright 1999, 2001-2003 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/snmp/ntagt/Makefile b/ldap/servers/snmp/ntagt/Makefile
index bb4c0d22..b8583806 100644
--- a/ldap/servers/snmp/ntagt/Makefile
+++ b/ldap/servers/snmp/ntagt/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/snmp/ntagt/msrvdefs.mak b/ldap/servers/snmp/ntagt/msrvdefs.mak
index ac877d9c..45c61672 100644
--- a/ldap/servers/snmp/ntagt/msrvdefs.mak
+++ b/ldap/servers/snmp/ntagt/msrvdefs.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/snmp/ntagt/nslagtcom_nt.h b/ldap/servers/snmp/ntagt/nslagtcom_nt.h
index 0a9f7eb5..130064bf 100644
--- a/ldap/servers/snmp/ntagt/nslagtcom_nt.h
+++ b/ldap/servers/snmp/ntagt/nslagtcom_nt.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/snmp/ntagt/nsldapagt_nt.c b/ldap/servers/snmp/ntagt/nsldapagt_nt.c
index 6a6904fe..18ba1eb2 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.c
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.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/snmp/ntagt/nsldapagt_nt.def b/ldap/servers/snmp/ntagt/nsldapagt_nt.def
index 2f30cde4..4d203ed0 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.def
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.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/snmp/ntagt/nsldapagt_nt.h b/ldap/servers/snmp/ntagt/nsldapagt_nt.h
index 16e472db..f1d5c8b8 100644
--- a/ldap/servers/snmp/ntagt/nsldapagt_nt.h
+++ b/ldap/servers/snmp/ntagt/nsldapagt_nt.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/snmp/ntagt/nsldapmib_nt.c b/ldap/servers/snmp/ntagt/nsldapmib_nt.c
index af977a23..a073b38e 100644
--- a/ldap/servers/snmp/ntagt/nsldapmib_nt.c
+++ b/ldap/servers/snmp/ntagt/nsldapmib_nt.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/snmp/ntagt/nsldapmib_nt.h b/ldap/servers/snmp/ntagt/nsldapmib_nt.h
index ac53dad7..60fb5fd1 100644
--- a/ldap/servers/snmp/ntagt/nsldapmib_nt.h
+++ b/ldap/servers/snmp/ntagt/nsldapmib_nt.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/systools/Makefile b/ldap/systools/Makefile
index ab0b315f..987dea9a 100644
--- a/ldap/systools/Makefile
+++ b/ldap/systools/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/systools/idsktune.c b/ldap/systools/idsktune.c
index bbdf435e..65123600 100644
--- a/ldap/systools/idsktune.c
+++ b/ldap/systools/idsktune.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/systools/pio.c b/ldap/systools/pio.c
index 4d6593c0..527570eb 100644
--- a/ldap/systools/pio.c
+++ b/ldap/systools/pio.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/systools/pio.h b/ldap/systools/pio.h
index 6f24bf8e..eea78e28 100644
--- a/ldap/systools/pio.h
+++ b/ldap/systools/pio.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/systools/viewcore.c b/ldap/systools/viewcore.c
index dce91a37..dc6a620c 100644
--- a/ldap/systools/viewcore.c
+++ b/ldap/systools/viewcore.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 **/