summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuilddsrpm.sh4
-rwxr-xr-xbuildnum.pl6
-rwxr-xr-xdirver.pl6
-rwxr-xr-xldap/admin/src/scripts/template-cl-dump.pl9
-rw-r--r--ldap/admin/src/scripts/template-dsml-activate.pl5
-rwxr-xr-xldap/admin/src/scripts/template-repl-monitor.pl9
-rw-r--r--ldap/clients/dsgw/admhtml/Makefile8
-rw-r--r--ldap/clients/dsgw/admhtml/index.lst10
-rw-r--r--ldap/clients/dsgw/config/Makefile8
-rw-r--r--ldap/clients/dsgw/config/de/dsgw-l10n.conf8
-rw-r--r--ldap/clients/dsgw/config/de/dsgw.conf8
-rw-r--r--ldap/clients/dsgw/config/de/dsgw.tmpl6
-rw-r--r--ldap/clients/dsgw/config/de/dsgw_adm.conf8
-rw-r--r--ldap/clients/dsgw/config/de/dsgwfilter.conf8
-rw-r--r--ldap/clients/dsgw/config/de/dsgwfilter_adm.conf8
-rw-r--r--ldap/clients/dsgw/config/de/dsgwsearchprefs.conf8
-rw-r--r--ldap/clients/dsgw/config/dsgw-l10n.conf8
-rw-r--r--ldap/clients/dsgw/config/dsgw.tmpl6
-rw-r--r--ldap/clients/dsgw/config/dsgw_adm.conf8
-rw-r--r--ldap/clients/dsgw/config/dsgwfilter.conf8
-rw-r--r--ldap/clients/dsgw/config/dsgwfilter_adm.conf8
-rw-r--r--ldap/clients/dsgw/config/dsgwsearchprefs.conf8
-rw-r--r--ldap/clients/dsgw/config/en-us/dsgw-l10n.conf8
-rw-r--r--ldap/clients/dsgw/config/en-us/dsgwcollate.conf8
-rw-r--r--ldap/clients/dsgw/config/en/dsgw-l10n.conf8
-rw-r--r--ldap/clients/dsgw/config/en/dsgwcollate.conf8
-rw-r--r--ldap/clients/dsgw/config/es/dsgw-l10n.conf8
-rw-r--r--ldap/clients/dsgw/config/es/dsgw.tmpl6
-rw-r--r--ldap/clients/dsgw/config/es/dsgw_adm.conf88
-rw-r--r--ldap/clients/dsgw/config/es/dsgwfilter.conf8
-rw-r--r--ldap/clients/dsgw/config/es/dsgwfilter_adm.conf142
-rw-r--r--ldap/clients/dsgw/config/es/dsgwsearchprefs.conf8
-rw-r--r--ldap/clients/dsgw/config/es/ns-license-schema.conf30
-rw-r--r--ldap/clients/dsgw/config/fr/dsgw-l10n.conf8
-rw-r--r--ldap/clients/dsgw/config/fr/dsgw.conf8
-rw-r--r--ldap/clients/dsgw/config/fr/dsgw.tmpl6
-rw-r--r--ldap/clients/dsgw/config/fr/dsgw_adm.conf8
-rw-r--r--ldap/clients/dsgw/config/fr/dsgwfilter.conf8
-rw-r--r--ldap/clients/dsgw/config/fr/dsgwfilter_adm.conf8
-rw-r--r--ldap/clients/dsgw/config/fr/dsgwsearchprefs.conf8
-rw-r--r--ldap/clients/dsgw/config/ja/dsgw-l10n.conf8
-rw-r--r--ldap/clients/dsgw/config/ja/dsgw.conf8
-rw-r--r--ldap/clients/dsgw/config/ja/dsgw.tmpl6
-rw-r--r--ldap/clients/dsgw/config/ja/dsgw_adm.conf8
-rw-r--r--ldap/clients/dsgw/config/ja/dsgwcharset.conf8
-rw-r--r--ldap/clients/dsgw/config/ja/dsgwcollate.conf8
-rw-r--r--ldap/clients/dsgw/config/ja/dsgwfilter.conf8
-rw-r--r--ldap/clients/dsgw/config/ja/dsgwfilter_adm.conf8
-rw-r--r--ldap/clients/dsgw/config/ja/dsgwsearchprefs.conf8
-rw-r--r--ldap/clients/dsgw/config/ko/dsgw-l10n.conf8
-rw-r--r--ldap/clients/dsgw/config/ko/dsgwcharset.conf10
-rw-r--r--ldap/clients/dsgw/config/ns-license-schema.conf8
-rw-r--r--ldap/clients/dsgw/config/search.html11
-rw-r--r--ldap/clients/dsgw/config/searchString.html11
-rw-r--r--ldap/clients/dsgw/config/zh/dsgw-l10n.conf8
-rw-r--r--ldap/clients/dsgw/config/zh/dsgwcharset.conf8
-rw-r--r--ldap/clients/dsgw/html/Makefile8
-rw-r--r--ldap/clients/dsgw/html/info/Makefile8
-rw-r--r--ldap/clients/dsgw/html/manual/Makefile8
-rw-r--r--ldap/clients/dsgw/html/manual/index.map10
-rw-r--r--ldap/clients/dsgw/html/style.css6
-rw-r--r--ldap/clients/dsgw/pbconfig/Makefile8
-rw-r--r--ldap/clients/dsgw/pbconfig/dsgwfilter.conf10
-rw-r--r--ldap/clients/dsgw/pbconfig/dsgwsearchprefs.conf10
-rw-r--r--ldap/clients/dsgw/pbconfig/pb.tmpl6
-rw-r--r--ldap/clients/dsgw/pbhtml/Makefile8
-rwxr-xr-xldap/clients/dsgw/pbhtml/phone.js9
-rw-r--r--ldap/clients/dsgw/pbhtml/style.css6
-rw-r--r--ldap/clients/dsgw/userhtml/Makefile8
-rw-r--r--ldap/clients/dsgw/userhtml/index.lst10
-rw-r--r--ldap/clients/dsmlgw/Makefile5
-rw-r--r--ldap/clients/dsmlgw/build.xml4
-rw-r--r--ldap/clients/dsmlgw/misc/dsmlgw.cfg5
-rw-r--r--ldap/clients/dsmlgw/misc/server-config.wsdd4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Constants.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java11
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java11
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java11
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java11
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java11
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java9
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/test/SOAPClient.java12
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlClient.java4
-rw-r--r--ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java4
-rw-r--r--ldap/clients/orgchart/botframe.html4
-rw-r--r--ldap/clients/orgchart/config.tmpl7
-rw-r--r--ldap/clients/orgchart/index.html4
-rw-r--r--ldap/clients/orgchart/myorg.bat4
-rwxr-xr-xldap/clients/orgchart/myorg.pl7
-rw-r--r--ldap/clients/orgchart/org.bat4
-rwxr-xr-xldap/clients/orgchart/org.pl7
-rw-r--r--ldap/clients/orgchart/styles.css5
-rw-r--r--ldap/clients/orgchart/topframe.html4
-rw-r--r--ldap/clients/orgchart/wrapper.c11
-rwxr-xr-xldap/cm/newinst/setup.pl5
-rwxr-xr-xldap/cm/newinst/setup.sh4
-rw-r--r--ldap/cm/newinstnt/dsinst.rc6
-rw-r--r--ldap/cm/newinstnt/resource.h6
-rw-r--r--ldap/cm/newinstnt/setup.bat5
-rw-r--r--ldap/servers/plugins/distrib/Makefile8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.AIX8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.BSDI8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.HPUX8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.HPUX648
-rw-r--r--ldap/servers/plugins/distrib/Makefile.IRIX8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.Linux8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.OSF18
-rw-r--r--ldap/servers/plugins/distrib/Makefile.ReliantUNIX8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.SOLARIS8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.SOLARIS648
-rw-r--r--ldap/servers/plugins/distrib/Makefile.SOLARISx868
-rw-r--r--ldap/servers/plugins/distrib/Makefile.UnixWare8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.UnixWareUDK8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.WINNT6
-rw-r--r--ldap/servers/plugins/distrib/README13
-rw-r--r--ldap/servers/plugins/distrib/distrib.c9
-rw-r--r--ldap/servers/plugins/distrib/dllmain.c19
-rw-r--r--ldap/servers/plugins/distrib/libdistrib.def9
-rw-r--r--ldap/servers/plugins/http/Makefile8
-rw-r--r--ldap/servers/plugins/http/dllmain.c10
-rw-r--r--ldap/servers/plugins/http/http.def10
-rw-r--r--ldap/servers/plugins/http/http_client.c9
-rw-r--r--ldap/servers/plugins/http/http_client.h9
-rw-r--r--ldap/servers/plugins/http/http_impl.c10
-rw-r--r--ldap/servers/plugins/http/http_impl.h10
-rw-r--r--ldap/servers/plugins/pam_passthru/config.ldif5
-rw-r--r--ldap/servers/plugins/presence/presence.ldif5
-rw-r--r--ldap/servers/slapd/http.h9
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.server8
-rwxr-xr-xldap/servers/slapd/test-plugins/installDse.pl6
-rw-r--r--ldap/servers/slapd/test-plugins/testdbinterop.c6
-rw-r--r--ldap/servers/snmp/ldap-agent.c5
-rw-r--r--ldap/servers/snmp/ldap-agent.h5
-rw-r--r--ldap/servers/snmp/main.c5
-rw-r--r--ldap/synctools/passwordsync/build.bat5
-rw-r--r--ldap/synctools/passwordsync/passhand.cpp7
-rw-r--r--ldap/synctools/passwordsync/passhand.h7
-rw-r--r--ldap/synctools/passwordsync/passhook/passhook.cpp7
-rw-r--r--ldap/synctools/passwordsync/passhook/passhook.def4
-rw-r--r--ldap/synctools/passwordsync/passhook/passhook.dep5
-rw-r--r--ldap/synctools/passwordsync/passhook/passhook.dsp5
-rw-r--r--ldap/synctools/passwordsync/passhook/passhook.mak5
-rw-r--r--ldap/synctools/passwordsync/passsync.dsw4
-rw-r--r--ldap/synctools/passwordsync/passsync/dssynch.h11
-rw-r--r--ldap/synctools/passwordsync/passsync/dssynchmsg.h4
-rw-r--r--ldap/synctools/passwordsync/passsync/ntservice.cpp7
-rw-r--r--ldap/synctools/passwordsync/passsync/ntservice.h7
-rw-r--r--ldap/synctools/passwordsync/passsync/passsync.dep5
-rw-r--r--ldap/synctools/passwordsync/passsync/passsync.dsp4
-rw-r--r--ldap/synctools/passwordsync/passsync/passsync.mak4
-rw-r--r--ldap/synctools/passwordsync/passsync/service.cpp5
-rw-r--r--ldap/synctools/passwordsync/passsync/subuniutil.cpp7
-rw-r--r--ldap/synctools/passwordsync/passsync/subuniutil.h5
-rw-r--r--ldap/synctools/passwordsync/passsync/synchcmds.h11
-rw-r--r--ldap/synctools/passwordsync/passsync/syncserv.cpp7
-rw-r--r--ldap/synctools/passwordsync/passsync/syncserv.h7
-rw-r--r--ldap/synctools/passwordsync/wix/PassSync.wxs4
-rwxr-xr-xldap/systools/getHPPatches.pl5
-rwxr-xr-xldap/systools/getSolPatches.pl5
-rw-r--r--ldap/systools/hp_patches.c5
-rwxr-xr-xldap/systools/mergeSolPatches.pl5
-rw-r--r--ldap/systools/sol_patches.c6
178 files changed, 905 insertions, 674 deletions
diff --git a/builddsrpm.sh b/builddsrpm.sh
index 6ce63bc6..b56875e2 100755
--- a/builddsrpm.sh
+++ b/builddsrpm.sh
@@ -1,4 +1,8 @@
#!/bin/sh -v
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
mkdirs() {
for d in "$@" ; do
diff --git a/buildnum.pl b/buildnum.pl
index 6b184f21..0d1e806a 100755
--- a/buildnum.pl
+++ b/buildnum.pl
@@ -1,4 +1,10 @@
#!/usr/bin/perl
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+
#--------------------------------------------
# buildnum.pl
#
diff --git a/dirver.pl b/dirver.pl
index f360c18a..a7f20257 100755
--- a/dirver.pl
+++ b/dirver.pl
@@ -1,4 +1,10 @@
#!/usr/bin/perl
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+
#-----------------------------------------------------------------
# dirver.pl: Generates ascii format #define for FILEVERSION
# resource identifier used by Windows executable binaries.
diff --git a/ldap/admin/src/scripts/template-cl-dump.pl b/ldap/admin/src/scripts/template-cl-dump.pl
index fe89de2a..8fad1505 100755
--- a/ldap/admin/src/scripts/template-cl-dump.pl
+++ b/ldap/admin/src/scripts/template-cl-dump.pl
@@ -1,9 +1,10 @@
#{{PERL-EXEC}}
-
-################################################################################
-#
-# Copyright (C) 2002-2004 Netscape Communications Corporation.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
+################################################################################
#
# FILE: cl-dump.pl
#
diff --git a/ldap/admin/src/scripts/template-dsml-activate.pl b/ldap/admin/src/scripts/template-dsml-activate.pl
index 6ebaf751..3bd159ad 100644
--- a/ldap/admin/src/scripts/template-dsml-activate.pl
+++ b/ldap/admin/src/scripts/template-dsml-activate.pl
@@ -1,4 +1,9 @@
#{{PERL-EXEC}}
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
use Getopt::Std;
use File::Copy "cp";
diff --git a/ldap/admin/src/scripts/template-repl-monitor.pl b/ldap/admin/src/scripts/template-repl-monitor.pl
index 78e3aa85..3a356e4e 100755
--- a/ldap/admin/src/scripts/template-repl-monitor.pl
+++ b/ldap/admin/src/scripts/template-repl-monitor.pl
@@ -1,10 +1,11 @@
#{{PERL-EXEC}}
-
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
##############################################################################
#
-# Copyright (C) 2002-2004 Netscape Communications Corporation.
-# All Rights Reserved.
-#
# FILE: repl-monitor.pl
#
# SYNOPSIS:
diff --git a/ldap/clients/dsgw/admhtml/Makefile b/ldap/clients/dsgw/admhtml/Makefile
index e82a8c25..656f7b9d 100644
--- a/ldap/clients/dsgw/admhtml/Makefile
+++ b/ldap/clients/dsgw/admhtml/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
#
# Gmakefile for Directory Server Gateway html files.
diff --git a/ldap/clients/dsgw/admhtml/index.lst b/ldap/clients/dsgw/admhtml/index.lst
index aea03131..57ff13fc 100644
--- a/ldap/clients/dsgw/admhtml/index.lst
+++ b/ldap/clients/dsgw/admhtml/index.lst
@@ -1,9 +1,9 @@
-;-------------------------------------------------------------------------
-; PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-; license terms. Copyright © 2001 Sun Microsystems, Inc.
-; Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+; --- BEGIN COPYRIGHT BLOCK ---
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
-;-------------------------------------------------------------------------
+; --- END COPYRIGHT BLOCK ---
+;
; Netscape admin index page master list
;
; Lines beginning with a ';' are comments
diff --git a/ldap/clients/dsgw/config/Makefile b/ldap/clients/dsgw/config/Makefile
index 930010d1..df045cc0 100644
--- a/ldap/clients/dsgw/config/Makefile
+++ b/ldap/clients/dsgw/config/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
#
# Gmakefile for Directory Server Gateway config files.
diff --git a/ldap/clients/dsgw/config/de/dsgw-l10n.conf b/ldap/clients/dsgw/config/de/dsgw-l10n.conf
index 0482312b..76c14b16 100644
--- a/ldap/clients/dsgw/config/de/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/de/dsgw-l10n.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# To localize the search type menu:
# Locate dsgw-l10n.conf in config/<lang>/.
diff --git a/ldap/clients/dsgw/config/de/dsgw.conf b/ldap/clients/dsgw/config/de/dsgw.conf
index 64c202d1..a240647c 100644
--- a/ldap/clients/dsgw/config/de/dsgw.conf
+++ b/ldap/clients/dsgw/config/de/dsgw.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# The baseurl directive gives the server, port, and base dn where searches
# should be rooted. The format is:
diff --git a/ldap/clients/dsgw/config/de/dsgw.tmpl b/ldap/clients/dsgw/config/de/dsgw.tmpl
index f126945d..762f68c1 100644
--- a/ldap/clients/dsgw/config/de/dsgw.tmpl
+++ b/ldap/clients/dsgw/config/de/dsgw.tmpl
@@ -1,3 +1,9 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+
# The htmldir directive tells the CGIs where to find the html files
htmldir ../html
diff --git a/ldap/clients/dsgw/config/de/dsgw_adm.conf b/ldap/clients/dsgw/config/de/dsgw_adm.conf
index 28dc9775..85571796 100644
--- a/ldap/clients/dsgw/config/de/dsgw_adm.conf
+++ b/ldap/clients/dsgw/config/de/dsgw_adm.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# Mapping between config/display-XXX.html templates and LDAP objectClasses.
# This can be generated by using the templateindex program. The format is:
diff --git a/ldap/clients/dsgw/config/de/dsgwfilter.conf b/ldap/clients/dsgw/config/de/dsgwfilter.conf
index 5b08d17c..42dba32a 100644
--- a/ldap/clients/dsgw/config/de/dsgwfilter.conf
+++ b/ldap/clients/dsgw/config/de/dsgwfilter.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# ldap filter file
#
diff --git a/ldap/clients/dsgw/config/de/dsgwfilter_adm.conf b/ldap/clients/dsgw/config/de/dsgwfilter_adm.conf
index 6abe00a2..64641315 100644
--- a/ldap/clients/dsgw/config/de/dsgwfilter_adm.conf
+++ b/ldap/clients/dsgw/config/de/dsgwfilter_adm.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# ldap filter file
#
diff --git a/ldap/clients/dsgw/config/de/dsgwsearchprefs.conf b/ldap/clients/dsgw/config/de/dsgwsearchprefs.conf
index bfc97e4b..7c1d05c3 100644
--- a/ldap/clients/dsgw/config/de/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/config/de/dsgwsearchprefs.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# dsgwsearchprefs.conf - directory server gateway search object definitions
diff --git a/ldap/clients/dsgw/config/dsgw-l10n.conf b/ldap/clients/dsgw/config/dsgw-l10n.conf
index 0482312b..76c14b16 100644
--- a/ldap/clients/dsgw/config/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/dsgw-l10n.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# To localize the search type menu:
# Locate dsgw-l10n.conf in config/<lang>/.
diff --git a/ldap/clients/dsgw/config/dsgw.tmpl b/ldap/clients/dsgw/config/dsgw.tmpl
index 4bc85cb4..8ebf37ca 100644
--- a/ldap/clients/dsgw/config/dsgw.tmpl
+++ b/ldap/clients/dsgw/config/dsgw.tmpl
@@ -1,3 +1,9 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+
# The attribute the orgchart uses to search for entries.
# This value should correspond to the value of attrib-farleft-rdn
# in the orgchart's config.txt configuration file.
diff --git a/ldap/clients/dsgw/config/dsgw_adm.conf b/ldap/clients/dsgw/config/dsgw_adm.conf
index 46f06f4e..dcb678a4 100644
--- a/ldap/clients/dsgw/config/dsgw_adm.conf
+++ b/ldap/clients/dsgw/config/dsgw_adm.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# Mapping between config/display-XXX.html templates and LDAP objectClasses.
# This can be generated by using the templateindex program. The format is:
diff --git a/ldap/clients/dsgw/config/dsgwfilter.conf b/ldap/clients/dsgw/config/dsgwfilter.conf
index 6205b12a..ec50c8ab 100644
--- a/ldap/clients/dsgw/config/dsgwfilter.conf
+++ b/ldap/clients/dsgw/config/dsgwfilter.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# ldap filter file
#
diff --git a/ldap/clients/dsgw/config/dsgwfilter_adm.conf b/ldap/clients/dsgw/config/dsgwfilter_adm.conf
index b6654e40..b51caf8c 100644
--- a/ldap/clients/dsgw/config/dsgwfilter_adm.conf
+++ b/ldap/clients/dsgw/config/dsgwfilter_adm.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# ldap filter file
#
diff --git a/ldap/clients/dsgw/config/dsgwsearchprefs.conf b/ldap/clients/dsgw/config/dsgwsearchprefs.conf
index a0190919..2484bc98 100644
--- a/ldap/clients/dsgw/config/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/config/dsgwsearchprefs.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# dsgwsearchprefs.conf - directory server gateway search object definitions
diff --git a/ldap/clients/dsgw/config/en-us/dsgw-l10n.conf b/ldap/clients/dsgw/config/en-us/dsgw-l10n.conf
index 0482312b..76c14b16 100644
--- a/ldap/clients/dsgw/config/en-us/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/en-us/dsgw-l10n.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# To localize the search type menu:
# Locate dsgw-l10n.conf in config/<lang>/.
diff --git a/ldap/clients/dsgw/config/en-us/dsgwcollate.conf b/ldap/clients/dsgw/config/en-us/dsgwcollate.conf
index 81f9f461..3adf525b 100644
--- a/ldap/clients/dsgw/config/en-us/dsgwcollate.conf
+++ b/ldap/clients/dsgw/config/en-us/dsgwcollate.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# Ignore accents (diacritical marks) when doing case-insensitive comparison.
caseIgnoreAccents
diff --git a/ldap/clients/dsgw/config/en/dsgw-l10n.conf b/ldap/clients/dsgw/config/en/dsgw-l10n.conf
index 0482312b..76c14b16 100644
--- a/ldap/clients/dsgw/config/en/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/en/dsgw-l10n.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# To localize the search type menu:
# Locate dsgw-l10n.conf in config/<lang>/.
diff --git a/ldap/clients/dsgw/config/en/dsgwcollate.conf b/ldap/clients/dsgw/config/en/dsgwcollate.conf
index fc799692..1221e598 100644
--- a/ldap/clients/dsgw/config/en/dsgwcollate.conf
+++ b/ldap/clients/dsgw/config/en/dsgwcollate.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# Case 1. en and en-*
#
diff --git a/ldap/clients/dsgw/config/es/dsgw-l10n.conf b/ldap/clients/dsgw/config/es/dsgw-l10n.conf
index 0482312b..76c14b16 100644
--- a/ldap/clients/dsgw/config/es/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/es/dsgw-l10n.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# To localize the search type menu:
# Locate dsgw-l10n.conf in config/<lang>/.
diff --git a/ldap/clients/dsgw/config/es/dsgw.tmpl b/ldap/clients/dsgw/config/es/dsgw.tmpl
index 47360e0a..3a2851c2 100644
--- a/ldap/clients/dsgw/config/es/dsgw.tmpl
+++ b/ldap/clients/dsgw/config/es/dsgw.tmpl
@@ -1,3 +1,9 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+
# The htmldir directive tells the CGIs where to find the html files
htmldir ../html
diff --git a/ldap/clients/dsgw/config/es/dsgw_adm.conf b/ldap/clients/dsgw/config/es/dsgw_adm.conf
index ff662a46..0a7b1294 100644
--- a/ldap/clients/dsgw/config/es/dsgw_adm.conf
+++ b/ldap/clients/dsgw/config/es/dsgw_adm.conf
@@ -1,46 +1,46 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
-# Mapping between config/display-XXX.html templates and LDAP objectClasses.
-# This can be generated by using the templateindex program. The format is:
-#
-# template TEMPLATENAME OBJECTCLASSES
-#
-# where "display-TEMPLATENAME.html" is the name of a display template
-# that is found in this config directory (e.g., "display-group.html") and
-# OBJECTCLASSES is a list of one or more objectClass values. For a given
-# template to be used, all the objectClass values listed must be present
-# in the directory entry, so the order of these template lines is
-# significant (e.g. note that the more specific "orgperson" template is
-# listed before the one for an ordinary "person").
-#
-template group groupOfNames
-template groupun groupOfUniqueNames
-template org organization
-template orgunit organizationalUnit
-template orgperson person inetOrgPerson
-template person person
-template country country
-template licensed-user nsLicenseUser
-
-# Attribute Value Sets (used with DS_ATTRVAL_SET directives)
-# attrvset HANDLE VALUE PREFIX SUFFIX
-#
-attrvset CAL news "" "Netscape Collabra Server"
-attrvset CAL slapd "" "Netscape Directory Server"
-
-
-# Template Set definitions
-# Note: templates must be defined before they can be mentioned on
-# a tmplset line.
-#
-# tmplset SETNAME VIEWNAME TEMPLATENAME [HREF-LOCATION]
-#
-tmplset person "General" orgperson
-tmplset person "Contrase&ntilde;a" passwd
-tmplset person "Licencia" licensed-user
-tmplset group "General" group
-tmplset groupun "General" groupun
+# Mapping between config/display-XXX.html templates and LDAP objectClasses.
+# This can be generated by using the templateindex program. The format is:
+#
+# template TEMPLATENAME OBJECTCLASSES
+#
+# where "display-TEMPLATENAME.html" is the name of a display template
+# that is found in this config directory (e.g., "display-group.html") and
+# OBJECTCLASSES is a list of one or more objectClass values. For a given
+# template to be used, all the objectClass values listed must be present
+# in the directory entry, so the order of these template lines is
+# significant (e.g. note that the more specific "orgperson" template is
+# listed before the one for an ordinary "person").
+#
+template group groupOfNames
+template groupun groupOfUniqueNames
+template org organization
+template orgunit organizationalUnit
+template orgperson person inetOrgPerson
+template person person
+template country country
+template licensed-user nsLicenseUser
+
+# Attribute Value Sets (used with DS_ATTRVAL_SET directives)
+# attrvset HANDLE VALUE PREFIX SUFFIX
+#
+attrvset CAL news "" "Netscape Collabra Server"
+attrvset CAL slapd "" "Netscape Directory Server"
+
+
+# Template Set definitions
+# Note: templates must be defined before they can be mentioned on
+# a tmplset line.
+#
+# tmplset SETNAME VIEWNAME TEMPLATENAME [HREF-LOCATION]
+#
+tmplset person "General" orgperson
+tmplset person "Contrase&ntilde;a" passwd
+tmplset person "Licencia" licensed-user
+tmplset group "General" group
+tmplset groupun "General" groupun
diff --git a/ldap/clients/dsgw/config/es/dsgwfilter.conf b/ldap/clients/dsgw/config/es/dsgwfilter.conf
index 735facec..eabe0fc4 100644
--- a/ldap/clients/dsgw/config/es/dsgwfilter.conf
+++ b/ldap/clients/dsgw/config/es/dsgwfilter.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# ldap filter file
#
diff --git a/ldap/clients/dsgw/config/es/dsgwfilter_adm.conf b/ldap/clients/dsgw/config/es/dsgwfilter_adm.conf
index 48eadf05..791d7566 100644
--- a/ldap/clients/dsgw/config/es/dsgwfilter_adm.conf
+++ b/ldap/clients/dsgw/config/es/dsgwfilter_adm.conf
@@ -1,73 +1,73 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# ldap filter file
+#
+# lines like this that start with # or empty lines are ignored
#
-# ldap filter file
-#
-# lines like this that start with # or empty lines are ignored
-#
-# syntax:
-#
-# <tag>
-# <pattern1> <delimiters> <filter1-1> <desc1-1> [<scope>]
-# <filter1-2> <desc1-2> [<scope>]
-#
-# <pattern2> <delimiters> <filter2-1> <desc2-1> [<scope>] ...
-#
-# The <desc> should describe the filter. It should correctly complete
-# the phrases (in the resource database) DBT_Found0EntriesWhere_,
-# DBT_Found1EntryWhere_ and DBT_FoundEntriesWhere_; for example (en):
-#
-# Found 1 entry where the <desc> '%v'.
-# Found no entries where the <desc> '%v'.
-# Found 3 entries where the <desc> '%v'.
-#
-# The <desc> should begin with the article ("the" in English) for
-# languages that require agreement between article and noun (e.g
-# genders in Spanish or French).
-#
-# The scope is optional, and should be one of:
-# "base"
-# "onelevel"
-# "subtree"
-# if it is included.
-
-#
-# Directory Server gateway - for Netscape Admin Server
-#
-
-"dsgw-people"
- "=" " " "(%v))" "LDAP filtro es"
-
- "^[+]*[0-9][ 0-9-]*$" " " "(telephoneNumber=*%v))" "n&uacute;mero de tel&eacute;fono termina en"
-
- "@" " " "(mail=%v))" "direcci&oacute;n electr&oacute;nica es"
- "(mail=%v*))" "direcci&oacute;n electr&oacute;nica comienza por"
-
- "^.[. _].*" ". _" "(cn=%v1* %v2-))" "primera inicial + nombre es"
-
- ".*[. _].$" ". _" "(cn=%v1-*))" "nombre + &uacute;ltima inicial es"
-
- "[. _]" ". _" "(|(sn=%v1-)(cn=%v1-)))" "name is"
- "(|(cn=*%v1-*)(sn=*%v1-*)(cn~=%v1-)(sn~=%v1-)))" "nombre suena como o contiene"
-
- ".*" ". " "(uid=%v1))" "identificaci&oacute;n de acceso es"
- "(|(cn=%v1)(sn=%v1)))" "nombre es"
- "(|(cn=*%v1*)(sn=*%v1*)(cn~=%v1)(sn~=%v1)))" "nombre suena como o contiene"
-
-
-"dsgw-groups"
- "=" " " "(%v))" "LDAP filter is"
-
- ".*" ". _" "(cn=%v1-))" "nombre es"
- "(cn~=%v1-))" "nombre suena como"
-
-"dsgw-orgunits"
- "=" " " "(%v))" "LDAP filtro es"
-
- ".*" ". _" "(ou=%v1-))" "nombre de la unidad es"
- "(ou~=%v1-))" "nombre de la unidad suena como"
-
-#Do not remove this line, or place any additional lines after it.
+# syntax:
+#
+# <tag>
+# <pattern1> <delimiters> <filter1-1> <desc1-1> [<scope>]
+# <filter1-2> <desc1-2> [<scope>]
+#
+# <pattern2> <delimiters> <filter2-1> <desc2-1> [<scope>] ...
+#
+# The <desc> should describe the filter. It should correctly complete
+# the phrases (in the resource database) DBT_Found0EntriesWhere_,
+# DBT_Found1EntryWhere_ and DBT_FoundEntriesWhere_; for example (en):
+#
+# Found 1 entry where the <desc> '%v'.
+# Found no entries where the <desc> '%v'.
+# Found 3 entries where the <desc> '%v'.
+#
+# The <desc> should begin with the article ("the" in English) for
+# languages that require agreement between article and noun (e.g
+# genders in Spanish or French).
+#
+# The scope is optional, and should be one of:
+# "base"
+# "onelevel"
+# "subtree"
+# if it is included.
+
+#
+# Directory Server gateway - for Netscape Admin Server
+#
+
+"dsgw-people"
+ "=" " " "(%v))" "LDAP filtro es"
+
+ "^[+]*[0-9][ 0-9-]*$" " " "(telephoneNumber=*%v))" "n&uacute;mero de tel&eacute;fono termina en"
+
+ "@" " " "(mail=%v))" "direcci&oacute;n electr&oacute;nica es"
+ "(mail=%v*))" "direcci&oacute;n electr&oacute;nica comienza por"
+
+ "^.[. _].*" ". _" "(cn=%v1* %v2-))" "primera inicial + nombre es"
+
+ ".*[. _].$" ". _" "(cn=%v1-*))" "nombre + &uacute;ltima inicial es"
+
+ "[. _]" ". _" "(|(sn=%v1-)(cn=%v1-)))" "name is"
+ "(|(cn=*%v1-*)(sn=*%v1-*)(cn~=%v1-)(sn~=%v1-)))" "nombre suena como o contiene"
+
+ ".*" ". " "(uid=%v1))" "identificaci&oacute;n de acceso es"
+ "(|(cn=%v1)(sn=%v1)))" "nombre es"
+ "(|(cn=*%v1*)(sn=*%v1*)(cn~=%v1)(sn~=%v1)))" "nombre suena como o contiene"
+
+
+"dsgw-groups"
+ "=" " " "(%v))" "LDAP filter is"
+
+ ".*" ". _" "(cn=%v1-))" "nombre es"
+ "(cn~=%v1-))" "nombre suena como"
+
+"dsgw-orgunits"
+ "=" " " "(%v))" "LDAP filtro es"
+
+ ".*" ". _" "(ou=%v1-))" "nombre de la unidad es"
+ "(ou~=%v1-))" "nombre de la unidad suena como"
+
+#Do not remove this line, or place any additional lines after it.
diff --git a/ldap/clients/dsgw/config/es/dsgwsearchprefs.conf b/ldap/clients/dsgw/config/es/dsgwsearchprefs.conf
index fee61c10..2be92597 100644
--- a/ldap/clients/dsgw/config/es/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/config/es/dsgwsearchprefs.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# dsgwsearchprefs.conf - directory server gateway search object definitions
diff --git a/ldap/clients/dsgw/config/es/ns-license-schema.conf b/ldap/clients/dsgw/config/es/ns-license-schema.conf
index bbe5d493..95f4858a 100644
--- a/ldap/clients/dsgw/config/es/ns-license-schema.conf
+++ b/ldap/clients/dsgw/config/es/ns-license-schema.conf
@@ -1,17 +1,17 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
-attribute nsLicensedFor cis
-attribute nsLicenseStartTime cis
-attribute nsLicenseEndTime cis
-
-objectclass nsLicenseUser
- requires
- objectClass
- allows
- nsLicensedFor
- nsLicenseStartTime
- nsLicenseEndTime
+attribute nsLicensedFor cis
+attribute nsLicenseStartTime cis
+attribute nsLicenseEndTime cis
+
+objectclass nsLicenseUser
+ requires
+ objectClass
+ allows
+ nsLicensedFor
+ nsLicenseStartTime
+ nsLicenseEndTime
diff --git a/ldap/clients/dsgw/config/fr/dsgw-l10n.conf b/ldap/clients/dsgw/config/fr/dsgw-l10n.conf
index 0482312b..76c14b16 100644
--- a/ldap/clients/dsgw/config/fr/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/fr/dsgw-l10n.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# To localize the search type menu:
# Locate dsgw-l10n.conf in config/<lang>/.
diff --git a/ldap/clients/dsgw/config/fr/dsgw.conf b/ldap/clients/dsgw/config/fr/dsgw.conf
index f109eb84..8d76a97b 100644
--- a/ldap/clients/dsgw/config/fr/dsgw.conf
+++ b/ldap/clients/dsgw/config/fr/dsgw.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# The baseurl directive gives the server, port, and base dn where searches
# should be rooted. The format is:
diff --git a/ldap/clients/dsgw/config/fr/dsgw.tmpl b/ldap/clients/dsgw/config/fr/dsgw.tmpl
index 983aac2c..a7c54bbd 100644
--- a/ldap/clients/dsgw/config/fr/dsgw.tmpl
+++ b/ldap/clients/dsgw/config/fr/dsgw.tmpl
@@ -1,3 +1,9 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+
# The htmldir directive tells the CGIs where to find the html files
htmldir ../html
diff --git a/ldap/clients/dsgw/config/fr/dsgw_adm.conf b/ldap/clients/dsgw/config/fr/dsgw_adm.conf
index 33cc3f37..cd486225 100644
--- a/ldap/clients/dsgw/config/fr/dsgw_adm.conf
+++ b/ldap/clients/dsgw/config/fr/dsgw_adm.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# Mapping between config/display-XXX.html templates and LDAP objectClasses.
# This can be generated by using the templateindex program. The format is:
diff --git a/ldap/clients/dsgw/config/fr/dsgwfilter.conf b/ldap/clients/dsgw/config/fr/dsgwfilter.conf
index 17a0c3ba..2f6cac0f 100644
--- a/ldap/clients/dsgw/config/fr/dsgwfilter.conf
+++ b/ldap/clients/dsgw/config/fr/dsgwfilter.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# ldap filter file
#
diff --git a/ldap/clients/dsgw/config/fr/dsgwfilter_adm.conf b/ldap/clients/dsgw/config/fr/dsgwfilter_adm.conf
index 7c387abf..66dc2cf8 100644
--- a/ldap/clients/dsgw/config/fr/dsgwfilter_adm.conf
+++ b/ldap/clients/dsgw/config/fr/dsgwfilter_adm.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# ldap filter file
#
diff --git a/ldap/clients/dsgw/config/fr/dsgwsearchprefs.conf b/ldap/clients/dsgw/config/fr/dsgwsearchprefs.conf
index ac4cec44..791226bd 100644
--- a/ldap/clients/dsgw/config/fr/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/config/fr/dsgwsearchprefs.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# dsgwsearchprefs.conf - directory server gateway search object definitions
diff --git a/ldap/clients/dsgw/config/ja/dsgw-l10n.conf b/ldap/clients/dsgw/config/ja/dsgw-l10n.conf
index 0482312b..76c14b16 100644
--- a/ldap/clients/dsgw/config/ja/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/ja/dsgw-l10n.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# To localize the search type menu:
# Locate dsgw-l10n.conf in config/<lang>/.
diff --git a/ldap/clients/dsgw/config/ja/dsgw.conf b/ldap/clients/dsgw/config/ja/dsgw.conf
index d818fd44..955ca057 100644
--- a/ldap/clients/dsgw/config/ja/dsgw.conf
+++ b/ldap/clients/dsgw/config/ja/dsgw.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# The baseurl directive gives the server, port, and base dn where searches
# should be rooted. The format is:
diff --git a/ldap/clients/dsgw/config/ja/dsgw.tmpl b/ldap/clients/dsgw/config/ja/dsgw.tmpl
index 732e0406..056a37a8 100644
--- a/ldap/clients/dsgw/config/ja/dsgw.tmpl
+++ b/ldap/clients/dsgw/config/ja/dsgw.tmpl
@@ -1,3 +1,9 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+
# The htmldir directive tells the CGIs where to find the html files
htmldir ../html
diff --git a/ldap/clients/dsgw/config/ja/dsgw_adm.conf b/ldap/clients/dsgw/config/ja/dsgw_adm.conf
index 9fbf96ea..20a21c44 100644
--- a/ldap/clients/dsgw/config/ja/dsgw_adm.conf
+++ b/ldap/clients/dsgw/config/ja/dsgw_adm.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# Mapping between config/display-XXX.html templates and LDAP objectClasses.
# This can be generated by using the templateindex program. The format is:
diff --git a/ldap/clients/dsgw/config/ja/dsgwcharset.conf b/ldap/clients/dsgw/config/ja/dsgwcharset.conf
index d14e3f1d..4794b61a 100644
--- a/ldap/clients/dsgw/config/ja/dsgwcharset.conf
+++ b/ldap/clients/dsgw/config/ja/dsgwcharset.conf
@@ -1,7 +1,7 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
Shift_JIS
diff --git a/ldap/clients/dsgw/config/ja/dsgwcollate.conf b/ldap/clients/dsgw/config/ja/dsgwcollate.conf
index 34377d01..e72b1402 100644
--- a/ldap/clients/dsgw/config/ja/dsgwcollate.conf
+++ b/ldap/clients/dsgw/config/ja/dsgwcollate.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# Each line in this file defines a crude string collation.
# There are two such collations, one for sorting a displayed list, and
diff --git a/ldap/clients/dsgw/config/ja/dsgwfilter.conf b/ldap/clients/dsgw/config/ja/dsgwfilter.conf
index 965854a1..2f2a7408 100644
--- a/ldap/clients/dsgw/config/ja/dsgwfilter.conf
+++ b/ldap/clients/dsgw/config/ja/dsgwfilter.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# ldap filter file
#
diff --git a/ldap/clients/dsgw/config/ja/dsgwfilter_adm.conf b/ldap/clients/dsgw/config/ja/dsgwfilter_adm.conf
index 87d50406..26251186 100644
--- a/ldap/clients/dsgw/config/ja/dsgwfilter_adm.conf
+++ b/ldap/clients/dsgw/config/ja/dsgwfilter_adm.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# ldap filter file
#
diff --git a/ldap/clients/dsgw/config/ja/dsgwsearchprefs.conf b/ldap/clients/dsgw/config/ja/dsgwsearchprefs.conf
index 14146ae9..1aa6a4cf 100644
--- a/ldap/clients/dsgw/config/ja/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/config/ja/dsgwsearchprefs.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# dsgwsearchprefs.conf - directory server gateway search object definitions
diff --git a/ldap/clients/dsgw/config/ko/dsgw-l10n.conf b/ldap/clients/dsgw/config/ko/dsgw-l10n.conf
index 0482312b..76c14b16 100644
--- a/ldap/clients/dsgw/config/ko/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/ko/dsgw-l10n.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# To localize the search type menu:
# Locate dsgw-l10n.conf in config/<lang>/.
diff --git a/ldap/clients/dsgw/config/ko/dsgwcharset.conf b/ldap/clients/dsgw/config/ko/dsgwcharset.conf
index f42c2b31..41ba6df9 100644
--- a/ldap/clients/dsgw/config/ko/dsgwcharset.conf
+++ b/ldap/clients/dsgw/config/ko/dsgwcharset.conf
@@ -1,7 +1,7 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
-#
+# END COPYRIGHT BLOCK
+#
euc-kr
diff --git a/ldap/clients/dsgw/config/ns-license-schema.conf b/ldap/clients/dsgw/config/ns-license-schema.conf
index 7ab2c1fe..95f4858a 100644
--- a/ldap/clients/dsgw/config/ns-license-schema.conf
+++ b/ldap/clients/dsgw/config/ns-license-schema.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
attribute nsLicensedFor cis
attribute nsLicenseStartTime cis
diff --git a/ldap/clients/dsgw/config/search.html b/ldap/clients/dsgw/config/search.html
index 2aa7ffd8..b96f5040 100644
--- a/ldap/clients/dsgw/config/search.html
+++ b/ldap/clients/dsgw/config/search.html
@@ -1,9 +1,8 @@
-<!--
- PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- license terms. Copyright © 2001 Sun Microsystems, Inc.
- Some preexisting portions Copyright © 2001 Netscape Communications Corp.
- All rights reserved.
- -->
+<!-- BEGIN COPYRIGHT BLOCK
+ Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ Copyright (C) 2005 Red Hat, Inc.
+ All rights reserved.
+ END COPYRIGHT BLOCK -->
<HTML>
<!-- HEAD -->
<!-- search.html -->
diff --git a/ldap/clients/dsgw/config/searchString.html b/ldap/clients/dsgw/config/searchString.html
index dfad73dc..eb54bfb4 100644
--- a/ldap/clients/dsgw/config/searchString.html
+++ b/ldap/clients/dsgw/config/searchString.html
@@ -1,9 +1,8 @@
-<!--
- PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- license terms. Copyright © 2001 Sun Microsystems, Inc.
- Some preexisting portions Copyright © 2001 Netscape Communications Corp.
- All rights reserved.
- -->
+<!-- BEGIN COPYRIGHT BLOCK
+ Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ Copyright (C) 2005 Red Hat, Inc.
+ All rights reserved.
+ END COPYRIGHT BLOCK -->
<HTML>
<!-- HEAD -->
<!-- searchString.html -->
diff --git a/ldap/clients/dsgw/config/zh/dsgw-l10n.conf b/ldap/clients/dsgw/config/zh/dsgw-l10n.conf
index 0482312b..76c14b16 100644
--- a/ldap/clients/dsgw/config/zh/dsgw-l10n.conf
+++ b/ldap/clients/dsgw/config/zh/dsgw-l10n.conf
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
# To localize the search type menu:
# Locate dsgw-l10n.conf in config/<lang>/.
diff --git a/ldap/clients/dsgw/config/zh/dsgwcharset.conf b/ldap/clients/dsgw/config/zh/dsgwcharset.conf
index d8b0f859..dbadb728 100644
--- a/ldap/clients/dsgw/config/zh/dsgwcharset.conf
+++ b/ldap/clients/dsgw/config/zh/dsgwcharset.conf
@@ -1,7 +1,7 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
big5
diff --git a/ldap/clients/dsgw/html/Makefile b/ldap/clients/dsgw/html/Makefile
index 5b5b9d03..975d0388 100644
--- a/ldap/clients/dsgw/html/Makefile
+++ b/ldap/clients/dsgw/html/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
#
# Gmakefile for Directory Server Gateway html files.
diff --git a/ldap/clients/dsgw/html/info/Makefile b/ldap/clients/dsgw/html/info/Makefile
index 1f791c2a..6ca82dad 100644
--- a/ldap/clients/dsgw/html/info/Makefile
+++ b/ldap/clients/dsgw/html/info/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
#
# Gmakefile for Directory Server Gateway info files.
diff --git a/ldap/clients/dsgw/html/manual/Makefile b/ldap/clients/dsgw/html/manual/Makefile
index accb957a..e4bef8d8 100644
--- a/ldap/clients/dsgw/html/manual/Makefile
+++ b/ldap/clients/dsgw/html/manual/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
#
# Gmakefile for Directory Server Gateway manual files.
diff --git a/ldap/clients/dsgw/html/manual/index.map b/ldap/clients/dsgw/html/manual/index.map
index a70461c3..4e767987 100644
--- a/ldap/clients/dsgw/html/manual/index.map
+++ b/ldap/clients/dsgw/html/manual/index.map
@@ -1,9 +1,9 @@
-;-------------------------------------------------------------------------
-; PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-; license terms. Copyright © 2001 Sun Microsystems, Inc.
-; Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+; --- BEGIN COPYRIGHT BLOCK ---
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
-;-------------------------------------------------------------------------
+; --- END COPYRIGHT BLOCK ---
+;
; -------------------------------------------MAPPINGS
; CGIScriptName = HTMLfile#AnchorName
; last update, sarette 10/10
diff --git a/ldap/clients/dsgw/html/style.css b/ldap/clients/dsgw/html/style.css
index 7c63f233..a8449295 100644
--- a/ldap/clients/dsgw/html/style.css
+++ b/ldap/clients/dsgw/html/style.css
@@ -1,3 +1,9 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
/* ======================================================= *
* Style sheet for the Directory Express application *
* ======================================================= */
diff --git a/ldap/clients/dsgw/pbconfig/Makefile b/ldap/clients/dsgw/pbconfig/Makefile
index 4fad2a25..f3e9f3d3 100644
--- a/ldap/clients/dsgw/pbconfig/Makefile
+++ b/ldap/clients/dsgw/pbconfig/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
#
# Gmakefile for Directory Server Gateway config files.
diff --git a/ldap/clients/dsgw/pbconfig/dsgwfilter.conf b/ldap/clients/dsgw/pbconfig/dsgwfilter.conf
index 2c083f00..f6cfcb54 100644
--- a/ldap/clients/dsgw/pbconfig/dsgwfilter.conf
+++ b/ldap/clients/dsgw/pbconfig/dsgwfilter.conf
@@ -1,12 +1,12 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
################################################################################
#
-# $Id: dsgwfilter.conf,v 1.1 2005/01/21 00:40:49 cvsadm Exp $
+# $Id: dsgwfilter.conf,v 1.2 2005/03/22 18:45:47 nkinder Exp $
#
# AUTHOR:
#
diff --git a/ldap/clients/dsgw/pbconfig/dsgwsearchprefs.conf b/ldap/clients/dsgw/pbconfig/dsgwsearchprefs.conf
index 528e66d7..c081d2b8 100644
--- a/ldap/clients/dsgw/pbconfig/dsgwsearchprefs.conf
+++ b/ldap/clients/dsgw/pbconfig/dsgwsearchprefs.conf
@@ -1,12 +1,12 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
################################################################################
#
-# $Id: dsgwsearchprefs.conf,v 1.1 2005/01/21 00:40:49 cvsadm Exp $
+# $Id: dsgwsearchprefs.conf,v 1.2 2005/03/22 18:45:47 nkinder Exp $
#
# AUTHOR:
#
diff --git a/ldap/clients/dsgw/pbconfig/pb.tmpl b/ldap/clients/dsgw/pbconfig/pb.tmpl
index 57ec10d8..c0650322 100644
--- a/ldap/clients/dsgw/pbconfig/pb.tmpl
+++ b/ldap/clients/dsgw/pbconfig/pb.tmpl
@@ -1,3 +1,9 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+
# The attribute the orgchart uses to search for entries.
# This value should correspond to the value of attrib-farleft-rdn
# in the orgchart's config.txt configuration file.
diff --git a/ldap/clients/dsgw/pbhtml/Makefile b/ldap/clients/dsgw/pbhtml/Makefile
index 5e59271a..3c1a827c 100644
--- a/ldap/clients/dsgw/pbhtml/Makefile
+++ b/ldap/clients/dsgw/pbhtml/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
#
# Gmakefile for Directory Server Phonebook html files.
diff --git a/ldap/clients/dsgw/pbhtml/phone.js b/ldap/clients/dsgw/pbhtml/phone.js
index f51d06dc..d4aeb3cc 100755
--- a/ldap/clients/dsgw/pbhtml/phone.js
+++ b/ldap/clients/dsgw/pbhtml/phone.js
@@ -1,8 +1,9 @@
//
-// PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-// license terms. Copyright © 2001 Sun Microsystems, Inc.
-// Some preexisting portions Copyright © 2001 Netscape Communications Corp.
-// all rights reserved.
+// --- BEGIN COPYRIGHT BLOCK ---
+// Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+// Copyright (C) 2005 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
//
function goToURL(i){
window.location.href=i;
diff --git a/ldap/clients/dsgw/pbhtml/style.css b/ldap/clients/dsgw/pbhtml/style.css
index c41191b9..67fcc0d6 100644
--- a/ldap/clients/dsgw/pbhtml/style.css
+++ b/ldap/clients/dsgw/pbhtml/style.css
@@ -1,3 +1,9 @@
+/* --- BEGIN COPYRIGHT BLOCK
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
/* ======================================================= *
* Style sheet for the Directory Express application *
* ======================================================= */
diff --git a/ldap/clients/dsgw/userhtml/Makefile b/ldap/clients/dsgw/userhtml/Makefile
index 4a19446a..6e10caae 100644
--- a/ldap/clients/dsgw/userhtml/Makefile
+++ b/ldap/clients/dsgw/userhtml/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright © 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# END COPYRIGHT BLOCK
#
#
# Gmakefile for Directory Server Gateway html files.
diff --git a/ldap/clients/dsgw/userhtml/index.lst b/ldap/clients/dsgw/userhtml/index.lst
index 83156146..ebb6e338 100644
--- a/ldap/clients/dsgw/userhtml/index.lst
+++ b/ldap/clients/dsgw/userhtml/index.lst
@@ -1,9 +1,9 @@
-;-------------------------------------------------------------------------
-; PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-; license terms. Copyright © 2001 Sun Microsystems, Inc.
-; Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+; --- BEGIN COPYRIGHT BLOCK ---
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
-;-------------------------------------------------------------------------
+; --- END COPYRIGHT BLOCK ---
+;
; Netscape admin index page master list
;
; Lines beginning with a ';' are comments
diff --git a/ldap/clients/dsmlgw/Makefile b/ldap/clients/dsmlgw/Makefile
index bca513bf..1b05ebd7 100644
--- a/ldap/clients/dsmlgw/Makefile
+++ b/ldap/clients/dsmlgw/Makefile
@@ -1,3 +1,8 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+
NOSTDCLEAN=true
NO_BUILD_NUM=true
COMPONENT_DEPS=true
diff --git a/ldap/clients/dsmlgw/build.xml b/ldap/clients/dsmlgw/build.xml
index 054e10f7..f2c2643d 100644
--- a/ldap/clients/dsmlgw/build.xml
+++ b/ldap/clients/dsmlgw/build.xml
@@ -1,4 +1,8 @@
<?xml version='1.0'?>
+<!-- BEGIN COPYRIGHT BLOCK
+ Copyright (C) 2005 Red Hat, Inc.
+ All rights reserved.
+ END COPYRIGHT BLOCK -->
<!-- ANT build script for the new dsml gateway -->
<!-- Possible to compile by hand, use
cd /ldapserver/ldap/clients/dsmlgw
diff --git a/ldap/clients/dsmlgw/misc/dsmlgw.cfg b/ldap/clients/dsmlgw/misc/dsmlgw.cfg
index d9686aa9..ab30530a 100644
--- a/ldap/clients/dsmlgw/misc/dsmlgw.cfg
+++ b/ldap/clients/dsmlgw/misc/dsmlgw.cfg
@@ -1,3 +1,8 @@
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
#properties file for the
#Netscape DSMLGW
# DSML Gateway
diff --git a/ldap/clients/dsmlgw/misc/server-config.wsdd b/ldap/clients/dsmlgw/misc/server-config.wsdd
index 8740196b..747e1478 100644
--- a/ldap/clients/dsmlgw/misc/server-config.wsdd
+++ b/ldap/clients/dsmlgw/misc/server-config.wsdd
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- BEGIN COPYRIGHT BLOCK
+ Copyright (C) 2005 Red Hat, Inc.
+ All rights reserved.
+ END COPYRIGHT BLOCK -->
<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
<globalConfiguration>
<parameter name="adminPassword" value="admin"/>
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java
index 31f9ca50..37220d03 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/BatchProcessor.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import org.w3c.dom.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java
index 98f78a62..ed2b810d 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Configuration.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import java.io.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Constants.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Constants.java
index 6bb14f41..5c3aa5d5 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Constants.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/Constants.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
/**
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java
index b718c519..b02166a8 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/GenericOperation.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
@@ -44,4 +41,4 @@ class GenericOperation {
ldapConn = lc;
}
// abstract javax.xml.soap.SOAPElement getResponse(gatewayContext ctx);
-} \ No newline at end of file
+}
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java
index c13a9503..07171053 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnMgrFactoryFunctor.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
/**
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java
index ee4300f8..2caa0810 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/IConnectionManager.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import java.io.IOException;
@@ -27,4 +24,4 @@ public interface IConnectionManager {
public LDAPConnection getConnection(String loginCtx);
-} \ No newline at end of file
+}
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java
index 017c067b..2493dd13 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/LDAPAuthenticator.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import netscape.ldap.*;
@@ -64,4 +61,4 @@ public class LDAPAuthenticator {
return LDAPException.UNAVAILABLE ;
}
}
-} \ No newline at end of file
+}
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java
index 5b3046c2..ccca1f14 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAdd.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import netscape.ldap.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java
index 776aeeb3..1fd1dbde 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationAuth.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import netscape.ldap.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java
index 45939c32..1d832604 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationCompare.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import netscape.ldap.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java
index 995fc2bf..d5d6c080 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationDelete.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import netscape.ldap.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java
index bbffd947..155ed701 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationExtended.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import netscape.ldap.*;
@@ -90,4 +87,4 @@ public class OperationExtended extends GenericOperation {
}
-} \ No newline at end of file
+}
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java
index f9d47ecb..8ad4fca8 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModify.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import netscape.ldap.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java
index 138edb60..2bc194fe 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationModifyDN.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import netscape.ldap.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java
index f75d8238..538ae45b 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/OperationSearch.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import netscape.ldap.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java
index c0ac27a1..a49d7f31 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseControl.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import org.w3c.dom.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java
index 85b884df..25053a26 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseFilter.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import org.w3c.dom.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java
index 278d5a8c..aa40b711 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnMgrFactory.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
/**
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java
index 230ca108..246b48d7 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ProxyConnectionManager.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import java.lang.Exception ;
@@ -257,4 +254,4 @@ class ProxyConnectionManager implements IConnectionManager {
}
-} \ No newline at end of file
+}
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java
index d737e8bb..17e21902 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayContext.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import netscape.ldap.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java
index 8bb5fb76..252bdd52 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayException.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java
index 6598dda3..8777a9f0 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java
index 4dba8fd0..3a220f09 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayService.java
@@ -1,10 +1,7 @@
-/*
- * Copyright 2004 Netscape Communications Corporation.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- *
- *
- *
- */
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
import javax.activation.DataHandler;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/SOAPClient.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/SOAPClient.java
index 9b891469..269a4f70 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/SOAPClient.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/SOAPClient.java
@@ -1,11 +1,7 @@
-/*
- * SOAPClient.java
- *
- * Created on June 24, 2004, 3:00 PM
- */
-
-
-
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.test;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlClient.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlClient.java
index 98fd255a..e402adb8 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlClient.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlClient.java
@@ -1,3 +1,7 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.test;
import javax.xml.parsers.*;
diff --git a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java
index bd0d8f8a..bbe9bc9c 100644
--- a/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java
+++ b/ldap/clients/dsmlgw/src/com/netscape/dsml/test/dsmlSearch.java
@@ -1,3 +1,7 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.test;
import javax.xml.parsers.*;
diff --git a/ldap/clients/orgchart/botframe.html b/ldap/clients/orgchart/botframe.html
index 7a833076..7da32d0e 100644
--- a/ldap/clients/orgchart/botframe.html
+++ b/ldap/clients/orgchart/botframe.html
@@ -1,4 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!-- BEGIN COPYRIGHT BLOCK
+ Copyright (C) 2005 Red Hat, Inc.
+ All rights reserved.
+ END COPYRIGHT BLOCK -->
<html>
<head>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
diff --git a/ldap/clients/orgchart/config.tmpl b/ldap/clients/orgchart/config.tmpl
index c5bfd749..784dabbe 100644
--- a/ldap/clients/orgchart/config.tmpl
+++ b/ldap/clients/orgchart/config.tmpl
@@ -1,3 +1,10 @@
+#
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+
#ldap-host localhost
#ldap-port 389
#ldap-search-base dc=example,dc=com
diff --git a/ldap/clients/orgchart/index.html b/ldap/clients/orgchart/index.html
index 1bb68ae1..62744040 100644
--- a/ldap/clients/orgchart/index.html
+++ b/ldap/clients/orgchart/index.html
@@ -1,3 +1,7 @@
+<!-- BEGIN COPYRIGHT BLOCK
+ Copyright (C) 2005 Red Hat, Inc.
+ All rights reserved.
+ END COPYRIGHT BLOCK -->
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
diff --git a/ldap/clients/orgchart/myorg.bat b/ldap/clients/orgchart/myorg.bat
index 88f10c11..aee91d47 100644
--- a/ldap/clients/orgchart/myorg.bat
+++ b/ldap/clients/orgchart/myorg.bat
@@ -1,2 +1,6 @@
+@rem // --- BEGIN COPYRIGHT BLOCK ---
+@rem // Copyright (C) 2005 Red Hat, Inc.
+@rem // All rights reserved.
+@rem // --- END COPYRIGHT BLOCK ---
@set path=..\..\..\bin\slapd\admin\bin;%path%
@perl myorg.pl
diff --git a/ldap/clients/orgchart/myorg.pl b/ldap/clients/orgchart/myorg.pl
index 0161415d..4c0de715 100755
--- a/ldap/clients/orgchart/myorg.pl
+++ b/ldap/clients/orgchart/myorg.pl
@@ -1,5 +1,12 @@
#!../../../bin/slapd/admin/bin/perl
#
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+
+#
#set ts=4
$|=1;
diff --git a/ldap/clients/orgchart/org.bat b/ldap/clients/orgchart/org.bat
index c36e890b..6a15fef5 100644
--- a/ldap/clients/orgchart/org.bat
+++ b/ldap/clients/orgchart/org.bat
@@ -1,2 +1,6 @@
+@rem // --- BEGIN COPYRIGHT BLOCK ---
+@rem // Copyright (C) 2005 Red Hat, Inc.
+@rem // All rights reserved.
+@rem // --- END COPYRIGHT BLOCK ---
@set path=..\..\..\bin\slapd\admin\bin;%path%
@perl org.pl
diff --git a/ldap/clients/orgchart/org.pl b/ldap/clients/orgchart/org.pl
index c7eec21c..07c4ef8f 100755
--- a/ldap/clients/orgchart/org.pl
+++ b/ldap/clients/orgchart/org.pl
@@ -1,5 +1,12 @@
#!../../../bin/slapd/admin/bin/perl
#
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+
+#
#set ts=4
# ------------
diff --git a/ldap/clients/orgchart/styles.css b/ldap/clients/orgchart/styles.css
index 73bc6502..797d7591 100644
--- a/ldap/clients/orgchart/styles.css
+++ b/ldap/clients/orgchart/styles.css
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
/* ======================================================================= *
* Style sheet for the Directory Server Org Chart application *
* ======================================================================= */
diff --git a/ldap/clients/orgchart/topframe.html b/ldap/clients/orgchart/topframe.html
index c6e1b637..93281f86 100644
--- a/ldap/clients/orgchart/topframe.html
+++ b/ldap/clients/orgchart/topframe.html
@@ -1,3 +1,7 @@
+<!-- BEGIN COPYRIGHT BLOCK
+ Copyright (C) 2005 Red Hat, Inc.
+ All rights reserved.
+ END COPYRIGHT BLOCK -->
<HTML>
<HEAD>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
diff --git a/ldap/clients/orgchart/wrapper.c b/ldap/clients/orgchart/wrapper.c
index 1cead680..23314d03 100644
--- a/ldap/clients/orgchart/wrapper.c
+++ b/ldap/clients/orgchart/wrapper.c
@@ -1,10 +1,7 @@
-/***********************************************************************
-** Copyright 1996 - Netscape Communications Corporation
-**
-** Contact: Fred Cox <flc@netscape.com>
-**
-** Name: perl.c
-***********************************************************************/
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
/***********************************************************************
** Includes
diff --git a/ldap/cm/newinst/setup.pl b/ldap/cm/newinst/setup.pl
index f5c95b65..cee72f6f 100755
--- a/ldap/cm/newinst/setup.pl
+++ b/ldap/cm/newinst/setup.pl
@@ -1,5 +1,8 @@
#!./tools/perl
-# Author: Nathan Kinder
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# This program will package a downloaded JRE into a nsjre.zip
# file suitable for a DS install.
diff --git a/ldap/cm/newinst/setup.sh b/ldap/cm/newinst/setup.sh
index a4059e94..ba72c272 100755
--- a/ldap/cm/newinst/setup.sh
+++ b/ldap/cm/newinst/setup.sh
@@ -1,4 +1,8 @@
#!/bin/sh
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
# Configure nsPerl
if [ ! -f "./tools/perl" ]; then
diff --git a/ldap/cm/newinstnt/dsinst.rc b/ldap/cm/newinstnt/dsinst.rc
index 5a6ba278..83e433ed 100644
--- a/ldap/cm/newinstnt/dsinst.rc
+++ b/ldap/cm/newinstnt/dsinst.rc
@@ -1,3 +1,9 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+// Copyright (C) 2005 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
diff --git a/ldap/cm/newinstnt/resource.h b/ldap/cm/newinstnt/resource.h
index 6c8d6af3..7e1910a2 100644
--- a/ldap/cm/newinstnt/resource.h
+++ b/ldap/cm/newinstnt/resource.h
@@ -1,3 +1,9 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+// Copyright (C) 2005 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by dsinst.rc
diff --git a/ldap/cm/newinstnt/setup.bat b/ldap/cm/newinstnt/setup.bat
index ce42aaf2..7c9f8822 100644
--- a/ldap/cm/newinstnt/setup.bat
+++ b/ldap/cm/newinstnt/setup.bat
@@ -1,3 +1,8 @@
+@rem // --- BEGIN COPYRIGHT BLOCK ---
+@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 ---
@echo off
tools\perl setup.pl %*
diff --git a/ldap/servers/plugins/distrib/Makefile b/ldap/servers/plugins/distrib/Makefile
index 3f26ca76..ab92eba0 100644
--- a/ldap/servers/plugins/distrib/Makefile
+++ b/ldap/servers/plugins/distrib/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
#
# GNU Makefile for Directory Server distribution plugin
diff --git a/ldap/servers/plugins/distrib/Makefile.AIX b/ldap/servers/plugins/distrib/Makefile.AIX
index d155626d..b783a1b8 100644
--- a/ldap/servers/plugins/distrib/Makefile.AIX
+++ b/ldap/servers/plugins/distrib/Makefile.AIX
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# AIX Makefile for Directory Server plug-in examples
# NOTE: Make sure to set the DSLIB variable to the path
diff --git a/ldap/servers/plugins/distrib/Makefile.BSDI b/ldap/servers/plugins/distrib/Makefile.BSDI
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.BSDI
+++ b/ldap/servers/plugins/distrib/Makefile.BSDI
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# SOLARIS Makefile for Directory Server plug-in examples
#
diff --git a/ldap/servers/plugins/distrib/Makefile.HPUX b/ldap/servers/plugins/distrib/Makefile.HPUX
index 34c24521..56281e05 100644
--- a/ldap/servers/plugins/distrib/Makefile.HPUX
+++ b/ldap/servers/plugins/distrib/Makefile.HPUX
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# HPUX Makefile for Directory Server plug-in examples
diff --git a/ldap/servers/plugins/distrib/Makefile.HPUX64 b/ldap/servers/plugins/distrib/Makefile.HPUX64
index d6a09339..0ac16a50 100644
--- a/ldap/servers/plugins/distrib/Makefile.HPUX64
+++ b/ldap/servers/plugins/distrib/Makefile.HPUX64
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# HPUX Makefile for Directory Server plug-in examples
diff --git a/ldap/servers/plugins/distrib/Makefile.IRIX b/ldap/servers/plugins/distrib/Makefile.IRIX
index f2ffc0c7..f387b252 100644
--- a/ldap/servers/plugins/distrib/Makefile.IRIX
+++ b/ldap/servers/plugins/distrib/Makefile.IRIX
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# IRIX Makefile for Directory Server plug-in examples
#
diff --git a/ldap/servers/plugins/distrib/Makefile.Linux b/ldap/servers/plugins/distrib/Makefile.Linux
index b5fe839f..6bf42527 100644
--- a/ldap/servers/plugins/distrib/Makefile.Linux
+++ b/ldap/servers/plugins/distrib/Makefile.Linux
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# SOLARIS Makefile for Directory Server plug-in examples
#
diff --git a/ldap/servers/plugins/distrib/Makefile.OSF1 b/ldap/servers/plugins/distrib/Makefile.OSF1
index 2c2c4660..459b8a6d 100644
--- a/ldap/servers/plugins/distrib/Makefile.OSF1
+++ b/ldap/servers/plugins/distrib/Makefile.OSF1
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# OSF1 Makefile for Directory Server plug-in examples
diff --git a/ldap/servers/plugins/distrib/Makefile.ReliantUNIX b/ldap/servers/plugins/distrib/Makefile.ReliantUNIX
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.ReliantUNIX
+++ b/ldap/servers/plugins/distrib/Makefile.ReliantUNIX
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# SOLARIS Makefile for Directory Server plug-in examples
#
diff --git a/ldap/servers/plugins/distrib/Makefile.SOLARIS b/ldap/servers/plugins/distrib/Makefile.SOLARIS
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.SOLARIS
+++ b/ldap/servers/plugins/distrib/Makefile.SOLARIS
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# SOLARIS Makefile for Directory Server plug-in examples
#
diff --git a/ldap/servers/plugins/distrib/Makefile.SOLARIS64 b/ldap/servers/plugins/distrib/Makefile.SOLARIS64
index 170d2b47..f7093b3c 100644
--- a/ldap/servers/plugins/distrib/Makefile.SOLARIS64
+++ b/ldap/servers/plugins/distrib/Makefile.SOLARIS64
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# SOLARIS Makefile for Directory Server plug-in examples
#
diff --git a/ldap/servers/plugins/distrib/Makefile.SOLARISx86 b/ldap/servers/plugins/distrib/Makefile.SOLARISx86
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.SOLARISx86
+++ b/ldap/servers/plugins/distrib/Makefile.SOLARISx86
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# SOLARIS Makefile for Directory Server plug-in examples
#
diff --git a/ldap/servers/plugins/distrib/Makefile.UnixWare b/ldap/servers/plugins/distrib/Makefile.UnixWare
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.UnixWare
+++ b/ldap/servers/plugins/distrib/Makefile.UnixWare
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# SOLARIS Makefile for Directory Server plug-in examples
#
diff --git a/ldap/servers/plugins/distrib/Makefile.UnixWareUDK b/ldap/servers/plugins/distrib/Makefile.UnixWareUDK
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.UnixWareUDK
+++ b/ldap/servers/plugins/distrib/Makefile.UnixWareUDK
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
# SOLARIS Makefile for Directory Server plug-in examples
#
diff --git a/ldap/servers/plugins/distrib/Makefile.WINNT b/ldap/servers/plugins/distrib/Makefile.WINNT
index ddb02e29..34279b19 100644
--- a/ldap/servers/plugins/distrib/Makefile.WINNT
+++ b/ldap/servers/plugins/distrib/Makefile.WINNT
@@ -1,3 +1,9 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+#
# Makefile for Directory Server plug-in
#
diff --git a/ldap/servers/plugins/distrib/README b/ldap/servers/plugins/distrib/README
index 516d33ce..14a7a2ca 100644
--- a/ldap/servers/plugins/distrib/README
+++ b/ldap/servers/plugins/distrib/README
@@ -1,3 +1,9 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
----------------------------
Sample pluggable distribution logic
for Netscape Directory Server
@@ -14,10 +20,3 @@ distrib.c
----------
This is an example of a distribution function that can be used
to distribute a flat namespace into several backends
-
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
- * All rights reserved.
- */
diff --git a/ldap/servers/plugins/distrib/distrib.c b/ldap/servers/plugins/distrib/distrib.c
index fd8ea5b6..8b40a06a 100644
--- a/ldap/servers/plugins/distrib/distrib.c
+++ b/ldap/servers/plugins/distrib/distrib.c
@@ -1,9 +1,8 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
#include <ctype.h>
#include <string.h>
#include "slapi-plugin.h"
diff --git a/ldap/servers/plugins/distrib/dllmain.c b/ldap/servers/plugins/distrib/dllmain.c
index bce5eed7..5f6517ef 100644
--- a/ldap/servers/plugins/distrib/dllmain.c
+++ b/ldap/servers/plugins/distrib/dllmain.c
@@ -1,19 +1,8 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
-/*
- * Copyright (C) 2000 Sun Microsystems Inc.
- *
- * Use of this Source Code is subject to the terms of the applicable license
- * agreement from Sun Microsystems Inc.
- *
- * The copyright notice(s) in this Source Code does not indicate actual or
- * intended publication of this Source Code.
- */
-
+ * --- END COPYRIGHT BLOCK --- */
/*
* Microsoft Windows specifics
*/
diff --git a/ldap/servers/plugins/distrib/libdistrib.def b/ldap/servers/plugins/distrib/libdistrib.def
index 9c36e66d..2ee3c79e 100644
--- a/ldap/servers/plugins/distrib/libdistrib.def
+++ b/ldap/servers/plugins/distrib/libdistrib.def
@@ -1,9 +1,8 @@
-;-------------------------------------------------------------------------
-; PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-; license terms. Copyright 2001 Sun Microsystems, Inc.
-; Some preexisting portions Copyright 2001 Netscape Communications Corp.
+; --- BEGIN COPYRIGHT BLOCK ---
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
-;-------------------------------------------------------------------------
+; --- END COPYRIGHT BLOCK ---
DESCRIPTION 'Brandx Directory Server 7 distribution logic example'
EXPORTS
alpha_distribution @1
diff --git a/ldap/servers/plugins/http/Makefile b/ldap/servers/plugins/http/Makefile
index ba10ab35..9d3fe52d 100644
--- a/ldap/servers/plugins/http/Makefile
+++ b/ldap/servers/plugins/http/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
LDAP_SRC = ../../..
BUILD_ROOT = ../../../..
diff --git a/ldap/servers/plugins/http/dllmain.c b/ldap/servers/plugins/http/dllmain.c
index ef1f637a..10dc7f82 100644
--- a/ldap/servers/plugins/http/dllmain.c
+++ b/ldap/servers/plugins/http/dllmain.c
@@ -1,9 +1,9 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
+
/*
* Microsoft Windows specifics for BACK-LDBM DLL
*/
diff --git a/ldap/servers/plugins/http/http.def b/ldap/servers/plugins/http/http.def
index ac2f3e05..c36568ee 100644
--- a/ldap/servers/plugins/http/http.def
+++ b/ldap/servers/plugins/http/http.def
@@ -1,9 +1,9 @@
-;-------------------------------------------------------------------------
-; PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-; license terms. Copyright 2001 Sun Microsystems, Inc.
-; Some preexisting portions Copyright 2001 Netscape Communications Corp.
+; --- BEGIN COPYRIGHT BLOCK ---
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
-;-------------------------------------------------------------------------
+; --- END COPYRIGHT BLOCK ---
+
DESCRIPTION 'Netscape Directory Server Http Client'
EXPORTS
http_client_init @2
diff --git a/ldap/servers/plugins/http/http_client.c b/ldap/servers/plugins/http/http_client.c
index 3ed24f9b..73889ff8 100644
--- a/ldap/servers/plugins/http/http_client.c
+++ b/ldap/servers/plugins/http/http_client.c
@@ -1,9 +1,8 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
/**
* Simple Http Client API broker plugin
diff --git a/ldap/servers/plugins/http/http_client.h b/ldap/servers/plugins/http/http_client.h
index d849e18d..6851ff30 100644
--- a/ldap/servers/plugins/http/http_client.h
+++ b/ldap/servers/plugins/http/http_client.h
@@ -1,9 +1,8 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
#ifndef _HTTP_CLIENT_H_
#define _HTTP_CLIENT_H_
diff --git a/ldap/servers/plugins/http/http_impl.c b/ldap/servers/plugins/http/http_impl.c
index 8c216775..285d2f24 100644
--- a/ldap/servers/plugins/http/http_impl.c
+++ b/ldap/servers/plugins/http/http_impl.c
@@ -1,9 +1,9 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
+
/**
* Implementation of a Simple HTTP Client
*/
diff --git a/ldap/servers/plugins/http/http_impl.h b/ldap/servers/plugins/http/http_impl.h
index 0bca3ca2..a36730a9 100644
--- a/ldap/servers/plugins/http/http_impl.h
+++ b/ldap/servers/plugins/http/http_impl.h
@@ -1,9 +1,9 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
+
#ifndef HTTP_IMPL_H__
#define HTTP_IMPL_H__
diff --git a/ldap/servers/plugins/pam_passthru/config.ldif b/ldap/servers/plugins/pam_passthru/config.ldif
index 2dd9065c..05b04e80 100644
--- a/ldap/servers/plugins/pam_passthru/config.ldif
+++ b/ldap/servers/plugins/pam_passthru/config.ldif
@@ -1,3 +1,8 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
dn: cn=PAM Pass Through Auth,cn=plugins,cn=config
objectclass: top
objectclass: nsSlapdPlugin
diff --git a/ldap/servers/plugins/presence/presence.ldif b/ldap/servers/plugins/presence/presence.ldif
index 67bb977b..e704a42d 100644
--- a/ldap/servers/plugins/presence/presence.ldif
+++ b/ldap/servers/plugins/presence/presence.ldif
@@ -1,3 +1,8 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
dn:cn=ICQ Presence,cn=Presence,cn=plugins,cn=config
changeType:modify
replace:nsim-onvaluemapgraphic
diff --git a/ldap/servers/slapd/http.h b/ldap/servers/slapd/http.h
index 7c1654a5..5ced21ff 100644
--- a/ldap/servers/slapd/http.h
+++ b/ldap/servers/slapd/http.h
@@ -1,9 +1,8 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
#ifndef _HTTP_H_
#define _HTTP_H_
diff --git a/ldap/servers/slapd/test-plugins/Makefile.server b/ldap/servers/slapd/test-plugins/Makefile.server
index dda856e5..f96f72f1 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.server
+++ b/ldap/servers/slapd/test-plugins/Makefile.server
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
#
# GNU Makefile for Directory Server distribution plugin
diff --git a/ldap/servers/slapd/test-plugins/installDse.pl b/ldap/servers/slapd/test-plugins/installDse.pl
index 6b827ab4..e33d8a28 100755
--- a/ldap/servers/slapd/test-plugins/installDse.pl
+++ b/ldap/servers/slapd/test-plugins/installDse.pl
@@ -1,3 +1,9 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+#
# The script is used to load the config mapping tree node for the null suffix
# and to load the test sample plugin node into the Directory Server used to
# demonstrate the Data Interoperability feature for Verisign.
diff --git a/ldap/servers/slapd/test-plugins/testdbinterop.c b/ldap/servers/slapd/test-plugins/testdbinterop.c
index 7da3e72f..edde03ab 100644
--- a/ldap/servers/slapd/test-plugins/testdbinterop.c
+++ b/ldap/servers/slapd/test-plugins/testdbinterop.c
@@ -1,3 +1,9 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
#include <sys/types.h>
#include <stdio.h>
#include "db.h"
diff --git a/ldap/servers/snmp/ldap-agent.c b/ldap/servers/snmp/ldap-agent.c
index efce4106..80b5dea1 100644
--- a/ldap/servers/snmp/ldap-agent.c
+++ b/ldap/servers/snmp/ldap-agent.c
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
#include <stdio.h>
#include <time.h>
#include <net-snmp/net-snmp-config.h>
diff --git a/ldap/servers/snmp/ldap-agent.h b/ldap/servers/snmp/ldap-agent.h
index 4ce3fcf3..eeb010c5 100644
--- a/ldap/servers/snmp/ldap-agent.h
+++ b/ldap/servers/snmp/ldap-agent.h
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
#ifndef DSOPSTABLE_H
#define DSOPSTABLE_H
diff --git a/ldap/servers/snmp/main.c b/ldap/servers/snmp/main.c
index a0900de3..87ff65d5 100644
--- a/ldap/servers/snmp/main.c
+++ b/ldap/servers/snmp/main.c
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
#include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h>
#include <net-snmp/agent/net-snmp-agent-includes.h>
diff --git a/ldap/synctools/passwordsync/build.bat b/ldap/synctools/passwordsync/build.bat
index 323e6288..a5fcf1f5 100644
--- a/ldap/synctools/passwordsync/build.bat
+++ b/ldap/synctools/passwordsync/build.bat
@@ -1,3 +1,8 @@
+@rem // --- BEGIN COPYRIGHT BLOCK ---
+@rem // Copyright (C) 2005 Red Hat, Inc.
+@rem // All rights reserved.
+@rem // --- END COPYRIGHT BLOCK ---
+
@echo off
cd passsync
nmake passsync.mak
diff --git a/ldap/synctools/passwordsync/passhand.cpp b/ldap/synctools/passwordsync/passhand.cpp
index 23725e78..56cd80ed 100644
--- a/ldap/synctools/passwordsync/passhand.cpp
+++ b/ldap/synctools/passwordsync/passhand.cpp
@@ -1,3 +1,8 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// Copyright (C) 2005 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+
// Created: 2-8-2005
// Author(s): Scott Bridges
#include "passhand.h"
@@ -119,4 +124,4 @@ int PasswordHandler::PopUserPass()
userPassPairs.pop_front();
return 0;
-} \ No newline at end of file
+}
diff --git a/ldap/synctools/passwordsync/passhand.h b/ldap/synctools/passwordsync/passhand.h
index 03b5f630..77ae2a5a 100644
--- a/ldap/synctools/passwordsync/passhand.h
+++ b/ldap/synctools/passwordsync/passhand.h
@@ -1,3 +1,8 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// Copyright (C) 2005 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+
// Created: 2-8-2005
// Author(s): Scott Bridges
#ifndef _PASSHAND_H_
@@ -37,4 +42,4 @@ private:
list<USER_PASS_PAIR> userPassPairs;
};
-#endif \ No newline at end of file
+#endif
diff --git a/ldap/synctools/passwordsync/passhook/passhook.cpp b/ldap/synctools/passwordsync/passhook/passhook.cpp
index ff49d575..acefde1f 100644
--- a/ldap/synctools/passwordsync/passhook/passhook.cpp
+++ b/ldap/synctools/passwordsync/passhook/passhook.cpp
@@ -1,3 +1,8 @@
+// --- BEGIN COPYRIGHT BLOCK ---
+// Copyright (C) 2005 Red Hat, Inc.
+// All rights reserved.
+// --- END COPYRIGHT BLOCK ---
+
// Created: 2-8-2005
// Author(s): Scott Bridges
#include <windows.h>
@@ -44,4 +49,4 @@ BOOL NTAPI PasswordFilter(
BOOL NTAPI InitializeChangeNotify()
{
return TRUE;
-} \ No newline at end of file
+}
diff --git a/ldap/synctools/passwordsync/passhook/passhook.def b/ldap/synctools/passwordsync/passhook/passhook.def
index eeddeeea..53588567 100644
--- a/ldap/synctools/passwordsync/passhook/passhook.def
+++ b/ldap/synctools/passwordsync/passhook/passhook.def
@@ -1,3 +1,7 @@
+; --- BEGIN COPYRIGHT BLOCK ---
+; Copyright (C) 2005 Red Hat, Inc.
+; All rights reserved.
+; --- END COPYRIGHT BLOCK ---
LIBRARY passhook
EXPORTS
diff --git a/ldap/synctools/passwordsync/passhook/passhook.dep b/ldap/synctools/passwordsync/passhook/passhook.dep
index 5eb1b6b5..3d99110a 100644
--- a/ldap/synctools/passwordsync/passhook/passhook.dep
+++ b/ldap/synctools/passwordsync/passhook/passhook.dep
@@ -1,3 +1,8 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+
# Microsoft Developer Studio Generated Dependency File, included by passhook.mak
..\passhand.cpp : \
diff --git a/ldap/synctools/passwordsync/passhook/passhook.dsp b/ldap/synctools/passwordsync/passhook/passhook.dsp
index 385972a3..b30066ef 100644
--- a/ldap/synctools/passwordsync/passhook/passhook.dsp
+++ b/ldap/synctools/passwordsync/passhook/passhook.dsp
@@ -1,3 +1,8 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+
# Microsoft Developer Studio Project File - Name="passhook" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
diff --git a/ldap/synctools/passwordsync/passhook/passhook.mak b/ldap/synctools/passwordsync/passhook/passhook.mak
index 7f24e3ca..4e2c8a3e 100644
--- a/ldap/synctools/passwordsync/passhook/passhook.mak
+++ b/ldap/synctools/passwordsync/passhook/passhook.mak
@@ -1,3 +1,8 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+
# Microsoft Developer Studio Generated NMAKE File, Based on passhook.dsp
!IF "$(CFG)" == ""
CFG=passhook - Win32 Debug
diff --git a/ldap/synctools/passwordsync/passsync.dsw b/ldap/synctools/passwordsync/passsync.dsw
index f20d73a0..7c4437de 100644
--- a/ldap/synctools/passwordsync/passsync.dsw
+++ b/ldap/synctools/passwordsync/passsync.dsw
@@ -1,4 +1,8 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
diff --git a/ldap/synctools/passwordsync/passsync/dssynch.h b/ldap/synctools/passwordsync/passsync/dssynch.h
index f594cccd..c3f7bac5 100644
--- a/ldap/synctools/passwordsync/passsync/dssynch.h
+++ b/ldap/synctools/passwordsync/passsync/dssynch.h
@@ -1,13 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
+
/***********************************************************************
**
-** Copyright 1996 - Netscape Communications Corporation
-**
** NAME
** DSSynch.h
**
diff --git a/ldap/synctools/passwordsync/passsync/dssynchmsg.h b/ldap/synctools/passwordsync/passsync/dssynchmsg.h
index b3d2753e..081df79f 100644
--- a/ldap/synctools/passwordsync/passsync/dssynchmsg.h
+++ b/ldap/synctools/passwordsync/passsync/dssynchmsg.h
@@ -1,3 +1,7 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
//
// Values are 32 bit values layed out as follows:
//
diff --git a/ldap/synctools/passwordsync/passsync/ntservice.cpp b/ldap/synctools/passwordsync/passsync/ntservice.cpp
index 6d0f1151..2da478de 100644
--- a/ldap/synctools/passwordsync/passsync/ntservice.cpp
+++ b/ldap/synctools/passwordsync/passsync/ntservice.cpp
@@ -1,7 +1,10 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
/***********************************************************************
**
-** Copyright 1996 - Netscape Communications Corporation
-**
** NAME
** NTService.cpp
**
diff --git a/ldap/synctools/passwordsync/passsync/ntservice.h b/ldap/synctools/passwordsync/passsync/ntservice.h
index 38233ab1..1ac9d8d3 100644
--- a/ldap/synctools/passwordsync/passsync/ntservice.h
+++ b/ldap/synctools/passwordsync/passsync/ntservice.h
@@ -1,7 +1,10 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
/***********************************************************************
**
-** Copyright 1996 - Netscape Communications Corporation
-**
** NAME
** NTService.h
**
diff --git a/ldap/synctools/passwordsync/passsync/passsync.dep b/ldap/synctools/passwordsync/passsync/passsync.dep
index 36cca3c7..8a9e6276 100644
--- a/ldap/synctools/passwordsync/passsync/passsync.dep
+++ b/ldap/synctools/passwordsync/passsync/passsync.dep
@@ -1,3 +1,8 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+
# Microsoft Developer Studio Generated Dependency File, included by passsync.mak
.\ntservice.cpp : \
diff --git a/ldap/synctools/passwordsync/passsync/passsync.dsp b/ldap/synctools/passwordsync/passsync/passsync.dsp
index e4d8c4de..fcd10298 100644
--- a/ldap/synctools/passwordsync/passsync/passsync.dsp
+++ b/ldap/synctools/passwordsync/passsync/passsync.dsp
@@ -1,5 +1,9 @@
# Microsoft Developer Studio Project File - Name="passsync" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
diff --git a/ldap/synctools/passwordsync/passsync/passsync.mak b/ldap/synctools/passwordsync/passsync/passsync.mak
index 58ed9269..f62dbb71 100644
--- a/ldap/synctools/passwordsync/passsync/passsync.mak
+++ b/ldap/synctools/passwordsync/passsync/passsync.mak
@@ -1,3 +1,7 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
# Microsoft Developer Studio Generated NMAKE File, Based on passsync.dsp
!IF "$(CFG)" == ""
CFG=passsync - Win32 Debug
diff --git a/ldap/synctools/passwordsync/passsync/service.cpp b/ldap/synctools/passwordsync/passsync/service.cpp
index 09e0ce68..66fb036c 100644
--- a/ldap/synctools/passwordsync/passsync/service.cpp
+++ b/ldap/synctools/passwordsync/passsync/service.cpp
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
// Created: 2-8-2005
// Author(s): Scott Bridges
diff --git a/ldap/synctools/passwordsync/passsync/subuniutil.cpp b/ldap/synctools/passwordsync/passsync/subuniutil.cpp
index 398e8a76..5a91c3fc 100644
--- a/ldap/synctools/passwordsync/passsync/subuniutil.cpp
+++ b/ldap/synctools/passwordsync/passsync/subuniutil.cpp
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
#include "subuniutil.h"
// Copied: 2-8-2005
@@ -56,4 +61,4 @@ StrToUnicode( const char *buf )
ASCIIToUnicode( buf, unibuf, sizeof(unibuf) );
return _wcsdup( unibuf );
}
-// End Copy \ No newline at end of file
+// End Copy
diff --git a/ldap/synctools/passwordsync/passsync/subuniutil.h b/ldap/synctools/passwordsync/passsync/subuniutil.h
index 49d71f49..b159dc28 100644
--- a/ldap/synctools/passwordsync/passsync/subuniutil.h
+++ b/ldap/synctools/passwordsync/passsync/subuniutil.h
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
#ifndef _SUBUNIUTIL_H_
#define _SUBUNIUTIL_H_
diff --git a/ldap/synctools/passwordsync/passsync/synchcmds.h b/ldap/synctools/passwordsync/passsync/synchcmds.h
index 0b1c4210..40bc1386 100644
--- a/ldap/synctools/passwordsync/passsync/synchcmds.h
+++ b/ldap/synctools/passwordsync/passsync/synchcmds.h
@@ -1,13 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
/***********************************************************************
**
-** Copyright 1996 - Netscape Communications Corporation
-**
** NAME
** synchcmds.h
**
diff --git a/ldap/synctools/passwordsync/passsync/syncserv.cpp b/ldap/synctools/passwordsync/passsync/syncserv.cpp
index 800e2977..00248b50 100644
--- a/ldap/synctools/passwordsync/passsync/syncserv.cpp
+++ b/ldap/synctools/passwordsync/passsync/syncserv.cpp
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
// Created: 2-8-2005
// Author(s): Scott Bridges
#include "syncserv.h"
@@ -233,4 +238,4 @@ int PassSyncService::ModifyPassword(char* dn, char* password)
}
return 0;
-} \ No newline at end of file
+}
diff --git a/ldap/synctools/passwordsync/passsync/syncserv.h b/ldap/synctools/passwordsync/passsync/syncserv.h
index 64b95260..9a2ec93b 100644
--- a/ldap/synctools/passwordsync/passsync/syncserv.h
+++ b/ldap/synctools/passwordsync/passsync/syncserv.h
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
// Created: 2-8-2005
// Author(s): Scott Bridges
#ifndef _SYNCSERV_H_
@@ -52,4 +57,4 @@ private:
bool multipleModify;
};
-#endif \ No newline at end of file
+#endif
diff --git a/ldap/synctools/passwordsync/wix/PassSync.wxs b/ldap/synctools/passwordsync/wix/PassSync.wxs
index 3cefe39f..a5e1a6a8 100644
--- a/ldap/synctools/passwordsync/wix/PassSync.wxs
+++ b/ldap/synctools/passwordsync/wix/PassSync.wxs
@@ -1,4 +1,8 @@
<?xml version='1.0' encoding='windows-1252'?>
+<!-- BEGIN COPYRIGHT BLOCK
+ Copyright (C) 2005 Red Hat, Inc.
+ All rights reserved.
+ END COPYRIGHT BLOCK -->
<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
<Product Name='Password Sync' Id='DB501C18-86C7-4D14-AEC0-86416A69ABDE'
Language='1033' Codepage='1252'
diff --git a/ldap/systools/getHPPatches.pl b/ldap/systools/getHPPatches.pl
index 4d1be441..65055ab5 100755
--- a/ldap/systools/getHPPatches.pl
+++ b/ldap/systools/getHPPatches.pl
@@ -1,4 +1,9 @@
#!/tools/ns/bin/perl5.6.1 -w
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
$patchcmd = "swlist -l bundle";
# [output sample]
diff --git a/ldap/systools/getSolPatches.pl b/ldap/systools/getSolPatches.pl
index 7b463fef..ab2b9fc0 100755
--- a/ldap/systools/getSolPatches.pl
+++ b/ldap/systools/getSolPatches.pl
@@ -1,4 +1,9 @@
#!/usr/bin/perl -w
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
$patchdir = "/var/sadm/patch";
diff --git a/ldap/systools/hp_patches.c b/ldap/systools/hp_patches.c
index a4741ecc..09f77105 100644
--- a/ldap/systools/hp_patches.c
+++ b/ldap/systools/hp_patches.c
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
{"PHSS_30966","1.0","ld(1) and linker tools cumulative patch",0,0,0},
{"PHSS_29486","1.0","KRB5-Client Version 1.0 cumulative patch",0,0,0},
{"PHSS_29487","1.0","GSS-API Version 1.0 Cumulative patch",0,0,0},
diff --git a/ldap/systools/mergeSolPatches.pl b/ldap/systools/mergeSolPatches.pl
index 4deefad4..cd80bf17 100755
--- a/ldap/systools/mergeSolPatches.pl
+++ b/ldap/systools/mergeSolPatches.pl
@@ -1,4 +1,9 @@
#!/usr/bin/perl -w
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
# take a solaris8 patch list and a solaris9 patch list and merge them
# together, removing duplicates
diff --git a/ldap/systools/sol_patches.c b/ldap/systools/sol_patches.c
index 4363087d..dc1dfe96 100644
--- a/ldap/systools/sol_patches.c
+++ b/ldap/systools/sol_patches.c
@@ -1,3 +1,9 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
/* This list was generated by /u/norikoyasuo/bin/getSolPatches.pl */
/* on droid.mcom.com */
/* at Thu Mar 18 18:34:27 2004 GMT */