149951 - Updated source code copyrights

223 files changed, 452 insertions, 446 deletions

diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index b87d4788..f51ed80d 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/filterfiles.sh b/ldap/cm/filterfiles.sh
index 7ab1e3c9..8db89d3c 100644
--- a/ldap/cm/filterfiles.sh
+++ b/ldap/cm/filterfiles.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/fixBaseInf.pl b/ldap/cm/fixBaseInf.pl
index cadbfa74..d759533a 100644
--- a/ldap/cm/fixBaseInf.pl
+++ b/ldap/cm/fixBaseInf.pl
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/fixNSPerlInf.pl b/ldap/cm/fixNSPerlInf.pl
index afdf00eb..9f72e89b 100644
--- a/ldap/cm/fixNSPerlInf.pl
+++ b/ldap/cm/fixNSPerlInf.pl
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/fixPerlDAPInf.pl b/ldap/cm/fixPerlDAPInf.pl
index fe87dad0..cf1f9fb7 100644
--- a/ldap/cm/fixPerlDAPInf.pl
+++ b/ldap/cm/fixPerlDAPInf.pl
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/fixSetupInf.pl b/ldap/cm/fixSetupInf.pl
index 7f1da7d7..bd10f5c6 100644
--- a/ldap/cm/fixSetupInf.pl
+++ b/ldap/cm/fixSetupInf.pl
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/ldapjava.mpw b/ldap/cm/ldapjava.mpw
index 914dbfd5..aba0974f 100644
--- a/ldap/cm/ldapjava.mpw
+++ b/ldap/cm/ldapjava.mpw
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/nbsp2utf8.sh b/ldap/cm/nbsp2utf8.sh
index 1f7df9b1..bec478b1 100644
--- a/ldap/cm/nbsp2utf8.sh
+++ b/ldap/cm/nbsp2utf8.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/newinst/Makefile b/ldap/cm/newinst/Makefile
index 762ccfcb..9ce7c96b 100644
--- a/ldap/cm/newinst/Makefile
+++ b/ldap/cm/newinst/Makefile
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/newinst/fixINF.pl b/ldap/cm/newinst/fixINF.pl
index 0861a9b9..fbc53021 100644
--- a/ldap/cm/newinst/fixINF.pl
+++ b/ldap/cm/newinst/fixINF.pl
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/newinst/ns-keygen b/ldap/cm/newinst/ns-keygen
index 2c7c3d0d..e01d43a4 100755
--- a/ldap/cm/newinst/ns-keygen
+++ b/ldap/cm/newinst/ns-keygen
@@ -1,8 +1,8 @@
 #!/bin/sh 
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/newinst/ns-update b/ldap/cm/newinst/ns-update
index a4c86788..b521aebd 100755
--- a/ldap/cm/newinst/ns-update
+++ b/ldap/cm/newinst/ns-update
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/newinst/replaceToken.pl b/ldap/cm/newinst/replaceToken.pl
index 13265efe..c6c6d8ad 100644
--- a/ldap/cm/newinst/replaceToken.pl
+++ b/ldap/cm/newinst/replaceToken.pl
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/newinst/setup b/ldap/cm/newinst/setup
index 1adc2b3b..87e20270 100755
--- a/ldap/cm/newinst/setup
+++ b/ldap/cm/newinst/setup
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2005 Red Hat Inc.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/newinst/slapd.inf b/ldap/cm/newinst/slapd.inf
index a481b6c8..5c450f07 100644
--- a/ldap/cm/newinst/slapd.inf
+++ b/ldap/cm/newinst/slapd.inf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/newinst/uninstall b/ldap/cm/newinst/uninstall
index cdcc2491..e47822d5 100755
--- a/ldap/cm/newinst/uninstall
+++ b/ldap/cm/newinst/uninstall
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/newinst/ux-config.cc b/ldap/cm/newinst/ux-config.cc
index 531b479b..9ce37470 100644
--- a/ldap/cm/newinst/ux-config.cc
+++ b/ldap/cm/newinst/ux-config.cc
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 /*********************************************************************
diff --git a/ldap/cm/newinst/ux-config.h b/ldap/cm/newinst/ux-config.h
index ecba9d48..ed2c2423 100644
--- a/ldap/cm/newinst/ux-config.h
+++ b/ldap/cm/newinst/ux-config.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 /*********************************************************************
@@ -16,6 +16,9 @@
 **
 ** HISTORY:
 ** $Log: ux-config.h,v $
+** Revision 1.3  2005/02/28 23:37:49  nkinder
+** 149951 - Updated source code copyrights
+**
 ** Revision 1.2  2005/02/02 19:35:43  nhosoi
 ** [146919] De-brand the Directory Server as "brandx"
 **
diff --git a/ldap/cm/newinst/ux-dialog.cc b/ldap/cm/newinst/ux-dialog.cc
index 0dc53b54..294b0468 100644
--- a/ldap/cm/newinst/ux-dialog.cc
+++ b/ldap/cm/newinst/ux-dialog.cc
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 /*********************************************************************
diff --git a/ldap/cm/newinst/ux-dialog.h b/ldap/cm/newinst/ux-dialog.h
index bc8b47b8..780c1264 100644
--- a/ldap/cm/newinst/ux-dialog.h
+++ b/ldap/cm/newinst/ux-dialog.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
diff --git a/ldap/cm/newinst/ux-dsalib_dn.c b/ldap/cm/newinst/ux-dsalib_dn.c
index 535bf53f..6a35c630 100644
--- a/ldap/cm/newinst/ux-dsalib_dn.c
+++ b/ldap/cm/newinst/ux-dsalib_dn.c
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
diff --git a/ldap/cm/newinst/ux-guesses.cc b/ldap/cm/newinst/ux-guesses.cc
index 6b54127c..3323a0a1 100644
--- a/ldap/cm/newinst/ux-guesses.cc
+++ b/ldap/cm/newinst/ux-guesses.cc
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
@@ -8,11 +8,14 @@
 
 
 
-/* $RCSfile: ux-guesses.cc,v $ $Revision: 1.1 $ $Date: 2005/01/21 00:40:49 $ $State: Exp $ */
+/* $RCSfile: ux-guesses.cc,v $ $Revision: 1.2 $ $Date: 2005/02/28 23:37:49 $ $State: Exp $ */
 /*
  * $Log: ux-guesses.cc,v $
- * Revision 1.1  2005/01/21 00:40:49  cvsadm
- * Initial revision
+ * Revision 1.2  2005/02/28 23:37:49  nkinder
+ * 149951 - Updated source code copyrights
+ *
+ * Revision 1.1.1.1  2005/01/21 00:40:49  cvsadm
+ * Moving NSCP Directory Server from DirectoryBranch to TRUNK, initial drop. (foxworth)
  *
  * Revision 1.1.2.4  2004/07/14 01:39:20  dboreham
  * changes to make newer C++ compilers happy
diff --git a/ldap/cm/newinstnt/Makefile b/ldap/cm/newinstnt/Makefile
index 5d711c90..f491b99b 100644
--- a/ldap/cm/newinstnt/Makefile
+++ b/ldap/cm/newinstnt/Makefile
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/newinstnt/consolinst.c b/ldap/cm/newinstnt/consolinst.c
index 9fc5a6f5..1dc118a4 100644
--- a/ldap/cm/newinstnt/consolinst.c
+++ b/ldap/cm/newinstnt/consolinst.c
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 //////////////////////////////////////////////////////////////////////////////
diff --git a/ldap/cm/newinstnt/consolinst.h b/ldap/cm/newinstnt/consolinst.h
index 6bd3f4e4..a61aafda 100644
--- a/ldap/cm/newinstnt/consolinst.h
+++ b/ldap/cm/newinstnt/consolinst.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 //////////////////////////////////////////////////////////////////////////////
diff --git a/ldap/cm/newinstnt/dsinst.c b/ldap/cm/newinstnt/dsinst.c
index 2e61a51e..f693e8ab 100644
--- a/ldap/cm/newinstnt/dsinst.c
+++ b/ldap/cm/newinstnt/dsinst.c
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/ldap/cm/newinstnt/dsinst.h b/ldap/cm/newinstnt/dsinst.h
index 0788a398..67c9246e 100644
--- a/ldap/cm/newinstnt/dsinst.h
+++ b/ldap/cm/newinstnt/dsinst.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 //////////////////////////////////////////////////////////////////////////////
diff --git a/ldap/cm/newinstnt/dsinst_dsalib_dn.c b/ldap/cm/newinstnt/dsinst_dsalib_dn.c
index 4d2c358c..7a60d99f 100644
--- a/ldap/cm/newinstnt/dsinst_dsalib_dn.c
+++ b/ldap/cm/newinstnt/dsinst_dsalib_dn.c
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 
diff --git a/ldap/cm/newinstnt/libinst.c b/ldap/cm/newinstnt/libinst.c
index 81c04930..40994795 100644
--- a/ldap/cm/newinstnt/libinst.c
+++ b/ldap/cm/newinstnt/libinst.c
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #include "libinst.h"
diff --git a/ldap/cm/newinstnt/libinst.h b/ldap/cm/newinstnt/libinst.h
index fd161031..23c0ad40 100644
--- a/ldap/cm/newinstnt/libinst.h
+++ b/ldap/cm/newinstnt/libinst.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 //////////////////////////////////////////////////////////////////////////////
diff --git a/ldap/cm/newinstnt/setup.inf b/ldap/cm/newinstnt/setup.inf
index 6f3bfb64..389baab3 100644
--- a/ldap/cm/newinstnt/setup.inf
+++ b/ldap/cm/newinstnt/setup.inf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/newinstnt/slapd.inf b/ldap/cm/newinstnt/slapd.inf
index 0bb48c4b..24ed10fa 100644
--- a/ldap/cm/newinstnt/slapd.inf
+++ b/ldap/cm/newinstnt/slapd.inf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/ntpack.sh b/ldap/cm/ntpack.sh
index b99f87ee..b2cac5e7 100644
--- a/ldap/cm/ntpack.sh
+++ b/ldap/cm/ntpack.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/unixstrip b/ldap/cm/unixstrip
index 102c5c4c..21901da4 100755
--- a/ldap/cm/unixstrip
+++ b/ldap/cm/unixstrip
@@ -1,8 +1,8 @@
 #!/bin/sh  
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/unixstrip.pl b/ldap/cm/unixstrip.pl
index 9d9ae308..e8e8ad74 100644
--- a/ldap/cm/unixstrip.pl
+++ b/ldap/cm/unixstrip.pl
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-calendar-globopt.conf b/ldap/cm/v1confs/ns-calendar-globopt.conf
index 752d8574..93e14807 100644
--- a/ldap/cm/v1confs/ns-calendar-globopt.conf
+++ b/ldap/cm/v1confs/ns-calendar-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-calendar-schema.conf b/ldap/cm/v1confs/ns-calendar-schema.conf
index 16e3f222..8aff5d37 100644
--- a/ldap/cm/v1confs/ns-calendar-schema.conf
+++ b/ldap/cm/v1confs/ns-calendar-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-certificate-globopt.conf b/ldap/cm/v1confs/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v1confs/ns-certificate-globopt.conf
+++ b/ldap/cm/v1confs/ns-certificate-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-certificate-schema.conf b/ldap/cm/v1confs/ns-certificate-schema.conf
index 173a6d75..a0a9e83f 100644
--- a/ldap/cm/v1confs/ns-certificate-schema.conf
+++ b/ldap/cm/v1confs/ns-certificate-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-compass-globopt.conf b/ldap/cm/v1confs/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v1confs/ns-compass-globopt.conf
+++ b/ldap/cm/v1confs/ns-compass-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-compass-schema.conf b/ldap/cm/v1confs/ns-compass-schema.conf
index 3875f41b..7aaff35a 100644
--- a/ldap/cm/v1confs/ns-compass-schema.conf
+++ b/ldap/cm/v1confs/ns-compass-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-directory-globopt.conf b/ldap/cm/v1confs/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v1confs/ns-directory-globopt.conf
+++ b/ldap/cm/v1confs/ns-directory-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-directory-schema.conf b/ldap/cm/v1confs/ns-directory-schema.conf
index 9aaf263a..839780b0 100644
--- a/ldap/cm/v1confs/ns-directory-schema.conf
+++ b/ldap/cm/v1confs/ns-directory-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-mail-globopt.conf b/ldap/cm/v1confs/ns-mail-globopt.conf
index 1c4ef195..acb4ca39 100644
--- a/ldap/cm/v1confs/ns-mail-globopt.conf
+++ b/ldap/cm/v1confs/ns-mail-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-mail-schema.conf b/ldap/cm/v1confs/ns-mail-schema.conf
index bd069bfa..cdba6928 100644
--- a/ldap/cm/v1confs/ns-mail-schema.conf
+++ b/ldap/cm/v1confs/ns-mail-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-media-globopt.conf b/ldap/cm/v1confs/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v1confs/ns-media-globopt.conf
+++ b/ldap/cm/v1confs/ns-media-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-media-schema.conf b/ldap/cm/v1confs/ns-media-schema.conf
index bc3bca5d..a42a54db 100644
--- a/ldap/cm/v1confs/ns-media-schema.conf
+++ b/ldap/cm/v1confs/ns-media-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-news-globopt.conf b/ldap/cm/v1confs/ns-news-globopt.conf
index 7e5d8ca3..069241fe 100644
--- a/ldap/cm/v1confs/ns-news-globopt.conf
+++ b/ldap/cm/v1confs/ns-news-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-news-schema.conf b/ldap/cm/v1confs/ns-news-schema.conf
index 381ed6ff..03166f30 100644
--- a/ldap/cm/v1confs/ns-news-schema.conf
+++ b/ldap/cm/v1confs/ns-news-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-proxy-globopt.conf b/ldap/cm/v1confs/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v1confs/ns-proxy-globopt.conf
+++ b/ldap/cm/v1confs/ns-proxy-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-proxy-schema.conf b/ldap/cm/v1confs/ns-proxy-schema.conf
index 878348cd..e8af8c3d 100644
--- a/ldap/cm/v1confs/ns-proxy-schema.conf
+++ b/ldap/cm/v1confs/ns-proxy-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-web-globopt.conf b/ldap/cm/v1confs/ns-web-globopt.conf
index 7e5d8ca3..069241fe 100644
--- a/ldap/cm/v1confs/ns-web-globopt.conf
+++ b/ldap/cm/v1confs/ns-web-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/ns-web-schema.conf b/ldap/cm/v1confs/ns-web-schema.conf
index af8002b0..4dcb2b50 100644
--- a/ldap/cm/v1confs/ns-web-schema.conf
+++ b/ldap/cm/v1confs/ns-web-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/slapd.at.conf b/ldap/cm/v1confs/slapd.at.conf
index 28509c3f..2694d4dc 100644
--- a/ldap/cm/v1confs/slapd.at.conf
+++ b/ldap/cm/v1confs/slapd.at.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v1confs/slapd.oc.conf b/ldap/cm/v1confs/slapd.oc.conf
index cf673f78..a6b2ccbf 100644
--- a/ldap/cm/v1confs/slapd.oc.conf
+++ b/ldap/cm/v1confs/slapd.oc.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-calendar-globopt.conf b/ldap/cm/v3confs/ns-calendar-globopt.conf
index 0bdb7dd9..a07781c9 100644
--- a/ldap/cm/v3confs/ns-calendar-globopt.conf
+++ b/ldap/cm/v3confs/ns-calendar-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-calendar-schema.conf b/ldap/cm/v3confs/ns-calendar-schema.conf
index f36574a4..6e82d8b6 100644
--- a/ldap/cm/v3confs/ns-calendar-schema.conf
+++ b/ldap/cm/v3confs/ns-calendar-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-certificate-globopt.conf b/ldap/cm/v3confs/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v3confs/ns-certificate-globopt.conf
+++ b/ldap/cm/v3confs/ns-certificate-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-certificate-schema.conf b/ldap/cm/v3confs/ns-certificate-schema.conf
index f4578018..7261ba6f 100644
--- a/ldap/cm/v3confs/ns-certificate-schema.conf
+++ b/ldap/cm/v3confs/ns-certificate-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-compass-globopt.conf b/ldap/cm/v3confs/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v3confs/ns-compass-globopt.conf
+++ b/ldap/cm/v3confs/ns-compass-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-compass-schema.conf b/ldap/cm/v3confs/ns-compass-schema.conf
index be13bc44..bf11a7d0 100644
--- a/ldap/cm/v3confs/ns-compass-schema.conf
+++ b/ldap/cm/v3confs/ns-compass-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-directory-globopt.conf b/ldap/cm/v3confs/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v3confs/ns-directory-globopt.conf
+++ b/ldap/cm/v3confs/ns-directory-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-directory-schema.conf b/ldap/cm/v3confs/ns-directory-schema.conf
index 7c0611ee..619bbf7e 100644
--- a/ldap/cm/v3confs/ns-directory-schema.conf
+++ b/ldap/cm/v3confs/ns-directory-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-mail-globopt.conf b/ldap/cm/v3confs/ns-mail-globopt.conf
index 1c4ef195..acb4ca39 100644
--- a/ldap/cm/v3confs/ns-mail-globopt.conf
+++ b/ldap/cm/v3confs/ns-mail-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-mail-schema.conf b/ldap/cm/v3confs/ns-mail-schema.conf
index 076cc065..a886404b 100644
--- a/ldap/cm/v3confs/ns-mail-schema.conf
+++ b/ldap/cm/v3confs/ns-mail-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-media-globopt.conf b/ldap/cm/v3confs/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v3confs/ns-media-globopt.conf
+++ b/ldap/cm/v3confs/ns-media-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-media-schema.conf b/ldap/cm/v3confs/ns-media-schema.conf
index d4afa271..629f28b9 100644
--- a/ldap/cm/v3confs/ns-media-schema.conf
+++ b/ldap/cm/v3confs/ns-media-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-news-globopt.conf b/ldap/cm/v3confs/ns-news-globopt.conf
index 7e5d8ca3..069241fe 100644
--- a/ldap/cm/v3confs/ns-news-globopt.conf
+++ b/ldap/cm/v3confs/ns-news-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-news-schema.conf b/ldap/cm/v3confs/ns-news-schema.conf
index 777f339a..ba735ee5 100644
--- a/ldap/cm/v3confs/ns-news-schema.conf
+++ b/ldap/cm/v3confs/ns-news-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-proxy-globopt.conf b/ldap/cm/v3confs/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v3confs/ns-proxy-globopt.conf
+++ b/ldap/cm/v3confs/ns-proxy-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-proxy-schema.conf b/ldap/cm/v3confs/ns-proxy-schema.conf
index 3d26bacb..e3556fd9 100644
--- a/ldap/cm/v3confs/ns-proxy-schema.conf
+++ b/ldap/cm/v3confs/ns-proxy-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-web-globopt.conf b/ldap/cm/v3confs/ns-web-globopt.conf
index 7e5d8ca3..069241fe 100644
--- a/ldap/cm/v3confs/ns-web-globopt.conf
+++ b/ldap/cm/v3confs/ns-web-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/ns-web-schema.conf b/ldap/cm/v3confs/ns-web-schema.conf
index ce5c2b16..7b581348 100644
--- a/ldap/cm/v3confs/ns-web-schema.conf
+++ b/ldap/cm/v3confs/ns-web-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/slapd.at.conf b/ldap/cm/v3confs/slapd.at.conf
index 01e31155..4308e095 100644
--- a/ldap/cm/v3confs/slapd.at.conf
+++ b/ldap/cm/v3confs/slapd.at.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v3confs/slapd.oc.conf b/ldap/cm/v3confs/slapd.oc.conf
index 57e05f4b..5a423141 100644
--- a/ldap/cm/v3confs/slapd.oc.conf
+++ b/ldap/cm/v3confs/slapd.oc.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/java-object-schema.conf b/ldap/cm/v4confs/40/java-object-schema.conf
index 1ba36b8c..bd65232b 100644
--- a/ldap/cm/v4confs/40/java-object-schema.conf
+++ b/ldap/cm/v4confs/40/java-object-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-admin-schema.conf b/ldap/cm/v4confs/40/ns-admin-schema.conf
index 0bd125de..8c7858ff 100644
--- a/ldap/cm/v4confs/40/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/40/ns-admin-schema.conf
diff --git a/ldap/cm/v4confs/40/ns-calendar-globopt.conf b/ldap/cm/v4confs/40/ns-calendar-globopt.conf
index 0bdb7dd9..a07781c9 100644
--- a/ldap/cm/v4confs/40/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-calendar-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-calendar-schema.conf b/ldap/cm/v4confs/40/ns-calendar-schema.conf
index 2a35ae3c..431bb66a 100644
--- a/ldap/cm/v4confs/40/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/40/ns-calendar-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-certificate-globopt.conf b/ldap/cm/v4confs/40/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/40/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-certificate-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-certificate-schema.conf b/ldap/cm/v4confs/40/ns-certificate-schema.conf
index a9ef7b9d..6631f3bd 100644
--- a/ldap/cm/v4confs/40/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/40/ns-certificate-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-common-schema.conf b/ldap/cm/v4confs/40/ns-common-schema.conf
index 3b934a1a..ae204259 100644
--- a/ldap/cm/v4confs/40/ns-common-schema.conf
+++ b/ldap/cm/v4confs/40/ns-common-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-compass-globopt.conf b/ldap/cm/v4confs/40/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v4confs/40/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-compass-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-compass-schema.conf b/ldap/cm/v4confs/40/ns-compass-schema.conf
index be13bc44..bf11a7d0 100644
--- a/ldap/cm/v4confs/40/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/40/ns-compass-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-cos-schema.conf b/ldap/cm/v4confs/40/ns-cos-schema.conf
index 3d0f9f1a..9bc9243a 100644
--- a/ldap/cm/v4confs/40/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/40/ns-cos-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf
index b25c9146..d6304c93 100644
--- a/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/40/ns-delegated-admin-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-directory-globopt.conf b/ldap/cm/v4confs/40/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/40/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-directory-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-directory-schema.conf b/ldap/cm/v4confs/40/ns-directory-schema.conf
index d928081f..ce814775 100644
--- a/ldap/cm/v4confs/40/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/40/ns-directory-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-legacy-schema.conf b/ldap/cm/v4confs/40/ns-legacy-schema.conf
index 88424b82..74bfaefc 100644
--- a/ldap/cm/v4confs/40/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/40/ns-legacy-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-mail-globopt.conf b/ldap/cm/v4confs/40/ns-mail-globopt.conf
index 2e6cac65..e69dc715 100644
--- a/ldap/cm/v4confs/40/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-mail-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-mail-schema.conf b/ldap/cm/v4confs/40/ns-mail-schema.conf
index 13af6135..e710a5f7 100644
--- a/ldap/cm/v4confs/40/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mail-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf
index dd2e228f..349f06c2 100644
--- a/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-browser-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-mcd-config-schema.conf b/ldap/cm/v4confs/40/ns-mcd-config-schema.conf
index 7076bbc7..52823979 100644
--- a/ldap/cm/v4confs/40/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-config-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf
index 57a75555..f2e92332 100644
--- a/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-li-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-mcd-li-schema.conf b/ldap/cm/v4confs/40/ns-mcd-li-schema.conf
index 272d90e2..a046e50c 100644
--- a/ldap/cm/v4confs/40/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-li-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf
index 12d42c0b..896c7454 100644
--- a/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mcd-mail-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-media-globopt.conf b/ldap/cm/v4confs/40/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/40/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-media-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-media-schema.conf b/ldap/cm/v4confs/40/ns-media-schema.conf
index d4afa271..629f28b9 100644
--- a/ldap/cm/v4confs/40/ns-media-schema.conf
+++ b/ldap/cm/v4confs/40/ns-media-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-mlm-schema.conf b/ldap/cm/v4confs/40/ns-mlm-schema.conf
index 4aa8fc07..a09128b2 100644
--- a/ldap/cm/v4confs/40/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/40/ns-mlm-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-msg-schema.conf b/ldap/cm/v4confs/40/ns-msg-schema.conf
index b35df739..313295a5 100644
--- a/ldap/cm/v4confs/40/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/40/ns-msg-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-netshare-schema.conf b/ldap/cm/v4confs/40/ns-netshare-schema.conf
index b1201ef0..ebcdb7b0 100644
--- a/ldap/cm/v4confs/40/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/40/ns-netshare-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-news-globopt.conf b/ldap/cm/v4confs/40/ns-news-globopt.conf
index b35e2a83..bb9f4495 100644
--- a/ldap/cm/v4confs/40/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-news-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-news-schema.conf b/ldap/cm/v4confs/40/ns-news-schema.conf
index 777f339a..ba735ee5 100644
--- a/ldap/cm/v4confs/40/ns-news-schema.conf
+++ b/ldap/cm/v4confs/40/ns-news-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-proxy-globopt.conf b/ldap/cm/v4confs/40/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/40/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-proxy-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-proxy-schema.conf b/ldap/cm/v4confs/40/ns-proxy-schema.conf
index 3d26bacb..e3556fd9 100644
--- a/ldap/cm/v4confs/40/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/40/ns-proxy-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-value-schema.conf b/ldap/cm/v4confs/40/ns-value-schema.conf
index c4b9d3c9..c6088cfb 100644
--- a/ldap/cm/v4confs/40/ns-value-schema.conf
+++ b/ldap/cm/v4confs/40/ns-value-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-wcal-globopt.conf b/ldap/cm/v4confs/40/ns-wcal-globopt.conf
index 72b108c7..2cfbd017 100644
--- a/ldap/cm/v4confs/40/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-wcal-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-wcal-schema.conf b/ldap/cm/v4confs/40/ns-wcal-schema.conf
index 97a6d12d..9be425be 100644
--- a/ldap/cm/v4confs/40/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/40/ns-wcal-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-web-globopt.conf b/ldap/cm/v4confs/40/ns-web-globopt.conf
index 4db72fe2..904c063e 100644
--- a/ldap/cm/v4confs/40/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/40/ns-web-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/ns-web-schema.conf b/ldap/cm/v4confs/40/ns-web-schema.conf
index d5e74ed8..6e76c29f 100644
--- a/ldap/cm/v4confs/40/ns-web-schema.conf
+++ b/ldap/cm/v4confs/40/ns-web-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/slapd.at.conf b/ldap/cm/v4confs/40/slapd.at.conf
index 0b14ecbe..54eaf6f9 100644
--- a/ldap/cm/v4confs/40/slapd.at.conf
+++ b/ldap/cm/v4confs/40/slapd.at.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/40/slapd.oc.conf b/ldap/cm/v4confs/40/slapd.oc.conf
index 44a95121..f6b1c2fc 100644
--- a/ldap/cm/v4confs/40/slapd.oc.conf
+++ b/ldap/cm/v4confs/40/slapd.oc.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/java-object-schema.conf b/ldap/cm/v4confs/41/java-object-schema.conf
index 73f6f836..095021cc 100644
--- a/ldap/cm/v4confs/41/java-object-schema.conf
+++ b/ldap/cm/v4confs/41/java-object-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-admin-schema.conf b/ldap/cm/v4confs/41/ns-admin-schema.conf
index 6bd0a9d0..1fcf50a6 100644
--- a/ldap/cm/v4confs/41/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/41/ns-admin-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-calendar-globopt.conf b/ldap/cm/v4confs/41/ns-calendar-globopt.conf
index 0bdb7dd9..a07781c9 100644
--- a/ldap/cm/v4confs/41/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-calendar-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-calendar-schema.conf b/ldap/cm/v4confs/41/ns-calendar-schema.conf
index 2a35ae3c..431bb66a 100644
--- a/ldap/cm/v4confs/41/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/41/ns-calendar-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-certificate-globopt.conf b/ldap/cm/v4confs/41/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/41/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-certificate-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-certificate-schema.conf b/ldap/cm/v4confs/41/ns-certificate-schema.conf
index a9ef7b9d..6631f3bd 100644
--- a/ldap/cm/v4confs/41/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/41/ns-certificate-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-common-schema.conf b/ldap/cm/v4confs/41/ns-common-schema.conf
index a8d7b00c..cb13fcec 100644
--- a/ldap/cm/v4confs/41/ns-common-schema.conf
+++ b/ldap/cm/v4confs/41/ns-common-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-compass-globopt.conf b/ldap/cm/v4confs/41/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v4confs/41/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-compass-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-compass-schema.conf b/ldap/cm/v4confs/41/ns-compass-schema.conf
index be13bc44..bf11a7d0 100644
--- a/ldap/cm/v4confs/41/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/41/ns-compass-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-cos-schema.conf b/ldap/cm/v4confs/41/ns-cos-schema.conf
index 3d0f9f1a..9bc9243a 100644
--- a/ldap/cm/v4confs/41/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/41/ns-cos-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf
index b25c9146..d6304c93 100644
--- a/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/41/ns-delegated-admin-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-directory-globopt.conf b/ldap/cm/v4confs/41/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/41/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-directory-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-directory-schema.conf b/ldap/cm/v4confs/41/ns-directory-schema.conf
index d928081f..ce814775 100644
--- a/ldap/cm/v4confs/41/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/41/ns-directory-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-legacy-schema.conf b/ldap/cm/v4confs/41/ns-legacy-schema.conf
index 4f7c4ac4..a4d3c999 100644
--- a/ldap/cm/v4confs/41/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/41/ns-legacy-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-mail-globopt.conf b/ldap/cm/v4confs/41/ns-mail-globopt.conf
index 2e6cac65..e69dc715 100644
--- a/ldap/cm/v4confs/41/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-mail-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-mail-schema.conf b/ldap/cm/v4confs/41/ns-mail-schema.conf
index ca0fdc5d..3696bfc4 100644
--- a/ldap/cm/v4confs/41/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mail-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf
index dd2e228f..349f06c2 100644
--- a/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-browser-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-mcd-config-schema.conf b/ldap/cm/v4confs/41/ns-mcd-config-schema.conf
index 7076bbc7..52823979 100644
--- a/ldap/cm/v4confs/41/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-config-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf
index 57a75555..f2e92332 100644
--- a/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-li-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-mcd-li-schema.conf b/ldap/cm/v4confs/41/ns-mcd-li-schema.conf
index 272d90e2..a046e50c 100644
--- a/ldap/cm/v4confs/41/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-li-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf
index 12d42c0b..896c7454 100644
--- a/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mcd-mail-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-media-globopt.conf b/ldap/cm/v4confs/41/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/41/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-media-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-media-schema.conf b/ldap/cm/v4confs/41/ns-media-schema.conf
index d4afa271..629f28b9 100644
--- a/ldap/cm/v4confs/41/ns-media-schema.conf
+++ b/ldap/cm/v4confs/41/ns-media-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-mlm-schema.conf b/ldap/cm/v4confs/41/ns-mlm-schema.conf
index e1c4ef78..fe069b6a 100644
--- a/ldap/cm/v4confs/41/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/41/ns-mlm-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-msg-schema.conf b/ldap/cm/v4confs/41/ns-msg-schema.conf
index 3800edbd..93065393 100644
--- a/ldap/cm/v4confs/41/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/41/ns-msg-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-netshare-schema.conf b/ldap/cm/v4confs/41/ns-netshare-schema.conf
index b1201ef0..ebcdb7b0 100644
--- a/ldap/cm/v4confs/41/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/41/ns-netshare-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-news-globopt.conf b/ldap/cm/v4confs/41/ns-news-globopt.conf
index b35e2a83..bb9f4495 100644
--- a/ldap/cm/v4confs/41/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-news-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-news-schema.conf b/ldap/cm/v4confs/41/ns-news-schema.conf
index 777f339a..ba735ee5 100644
--- a/ldap/cm/v4confs/41/ns-news-schema.conf
+++ b/ldap/cm/v4confs/41/ns-news-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-proxy-globopt.conf b/ldap/cm/v4confs/41/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/41/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-proxy-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-proxy-schema.conf b/ldap/cm/v4confs/41/ns-proxy-schema.conf
index 3d26bacb..e3556fd9 100644
--- a/ldap/cm/v4confs/41/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/41/ns-proxy-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-value-schema.conf b/ldap/cm/v4confs/41/ns-value-schema.conf
index c4b9d3c9..c6088cfb 100644
--- a/ldap/cm/v4confs/41/ns-value-schema.conf
+++ b/ldap/cm/v4confs/41/ns-value-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-wcal-globopt.conf b/ldap/cm/v4confs/41/ns-wcal-globopt.conf
index 72b108c7..2cfbd017 100644
--- a/ldap/cm/v4confs/41/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-wcal-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-wcal-schema.conf b/ldap/cm/v4confs/41/ns-wcal-schema.conf
index 97a6d12d..9be425be 100644
--- a/ldap/cm/v4confs/41/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/41/ns-wcal-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-web-globopt.conf b/ldap/cm/v4confs/41/ns-web-globopt.conf
index 4db72fe2..904c063e 100644
--- a/ldap/cm/v4confs/41/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/41/ns-web-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/ns-web-schema.conf b/ldap/cm/v4confs/41/ns-web-schema.conf
index d5e74ed8..6e76c29f 100644
--- a/ldap/cm/v4confs/41/ns-web-schema.conf
+++ b/ldap/cm/v4confs/41/ns-web-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/slapd.at.conf b/ldap/cm/v4confs/41/slapd.at.conf
index 87c3e342..dad505c8 100644
--- a/ldap/cm/v4confs/41/slapd.at.conf
+++ b/ldap/cm/v4confs/41/slapd.at.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/41/slapd.oc.conf b/ldap/cm/v4confs/41/slapd.oc.conf
index 1e8c451b..c05b786e 100644
--- a/ldap/cm/v4confs/41/slapd.oc.conf
+++ b/ldap/cm/v4confs/41/slapd.oc.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/java-object-schema.conf b/ldap/cm/v4confs/411/java-object-schema.conf
index 1ba36b8c..bd65232b 100644
--- a/ldap/cm/v4confs/411/java-object-schema.conf
+++ b/ldap/cm/v4confs/411/java-object-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-admin-schema.conf b/ldap/cm/v4confs/411/ns-admin-schema.conf
index 6bd0a9d0..1fcf50a6 100644
--- a/ldap/cm/v4confs/411/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/411/ns-admin-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-calendar-globopt.conf b/ldap/cm/v4confs/411/ns-calendar-globopt.conf
index 0bdb7dd9..a07781c9 100644
--- a/ldap/cm/v4confs/411/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-calendar-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-calendar-schema.conf b/ldap/cm/v4confs/411/ns-calendar-schema.conf
index 2a35ae3c..431bb66a 100644
--- a/ldap/cm/v4confs/411/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/411/ns-calendar-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-certificate-globopt.conf b/ldap/cm/v4confs/411/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/411/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-certificate-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-certificate-schema.conf b/ldap/cm/v4confs/411/ns-certificate-schema.conf
index a9ef7b9d..6631f3bd 100644
--- a/ldap/cm/v4confs/411/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/411/ns-certificate-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-common-schema.conf b/ldap/cm/v4confs/411/ns-common-schema.conf
index a8d7b00c..cb13fcec 100644
--- a/ldap/cm/v4confs/411/ns-common-schema.conf
+++ b/ldap/cm/v4confs/411/ns-common-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-compass-globopt.conf b/ldap/cm/v4confs/411/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v4confs/411/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-compass-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-compass-schema.conf b/ldap/cm/v4confs/411/ns-compass-schema.conf
index be13bc44..bf11a7d0 100644
--- a/ldap/cm/v4confs/411/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/411/ns-compass-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-cos-schema.conf b/ldap/cm/v4confs/411/ns-cos-schema.conf
index 3d0f9f1a..9bc9243a 100644
--- a/ldap/cm/v4confs/411/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/411/ns-cos-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf
index 773d7069..e48b5362 100644
--- a/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/411/ns-delegated-admin-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-directory-globopt.conf b/ldap/cm/v4confs/411/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/411/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-directory-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-directory-schema.conf b/ldap/cm/v4confs/411/ns-directory-schema.conf
index d928081f..ce814775 100644
--- a/ldap/cm/v4confs/411/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/411/ns-directory-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-legacy-schema.conf b/ldap/cm/v4confs/411/ns-legacy-schema.conf
index 4f7c4ac4..a4d3c999 100644
--- a/ldap/cm/v4confs/411/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/411/ns-legacy-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-mail-globopt.conf b/ldap/cm/v4confs/411/ns-mail-globopt.conf
index 2e6cac65..e69dc715 100644
--- a/ldap/cm/v4confs/411/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-mail-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-mail-schema.conf b/ldap/cm/v4confs/411/ns-mail-schema.conf
index ca0fdc5d..3696bfc4 100644
--- a/ldap/cm/v4confs/411/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mail-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf
index dd2e228f..349f06c2 100644
--- a/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-browser-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-mcd-config-schema.conf b/ldap/cm/v4confs/411/ns-mcd-config-schema.conf
index 7076bbc7..52823979 100644
--- a/ldap/cm/v4confs/411/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-config-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf
index 57a75555..f2e92332 100644
--- a/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-li-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-mcd-li-schema.conf b/ldap/cm/v4confs/411/ns-mcd-li-schema.conf
index 272d90e2..a046e50c 100644
--- a/ldap/cm/v4confs/411/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-li-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf
index 12d42c0b..896c7454 100644
--- a/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mcd-mail-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-media-globopt.conf b/ldap/cm/v4confs/411/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/411/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-media-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-media-schema.conf b/ldap/cm/v4confs/411/ns-media-schema.conf
index d4afa271..629f28b9 100644
--- a/ldap/cm/v4confs/411/ns-media-schema.conf
+++ b/ldap/cm/v4confs/411/ns-media-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-mlm-schema.conf b/ldap/cm/v4confs/411/ns-mlm-schema.conf
index e1c4ef78..fe069b6a 100644
--- a/ldap/cm/v4confs/411/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/411/ns-mlm-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-msg-schema.conf b/ldap/cm/v4confs/411/ns-msg-schema.conf
index 3800edbd..93065393 100644
--- a/ldap/cm/v4confs/411/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/411/ns-msg-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-netshare-schema.conf b/ldap/cm/v4confs/411/ns-netshare-schema.conf
index b1201ef0..ebcdb7b0 100644
--- a/ldap/cm/v4confs/411/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/411/ns-netshare-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-news-globopt.conf b/ldap/cm/v4confs/411/ns-news-globopt.conf
index b35e2a83..bb9f4495 100644
--- a/ldap/cm/v4confs/411/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-news-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-news-schema.conf b/ldap/cm/v4confs/411/ns-news-schema.conf
index 777f339a..ba735ee5 100644
--- a/ldap/cm/v4confs/411/ns-news-schema.conf
+++ b/ldap/cm/v4confs/411/ns-news-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-proxy-globopt.conf b/ldap/cm/v4confs/411/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/411/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-proxy-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-proxy-schema.conf b/ldap/cm/v4confs/411/ns-proxy-schema.conf
index 3d26bacb..e3556fd9 100644
--- a/ldap/cm/v4confs/411/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/411/ns-proxy-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-value-schema.conf b/ldap/cm/v4confs/411/ns-value-schema.conf
index c4b9d3c9..c6088cfb 100644
--- a/ldap/cm/v4confs/411/ns-value-schema.conf
+++ b/ldap/cm/v4confs/411/ns-value-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-wcal-globopt.conf b/ldap/cm/v4confs/411/ns-wcal-globopt.conf
index 72b108c7..2cfbd017 100644
--- a/ldap/cm/v4confs/411/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-wcal-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-wcal-schema.conf b/ldap/cm/v4confs/411/ns-wcal-schema.conf
index 97a6d12d..9be425be 100644
--- a/ldap/cm/v4confs/411/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/411/ns-wcal-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-web-globopt.conf b/ldap/cm/v4confs/411/ns-web-globopt.conf
index 4db72fe2..904c063e 100644
--- a/ldap/cm/v4confs/411/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/411/ns-web-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/ns-web-schema.conf b/ldap/cm/v4confs/411/ns-web-schema.conf
index d5e74ed8..6e76c29f 100644
--- a/ldap/cm/v4confs/411/ns-web-schema.conf
+++ b/ldap/cm/v4confs/411/ns-web-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/slapd.at.conf b/ldap/cm/v4confs/411/slapd.at.conf
index 87c3e342..dad505c8 100644
--- a/ldap/cm/v4confs/411/slapd.at.conf
+++ b/ldap/cm/v4confs/411/slapd.at.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/411/slapd.oc.conf b/ldap/cm/v4confs/411/slapd.oc.conf
index 1e8c451b..c05b786e 100644
--- a/ldap/cm/v4confs/411/slapd.oc.conf
+++ b/ldap/cm/v4confs/411/slapd.oc.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/java-object-schema.conf b/ldap/cm/v4confs/412/java-object-schema.conf
index 1ba36b8c..bd65232b 100644
--- a/ldap/cm/v4confs/412/java-object-schema.conf
+++ b/ldap/cm/v4confs/412/java-object-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-admin-schema.conf b/ldap/cm/v4confs/412/ns-admin-schema.conf
index 6bd0a9d0..1fcf50a6 100644
--- a/ldap/cm/v4confs/412/ns-admin-schema.conf
+++ b/ldap/cm/v4confs/412/ns-admin-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-calendar-globopt.conf b/ldap/cm/v4confs/412/ns-calendar-globopt.conf
index 0bdb7dd9..a07781c9 100644
--- a/ldap/cm/v4confs/412/ns-calendar-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-calendar-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-calendar-schema.conf b/ldap/cm/v4confs/412/ns-calendar-schema.conf
index 2a35ae3c..431bb66a 100644
--- a/ldap/cm/v4confs/412/ns-calendar-schema.conf
+++ b/ldap/cm/v4confs/412/ns-calendar-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-certificate-globopt.conf b/ldap/cm/v4confs/412/ns-certificate-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/412/ns-certificate-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-certificate-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-certificate-schema.conf b/ldap/cm/v4confs/412/ns-certificate-schema.conf
index a9ef7b9d..6631f3bd 100644
--- a/ldap/cm/v4confs/412/ns-certificate-schema.conf
+++ b/ldap/cm/v4confs/412/ns-certificate-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-common-schema.conf b/ldap/cm/v4confs/412/ns-common-schema.conf
index a8d7b00c..cb13fcec 100644
--- a/ldap/cm/v4confs/412/ns-common-schema.conf
+++ b/ldap/cm/v4confs/412/ns-common-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-compass-globopt.conf b/ldap/cm/v4confs/412/ns-compass-globopt.conf
index 4d2e1e21..3c72083d 100644
--- a/ldap/cm/v4confs/412/ns-compass-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-compass-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-compass-schema.conf b/ldap/cm/v4confs/412/ns-compass-schema.conf
index be13bc44..bf11a7d0 100644
--- a/ldap/cm/v4confs/412/ns-compass-schema.conf
+++ b/ldap/cm/v4confs/412/ns-compass-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-cos-schema.conf b/ldap/cm/v4confs/412/ns-cos-schema.conf
index 3d0f9f1a..9bc9243a 100644
--- a/ldap/cm/v4confs/412/ns-cos-schema.conf
+++ b/ldap/cm/v4confs/412/ns-cos-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf b/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf
index 788c156f..a2a0f697 100644
--- a/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf
+++ b/ldap/cm/v4confs/412/ns-delegated-admin-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-directory-globopt.conf b/ldap/cm/v4confs/412/ns-directory-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/412/ns-directory-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-directory-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-directory-schema.conf b/ldap/cm/v4confs/412/ns-directory-schema.conf
index d928081f..ce814775 100644
--- a/ldap/cm/v4confs/412/ns-directory-schema.conf
+++ b/ldap/cm/v4confs/412/ns-directory-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-legacy-schema.conf b/ldap/cm/v4confs/412/ns-legacy-schema.conf
index 4f7c4ac4..a4d3c999 100644
--- a/ldap/cm/v4confs/412/ns-legacy-schema.conf
+++ b/ldap/cm/v4confs/412/ns-legacy-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-mail-globopt.conf b/ldap/cm/v4confs/412/ns-mail-globopt.conf
index 2e6cac65..e69dc715 100644
--- a/ldap/cm/v4confs/412/ns-mail-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-mail-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-mail-schema.conf b/ldap/cm/v4confs/412/ns-mail-schema.conf
index ca0fdc5d..3696bfc4 100644
--- a/ldap/cm/v4confs/412/ns-mail-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mail-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf b/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf
index dd2e228f..349f06c2 100644
--- a/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-browser-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-mcd-config-schema.conf b/ldap/cm/v4confs/412/ns-mcd-config-schema.conf
index 7076bbc7..52823979 100644
--- a/ldap/cm/v4confs/412/ns-mcd-config-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-config-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf b/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf
index 57a75555..f2e92332 100644
--- a/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-li-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-mcd-li-schema.conf b/ldap/cm/v4confs/412/ns-mcd-li-schema.conf
index 272d90e2..a046e50c 100644
--- a/ldap/cm/v4confs/412/ns-mcd-li-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-li-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf b/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf
index 12d42c0b..896c7454 100644
--- a/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mcd-mail-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-media-globopt.conf b/ldap/cm/v4confs/412/ns-media-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/412/ns-media-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-media-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-media-schema.conf b/ldap/cm/v4confs/412/ns-media-schema.conf
index d4afa271..629f28b9 100644
--- a/ldap/cm/v4confs/412/ns-media-schema.conf
+++ b/ldap/cm/v4confs/412/ns-media-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-mlm-schema.conf b/ldap/cm/v4confs/412/ns-mlm-schema.conf
index e1c4ef78..fe069b6a 100644
--- a/ldap/cm/v4confs/412/ns-mlm-schema.conf
+++ b/ldap/cm/v4confs/412/ns-mlm-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-msg-schema.conf b/ldap/cm/v4confs/412/ns-msg-schema.conf
index 3800edbd..93065393 100644
--- a/ldap/cm/v4confs/412/ns-msg-schema.conf
+++ b/ldap/cm/v4confs/412/ns-msg-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-netshare-schema.conf b/ldap/cm/v4confs/412/ns-netshare-schema.conf
index b1201ef0..ebcdb7b0 100644
--- a/ldap/cm/v4confs/412/ns-netshare-schema.conf
+++ b/ldap/cm/v4confs/412/ns-netshare-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-news-globopt.conf b/ldap/cm/v4confs/412/ns-news-globopt.conf
index b35e2a83..bb9f4495 100644
--- a/ldap/cm/v4confs/412/ns-news-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-news-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-news-schema.conf b/ldap/cm/v4confs/412/ns-news-schema.conf
index 777f339a..ba735ee5 100644
--- a/ldap/cm/v4confs/412/ns-news-schema.conf
+++ b/ldap/cm/v4confs/412/ns-news-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-proxy-globopt.conf b/ldap/cm/v4confs/412/ns-proxy-globopt.conf
index 65ba5064..3a318317 100644
--- a/ldap/cm/v4confs/412/ns-proxy-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-proxy-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-proxy-schema.conf b/ldap/cm/v4confs/412/ns-proxy-schema.conf
index 3d26bacb..e3556fd9 100644
--- a/ldap/cm/v4confs/412/ns-proxy-schema.conf
+++ b/ldap/cm/v4confs/412/ns-proxy-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-value-schema.conf b/ldap/cm/v4confs/412/ns-value-schema.conf
index c4b9d3c9..c6088cfb 100644
--- a/ldap/cm/v4confs/412/ns-value-schema.conf
+++ b/ldap/cm/v4confs/412/ns-value-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-wcal-globopt.conf b/ldap/cm/v4confs/412/ns-wcal-globopt.conf
index 72b108c7..2cfbd017 100644
--- a/ldap/cm/v4confs/412/ns-wcal-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-wcal-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-wcal-schema.conf b/ldap/cm/v4confs/412/ns-wcal-schema.conf
index 97a6d12d..9be425be 100644
--- a/ldap/cm/v4confs/412/ns-wcal-schema.conf
+++ b/ldap/cm/v4confs/412/ns-wcal-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-web-globopt.conf b/ldap/cm/v4confs/412/ns-web-globopt.conf
index 4db72fe2..904c063e 100644
--- a/ldap/cm/v4confs/412/ns-web-globopt.conf
+++ b/ldap/cm/v4confs/412/ns-web-globopt.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/ns-web-schema.conf b/ldap/cm/v4confs/412/ns-web-schema.conf
index d5e74ed8..6e76c29f 100644
--- a/ldap/cm/v4confs/412/ns-web-schema.conf
+++ b/ldap/cm/v4confs/412/ns-web-schema.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/slapd.at.conf b/ldap/cm/v4confs/412/slapd.at.conf
index 1772f1fe..09671c6d 100644
--- a/ldap/cm/v4confs/412/slapd.at.conf
+++ b/ldap/cm/v4confs/412/slapd.at.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/ldap/cm/v4confs/412/slapd.oc.conf b/ldap/cm/v4confs/412/slapd.oc.conf
index 1e8c451b..c05b786e 100644
--- a/ldap/cm/v4confs/412/slapd.oc.conf
+++ b/ldap/cm/v4confs/412/slapd.oc.conf
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #