149951 - Updated source code copyrights

96 files changed, 192 insertions, 192 deletions

diff --git a/include/Makefile b/include/Makefile
index 611f77a1..d595a656 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,7 +1,7 @@
 #
 # BEGIN COPYRIGHT BLOCK
-# Copyright 2001 Sun Microsystems, Inc.
-# Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
 # END COPYRIGHT BLOCK
 #
diff --git a/include/base/Makefile b/include/base/Makefile
index 01044386..67cbec88 100644
--- a/include/base/Makefile
+++ b/include/base/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/include/base/crit.h b/include/base/crit.h
index e9a3498a..ad0ed09a 100644
--- a/include/base/crit.h
+++ b/include/base/crit.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef BASE_CRIT_H
diff --git a/include/base/dbtbase.h b/include/base/dbtbase.h
index 5f30d374..1e71c42f 100644
--- a/include/base/dbtbase.h
+++ b/include/base/dbtbase.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/include/base/ereport.h b/include/base/ereport.h
index 16a4bc68..e067a84e 100644
--- a/include/base/ereport.h
+++ b/include/base/ereport.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef BASE_EREPORT_H
diff --git a/include/base/eventhandler.h b/include/base/eventhandler.h
index a68a231e..c5391c5e 100644
--- a/include/base/eventhandler.h
+++ b/include/base/eventhandler.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/include/base/eventlog.h b/include/base/eventlog.h
index a8dd6d27..8f40bb8b 100644
--- a/include/base/eventlog.h
+++ b/include/base/eventlog.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 **/
 // EVENTLOG.H
diff --git a/include/base/file.h b/include/base/file.h
index 6447bb83..c4ff47c3 100644
--- a/include/base/file.h
+++ b/include/base/file.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef BASE_FILE_H
diff --git a/include/base/fsmutex.h b/include/base/fsmutex.h
index 486f0f4c..743349ad 100644
--- a/include/base/fsmutex.h
+++ b/include/base/fsmutex.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/include/base/lexer.h b/include/base/lexer.h
index 129aa449..5bf34a17 100644
--- a/include/base/lexer.h
+++ b/include/base/lexer.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __lexer_h
diff --git a/include/base/nterr.h b/include/base/nterr.h
index 55d1be22..a614cf50 100644
--- a/include/base/nterr.h
+++ b/include/base/nterr.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/include/base/nterrors.h b/include/base/nterrors.h
index f9e4aa1f..bea47ecc 100644
--- a/include/base/nterrors.h
+++ b/include/base/nterrors.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 /* DO NOT EDIT THIS FILE - it is automatically generated */
diff --git a/include/base/plist.h b/include/base/plist.h
index d9ab744f..9c8feac2 100644
--- a/include/base/plist.h
+++ b/include/base/plist.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _PLIST_H
diff --git a/include/base/pool.h b/include/base/pool.h
index a76dc483..8c8bf91b 100644
--- a/include/base/pool.h
+++ b/include/base/pool.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef BASE_POOL_H
diff --git a/include/base/rwlock.h b/include/base/rwlock.h
index 2111e97b..43ddf05a 100644
--- a/include/base/rwlock.h
+++ b/include/base/rwlock.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 /*
diff --git a/include/base/shexp.h b/include/base/shexp.h
index f1a5aab6..a1e68c3e 100644
--- a/include/base/shexp.h
+++ b/include/base/shexp.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef BASE_SHEXP_H
diff --git a/include/base/systems.h b/include/base/systems.h
index ca28c453..21fab372 100644
--- a/include/base/systems.h
+++ b/include/base/systems.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef BASE_SYSTEMS_H
diff --git a/include/base/systhr.h b/include/base/systhr.h
index 714246df..12cae43c 100644
--- a/include/base/systhr.h
+++ b/include/base/systhr.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef BASE_SYSTHR_H
diff --git a/include/base/util.h b/include/base/util.h
index c33a7c39..dfd26038 100644
--- a/include/base/util.h
+++ b/include/base/util.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef BASE_UTIL_H
diff --git a/include/copyrght.h b/include/copyrght.h
index 4f8ec167..ffee130a 100644
--- a/include/copyrght.h
+++ b/include/copyrght.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/include/i18n.h b/include/i18n.h
index f6741c6a..00cd2bd4 100644
--- a/include/i18n.h
+++ b/include/i18n.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/include/ldaputil/cert.h b/include/ldaputil/cert.h
index 4dac8f05..bd544e8b 100644
--- a/include/ldaputil/cert.h
+++ b/include/ldaputil/cert.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _LDAPU_CERT_H
diff --git a/include/ldaputil/certmap.h b/include/ldaputil/certmap.h
index 921cbd06..a52eb45c 100644
--- a/include/ldaputil/certmap.h
+++ b/include/ldaputil/certmap.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _LDAPU_CERTMAP_H
diff --git a/include/ldaputil/dbconf.h b/include/ldaputil/dbconf.h
index 3556c36e..c3da4524 100644
--- a/include/ldaputil/dbconf.h
+++ b/include/ldaputil/dbconf.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _LDAPU_DBCONF_H
diff --git a/include/ldaputil/encode.h b/include/ldaputil/encode.h
index 6cc7729e..1b34dc45 100644
--- a/include/ldaputil/encode.h
+++ b/include/ldaputil/encode.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _LDAPU_ENCODE_H
diff --git a/include/ldaputil/errors.h b/include/ldaputil/errors.h
index de6f893d..0e6446d1 100644
--- a/include/ldaputil/errors.h
+++ b/include/ldaputil/errors.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _LDAPU_ERRORS_H
diff --git a/include/ldaputil/extcmap.h b/include/ldaputil/extcmap.h
index fde6a4b3..35683930 100644
--- a/include/ldaputil/extcmap.h
+++ b/include/ldaputil/extcmap.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _PUBLIC_CERTMAP_H
diff --git a/include/ldaputil/init.h b/include/ldaputil/init.h
index e983787b..0b499865 100644
--- a/include/ldaputil/init.h
+++ b/include/ldaputil/init.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _LDAPU_INIT_H
diff --git a/include/ldaputil/ldapauth.h b/include/ldaputil/ldapauth.h
index d4d96bfc..c92d99af 100644
--- a/include/ldaputil/ldapauth.h
+++ b/include/ldaputil/ldapauth.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/include/ldaputil/ldapdb.h b/include/ldaputil/ldapdb.h
index 13254a93..419e0c3d 100644
--- a/include/ldaputil/ldapdb.h
+++ b/include/ldaputil/ldapdb.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _LDAPU_LDAPDB_H
diff --git a/include/ldaputil/ldaputil.h b/include/ldaputil/ldaputil.h
index f0d87c22..111f2930 100644
--- a/include/ldaputil/ldaputil.h
+++ b/include/ldaputil/ldaputil.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _LDAPU_LDAPUTIL_H
diff --git a/include/libaccess/acl.h b/include/libaccess/acl.h
index 2429a426..a5aca8d2 100644
--- a/include/libaccess/acl.h
+++ b/include/libaccess/acl.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef ACL_HEADER
diff --git a/include/libaccess/acladmin.h b/include/libaccess/acladmin.h
index 9bd75623..7b17a028 100644
--- a/include/libaccess/acladmin.h
+++ b/include/libaccess/acladmin.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __acladmin_h
diff --git a/include/libaccess/aclbuild.h b/include/libaccess/aclbuild.h
index 319f5342..186ebae5 100644
--- a/include/libaccess/aclbuild.h
+++ b/include/libaccess/aclbuild.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __aclbuild_h
diff --git a/include/libaccess/aclerror.h b/include/libaccess/aclerror.h
index ffd5510b..bc32e3f4 100644
--- a/include/libaccess/aclerror.h
+++ b/include/libaccess/aclerror.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __aclerror_h
diff --git a/include/libaccess/acleval.h b/include/libaccess/acleval.h
index 7fbd077a..42562be8 100644
--- a/include/libaccess/acleval.h
+++ b/include/libaccess/acleval.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __acleval_h
diff --git a/include/libaccess/aclglobal.h b/include/libaccess/aclglobal.h
index 165a69ef..b8862028 100644
--- a/include/libaccess/aclglobal.h
+++ b/include/libaccess/aclglobal.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/include/libaccess/aclparse.h b/include/libaccess/aclparse.h
index 503657e1..0015e2a7 100644
--- a/include/libaccess/aclparse.h
+++ b/include/libaccess/aclparse.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __aclparse_h
diff --git a/include/libaccess/aclproto.h b/include/libaccess/aclproto.h
index 6dbc07d5..db90c7b6 100644
--- a/include/libaccess/aclproto.h
+++ b/include/libaccess/aclproto.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef ACL_PROTO_HEADER
diff --git a/include/libaccess/aclstruct.h b/include/libaccess/aclstruct.h
index 71320b0f..99819981 100644
--- a/include/libaccess/aclstruct.h
+++ b/include/libaccess/aclstruct.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __aclstruct_h
diff --git a/include/libaccess/attrec.h b/include/libaccess/attrec.h
index 267c32ff..38051c5c 100644
--- a/include/libaccess/attrec.h
+++ b/include/libaccess/attrec.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __attrec_h
diff --git a/include/libaccess/authdb.h b/include/libaccess/authdb.h
index 952f0d07..4533846c 100644
--- a/include/libaccess/authdb.h
+++ b/include/libaccess/authdb.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef AUTHDB_H
diff --git a/include/libaccess/ava.h b/include/libaccess/ava.h
index c8570b90..2ea662f4 100644
--- a/include/libaccess/ava.h
+++ b/include/libaccess/ava.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _ava_h
diff --git a/include/libaccess/avadb.h b/include/libaccess/avadb.h
index bbb6c904..fe89874a 100644
--- a/include/libaccess/avadb.h
+++ b/include/libaccess/avadb.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _avadb_h_
diff --git a/include/libaccess/avapfile.h b/include/libaccess/avapfile.h
index 4b60117c..fabfe75f 100644
--- a/include/libaccess/avapfile.h
+++ b/include/libaccess/avapfile.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef _avaparsedfiles_h_
diff --git a/include/libaccess/dbtlibaccess.h b/include/libaccess/dbtlibaccess.h
index f1eb420f..4ff2addd 100644
--- a/include/libaccess/dbtlibaccess.h
+++ b/include/libaccess/dbtlibaccess.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/include/libaccess/dnfstruct.h b/include/libaccess/dnfstruct.h
index d1ab28a3..1ca53b86 100644
--- a/include/libaccess/dnfstruct.h
+++ b/include/libaccess/dnfstruct.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __dnfstruct_h
diff --git a/include/libaccess/ipfstruct.h b/include/libaccess/ipfstruct.h
index acb0349e..a36b3dc6 100644
--- a/include/libaccess/ipfstruct.h
+++ b/include/libaccess/ipfstruct.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __ipfstruct_h
diff --git a/include/libaccess/las.h b/include/libaccess/las.h
index c678486f..2a86647e 100644
--- a/include/libaccess/las.h
+++ b/include/libaccess/las.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/include/libaccess/ldapacl.h b/include/libaccess/ldapacl.h
index 94a00333..2d62c9fa 100644
--- a/include/libaccess/ldapacl.h
+++ b/include/libaccess/ldapacl.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/include/libaccess/nsadb.h b/include/libaccess/nsadb.h
index 07fb2ca2..59aec77a 100644
--- a/include/libaccess/nsadb.h
+++ b/include/libaccess/nsadb.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nsadb_h
diff --git a/include/libaccess/nsamgmt.h b/include/libaccess/nsamgmt.h
index c6b82ca4..ccfd5ab5 100644
--- a/include/libaccess/nsamgmt.h
+++ b/include/libaccess/nsamgmt.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nsamgmt_h
diff --git a/include/libaccess/nsauth.h b/include/libaccess/nsauth.h
index 8f5ce877..555b4b4d 100644
--- a/include/libaccess/nsauth.h
+++ b/include/libaccess/nsauth.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nsauth_h
diff --git a/include/libaccess/nsautherr.h b/include/libaccess/nsautherr.h
index 02951b9f..f73ab881 100644
--- a/include/libaccess/nsautherr.h
+++ b/include/libaccess/nsautherr.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nsautherr_h
diff --git a/include/libaccess/nscert.h b/include/libaccess/nscert.h
index b704bbdf..64e52169 100644
--- a/include/libaccess/nscert.h
+++ b/include/libaccess/nscert.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nscert_h
diff --git a/include/libaccess/nsdb.h b/include/libaccess/nsdb.h
index c5b39e1c..c6b442b3 100644
--- a/include/libaccess/nsdb.h
+++ b/include/libaccess/nsdb.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nsdb_h
diff --git a/include/libaccess/nsdberr.h b/include/libaccess/nsdberr.h
index 224bd483..8017b2eb 100644
--- a/include/libaccess/nsdberr.h
+++ b/include/libaccess/nsdberr.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nsdberr_h
diff --git a/include/libaccess/nsdbmgmt.h b/include/libaccess/nsdbmgmt.h
index 2977e6a2..a5dc5ac1 100644
--- a/include/libaccess/nsdbmgmt.h
+++ b/include/libaccess/nsdbmgmt.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nsdbmgmt_h
diff --git a/include/libaccess/nserror.h b/include/libaccess/nserror.h
index 2a28c4f9..76f2550c 100644
--- a/include/libaccess/nserror.h
+++ b/include/libaccess/nserror.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nserror_h
diff --git a/include/libaccess/nsgmgmt.h b/include/libaccess/nsgmgmt.h
index 8fc59e12..6ce92865 100644
--- a/include/libaccess/nsgmgmt.h
+++ b/include/libaccess/nsgmgmt.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nsgmgmt_h
diff --git a/include/libaccess/nsgroup.h b/include/libaccess/nsgroup.h
index 8f4bf56a..8350a8fc 100644
--- a/include/libaccess/nsgroup.h
+++ b/include/libaccess/nsgroup.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nsgroup_h
diff --git a/include/libaccess/nslock.h b/include/libaccess/nslock.h
index af205863..097ecb98 100644
--- a/include/libaccess/nslock.h
+++ b/include/libaccess/nslock.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nslock_h
diff --git a/include/libaccess/nsumgmt.h b/include/libaccess/nsumgmt.h
index 6d295a85..0367aade 100644
--- a/include/libaccess/nsumgmt.h
+++ b/include/libaccess/nsumgmt.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nsumgmt_h
diff --git a/include/libaccess/nsuser.h b/include/libaccess/nsuser.h
index fbc51ba3..2fec7d31 100644
--- a/include/libaccess/nsuser.h
+++ b/include/libaccess/nsuser.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __nsuser_h
diff --git a/include/libaccess/register.h b/include/libaccess/register.h
index 9b5837e4..051be9ae 100644
--- a/include/libaccess/register.h
+++ b/include/libaccess/register.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/include/libaccess/stubs.h b/include/libaccess/stubs.h
index 8efa0923..9aea601c 100644
--- a/include/libaccess/stubs.h
+++ b/include/libaccess/stubs.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 **/
 typedef	void	PropList_t;
diff --git a/include/libaccess/symbols.h b/include/libaccess/symbols.h
index c711f351..c9862073 100644
--- a/include/libaccess/symbols.h
+++ b/include/libaccess/symbols.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __symbols_h
diff --git a/include/libaccess/userauth.h b/include/libaccess/userauth.h
index 84bf4d8a..5316fa87 100644
--- a/include/libaccess/userauth.h
+++ b/include/libaccess/userauth.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef USERAUTH_H
diff --git a/include/libaccess/usi.h b/include/libaccess/usi.h
index 7cbe7371..076b6b87 100644
--- a/include/libaccess/usi.h
+++ b/include/libaccess/usi.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef __usi_h
diff --git a/include/libaccess/usrcache.h b/include/libaccess/usrcache.h
index 646d1fd9..589c2822 100644
--- a/include/libaccess/usrcache.h
+++ b/include/libaccess/usrcache.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/include/libadmin/dbtlibadmin.h b/include/libadmin/dbtlibadmin.h
index aa828d71..360a41d7 100644
--- a/include/libadmin/dbtlibadmin.h
+++ b/include/libadmin/dbtlibadmin.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/include/libadmin/libadmin.h b/include/libadmin/libadmin.h
index c2facb88..7bd02d90 100644
--- a/include/libadmin/libadmin.h
+++ b/include/libadmin/libadmin.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/include/netsite.h b/include/netsite.h
index 278b1d14..716d737a 100644
--- a/include/netsite.h
+++ b/include/netsite.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef NETSITE_H
diff --git a/include/nt/messages.h b/include/nt/messages.h
index d47a9fa5..cd1765e6 100644
--- a/include/nt/messages.h
+++ b/include/nt/messages.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/include/nt/ntos.h b/include/nt/ntos.h
index dce0efa0..1a4ff3ff 100644
--- a/include/nt/ntos.h
+++ b/include/nt/ntos.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/include/nt/regparms.h b/include/nt/regparms.h
index e7bf75b3..3a416338 100644
--- a/include/nt/regparms.h
+++ b/include/nt/regparms.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/include/nt/resource.h b/include/nt/resource.h
index 905cbeb6..bfc755c7 100644
--- a/include/nt/resource.h
+++ b/include/nt/resource.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 //{{NO_DEPENDENCIES}}
diff --git a/include/public/Makefile b/include/public/Makefile
index 787fadfd..cf0c3611 100644
--- a/include/public/Makefile
+++ b/include/public/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/include/public/base/Makefile b/include/public/base/Makefile
index 940ffd8d..d92527a2 100644
--- a/include/public/base/Makefile
+++ b/include/public/base/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/include/public/base/crit.h b/include/public/base/crit.h
index bca8c839..aa641f9e 100644
--- a/include/public/base/crit.h
+++ b/include/public/base/crit.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_BASE_CRIT_H
diff --git a/include/public/base/ereport.h b/include/public/base/ereport.h
index 742d77ea..d866cd2c 100644
--- a/include/public/base/ereport.h
+++ b/include/public/base/ereport.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_BASE_EREPORT_H
diff --git a/include/public/base/file.h b/include/public/base/file.h
index 73312bd2..eea8c59e 100644
--- a/include/public/base/file.h
+++ b/include/public/base/file.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_BASE_FILE_H
diff --git a/include/public/base/pool.h b/include/public/base/pool.h
index 9480d7c6..6f9a6a67 100644
--- a/include/public/base/pool.h
+++ b/include/public/base/pool.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_BASE_POOL_H
diff --git a/include/public/base/shexp.h b/include/public/base/shexp.h
index dd7acf9b..c9ba7e35 100644
--- a/include/public/base/shexp.h
+++ b/include/public/base/shexp.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_BASE_SHEXP_H
diff --git a/include/public/base/systems.h b/include/public/base/systems.h
index 51be7bcd..2783aff0 100644
--- a/include/public/base/systems.h
+++ b/include/public/base/systems.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_BASE_SYSTEMS_H
diff --git a/include/public/base/systhr.h b/include/public/base/systhr.h
index d312c3b2..8a48c3fe 100644
--- a/include/public/base/systhr.h
+++ b/include/public/base/systhr.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_BASE_SYSTHR_H
diff --git a/include/public/base/util.h b/include/public/base/util.h
index 88897e5d..967a1ca8 100644
--- a/include/public/base/util.h
+++ b/include/public/base/util.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_BASE_UTIL_H
diff --git a/include/public/netsite.h b/include/public/netsite.h
index 4f745cc7..2a22ab61 100644
--- a/include/public/netsite.h
+++ b/include/public/netsite.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_NETSITE_H
diff --git a/include/public/nsacl/Makefile b/include/public/nsacl/Makefile
index 00e83fec..cf5e94e5 100644
--- a/include/public/nsacl/Makefile
+++ b/include/public/nsacl/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/include/public/nsacl/aclapi.h b/include/public/nsacl/aclapi.h
index 09068f8a..428ac9a7 100644
--- a/include/public/nsacl/aclapi.h
+++ b/include/public/nsacl/aclapi.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_NSACL_ACLAPI_H
diff --git a/include/public/nsacl/acldef.h b/include/public/nsacl/acldef.h
index c5eb1d09..cfcb3477 100644
--- a/include/public/nsacl/acldef.h
+++ b/include/public/nsacl/acldef.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_NSACL_ACLDEF_H
diff --git a/include/public/nsacl/copyrght.h b/include/public/nsacl/copyrght.h
index 4f8ec167..ffee130a 100644
--- a/include/public/nsacl/copyrght.h
+++ b/include/public/nsacl/copyrght.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/include/public/nsacl/nserrdef.h b/include/public/nsacl/nserrdef.h
index 81748227..610b3131 100644
--- a/include/public/nsacl/nserrdef.h
+++ b/include/public/nsacl/nserrdef.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_NSACL_NSERRDEF_H
diff --git a/include/public/nsacl/plistdef.h b/include/public/nsacl/plistdef.h
index f3e804ee..b0de8382 100644
--- a/include/public/nsacl/plistdef.h
+++ b/include/public/nsacl/plistdef.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_NSACL_PLISTDEF_H
diff --git a/include/public/nsapi.h b/include/public/nsapi.h
index ed3c536a..f3fd69d0 100644
--- a/include/public/nsapi.h
+++ b/include/public/nsapi.h
@@ -1,6 +1,6 @@
 /** BEGIN COPYRIGHT BLOCK
- * Copyright 2001 Sun Microsystems, Inc.
- * Portions copyright 1999, 2001-2003 Netscape Communications Corporation.
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
  * END COPYRIGHT BLOCK **/
 #ifndef PUBLIC_NSAPI_H
diff --git a/include/version.h b/include/version.h
index a42e3ed9..cdd8b4e9 100644
--- a/include/version.h
+++ b/include/version.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 **/
 /*