Copyright updates

19 files changed, 80 insertions, 88 deletions

diff --git a/ldap/servers/plugins/distrib/Makefile b/ldap/servers/plugins/distrib/Makefile
index 3f26ca76..ab92eba0 100644
--- a/ldap/servers/plugins/distrib/Makefile
+++ b/ldap/servers/plugins/distrib/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 #
 # GNU Makefile for Directory Server distribution plugin
diff --git a/ldap/servers/plugins/distrib/Makefile.AIX b/ldap/servers/plugins/distrib/Makefile.AIX
index d155626d..b783a1b8 100644
--- a/ldap/servers/plugins/distrib/Makefile.AIX
+++ b/ldap/servers/plugins/distrib/Makefile.AIX
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # AIX Makefile for Directory Server plug-in examples
 # NOTE: Make sure to set the DSLIB variable to the path 
diff --git a/ldap/servers/plugins/distrib/Makefile.BSDI b/ldap/servers/plugins/distrib/Makefile.BSDI
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.BSDI
+++ b/ldap/servers/plugins/distrib/Makefile.BSDI
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # SOLARIS Makefile for Directory Server plug-in examples
 #
diff --git a/ldap/servers/plugins/distrib/Makefile.HPUX b/ldap/servers/plugins/distrib/Makefile.HPUX
index 34c24521..56281e05 100644
--- a/ldap/servers/plugins/distrib/Makefile.HPUX
+++ b/ldap/servers/plugins/distrib/Makefile.HPUX
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # HPUX Makefile for Directory Server plug-in examples
 
diff --git a/ldap/servers/plugins/distrib/Makefile.HPUX64 b/ldap/servers/plugins/distrib/Makefile.HPUX64
index d6a09339..0ac16a50 100644
--- a/ldap/servers/plugins/distrib/Makefile.HPUX64
+++ b/ldap/servers/plugins/distrib/Makefile.HPUX64
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # HPUX Makefile for Directory Server plug-in examples
 
diff --git a/ldap/servers/plugins/distrib/Makefile.IRIX b/ldap/servers/plugins/distrib/Makefile.IRIX
index f2ffc0c7..f387b252 100644
--- a/ldap/servers/plugins/distrib/Makefile.IRIX
+++ b/ldap/servers/plugins/distrib/Makefile.IRIX
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # IRIX Makefile for Directory Server plug-in examples
 #
diff --git a/ldap/servers/plugins/distrib/Makefile.Linux b/ldap/servers/plugins/distrib/Makefile.Linux
index b5fe839f..6bf42527 100644
--- a/ldap/servers/plugins/distrib/Makefile.Linux
+++ b/ldap/servers/plugins/distrib/Makefile.Linux
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # SOLARIS Makefile for Directory Server plug-in examples
 #
diff --git a/ldap/servers/plugins/distrib/Makefile.OSF1 b/ldap/servers/plugins/distrib/Makefile.OSF1
index 2c2c4660..459b8a6d 100644
--- a/ldap/servers/plugins/distrib/Makefile.OSF1
+++ b/ldap/servers/plugins/distrib/Makefile.OSF1
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # OSF1 Makefile for Directory Server plug-in examples
 
diff --git a/ldap/servers/plugins/distrib/Makefile.ReliantUNIX b/ldap/servers/plugins/distrib/Makefile.ReliantUNIX
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.ReliantUNIX
+++ b/ldap/servers/plugins/distrib/Makefile.ReliantUNIX
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # SOLARIS Makefile for Directory Server plug-in examples
 #
diff --git a/ldap/servers/plugins/distrib/Makefile.SOLARIS b/ldap/servers/plugins/distrib/Makefile.SOLARIS
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.SOLARIS
+++ b/ldap/servers/plugins/distrib/Makefile.SOLARIS
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # SOLARIS Makefile for Directory Server plug-in examples
 #
diff --git a/ldap/servers/plugins/distrib/Makefile.SOLARIS64 b/ldap/servers/plugins/distrib/Makefile.SOLARIS64
index 170d2b47..f7093b3c 100644
--- a/ldap/servers/plugins/distrib/Makefile.SOLARIS64
+++ b/ldap/servers/plugins/distrib/Makefile.SOLARIS64
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # SOLARIS Makefile for Directory Server plug-in examples
 #
diff --git a/ldap/servers/plugins/distrib/Makefile.SOLARISx86 b/ldap/servers/plugins/distrib/Makefile.SOLARISx86
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.SOLARISx86
+++ b/ldap/servers/plugins/distrib/Makefile.SOLARISx86
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # SOLARIS Makefile for Directory Server plug-in examples
 #
diff --git a/ldap/servers/plugins/distrib/Makefile.UnixWare b/ldap/servers/plugins/distrib/Makefile.UnixWare
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.UnixWare
+++ b/ldap/servers/plugins/distrib/Makefile.UnixWare
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # SOLARIS Makefile for Directory Server plug-in examples
 #
diff --git a/ldap/servers/plugins/distrib/Makefile.UnixWareUDK b/ldap/servers/plugins/distrib/Makefile.UnixWareUDK
index c8016c9e..58a69ab4 100644
--- a/ldap/servers/plugins/distrib/Makefile.UnixWareUDK
+++ b/ldap/servers/plugins/distrib/Makefile.UnixWareUDK
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
 # All rights reserved.
+# --- END COPYRIGHT BLOCK ---
 # 
 # SOLARIS Makefile for Directory Server plug-in examples
 #
diff --git a/ldap/servers/plugins/distrib/Makefile.WINNT b/ldap/servers/plugins/distrib/Makefile.WINNT
index ddb02e29..34279b19 100644
--- a/ldap/servers/plugins/distrib/Makefile.WINNT
+++ b/ldap/servers/plugins/distrib/Makefile.WINNT
@@ -1,3 +1,9 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+#
 # Makefile for Directory Server plug-in
 #
 
diff --git a/ldap/servers/plugins/distrib/README b/ldap/servers/plugins/distrib/README
index 516d33ce..14a7a2ca 100644
--- a/ldap/servers/plugins/distrib/README
+++ b/ldap/servers/plugins/distrib/README
@@ -1,3 +1,9 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
                    ----------------------------
                  Sample pluggable distribution logic
                      for Netscape Directory Server
@@ -14,10 +20,3 @@ distrib.c
 ----------
 This is an example of a distribution function that can be used 
 to distribute a flat namespace into several backends
-
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
- * All rights reserved.
- */
diff --git a/ldap/servers/plugins/distrib/distrib.c b/ldap/servers/plugins/distrib/distrib.c
index fd8ea5b6..8b40a06a 100644
--- a/ldap/servers/plugins/distrib/distrib.c
+++ b/ldap/servers/plugins/distrib/distrib.c
@@ -1,9 +1,8 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
 #include <ctype.h>
 #include <string.h>
 #include "slapi-plugin.h"
diff --git a/ldap/servers/plugins/distrib/dllmain.c b/ldap/servers/plugins/distrib/dllmain.c
index bce5eed7..5f6517ef 100644
--- a/ldap/servers/plugins/distrib/dllmain.c
+++ b/ldap/servers/plugins/distrib/dllmain.c
@@ -1,19 +1,8 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
-/*
- * Copyright (C) 2000 Sun Microsystems Inc.
- *
- * Use of this Source Code is subject to the terms of the applicable license
- * agreement from Sun Microsystems Inc. 
- *
- * The copyright notice(s) in this Source Code does not indicate actual or
- * intended publication of this Source Code. 
- */
- 
+ * --- END COPYRIGHT BLOCK --- */ 
  /*
  * Microsoft Windows specifics 
  */
diff --git a/ldap/servers/plugins/distrib/libdistrib.def b/ldap/servers/plugins/distrib/libdistrib.def
index 9c36e66d..2ee3c79e 100644
--- a/ldap/servers/plugins/distrib/libdistrib.def
+++ b/ldap/servers/plugins/distrib/libdistrib.def
@@ -1,9 +1,8 @@
-;-------------------------------------------------------------------------
-; PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-; license terms. Copyright 2001 Sun Microsystems, Inc.
-; Some preexisting portions Copyright 2001 Netscape Communications Corp.
+; --- BEGIN COPYRIGHT BLOCK ---
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
 ; All rights reserved.
-;-------------------------------------------------------------------------
+; --- END COPYRIGHT BLOCK ---
 DESCRIPTION 	'Brandx Directory Server 7 distribution logic example'
 EXPORTS
 	alpha_distribution @1