summaryrefslogtreecommitdiffstats
path: root/ldap/servers
diff options
context:
space:
mode:
authorNathan Kinder <nkinder@redhat.com>2005-03-22 18:46:00 +0000
committerNathan Kinder <nkinder@redhat.com>2005-03-22 18:46:00 +0000
commitcb3035cb25bac8a4bd963da709075fc94bf1f474 (patch)
treea9e4d9bec2b92471aa469c2ae0d13b2929673312 /ldap/servers
parentf68a26b16c62b90ae1938e7b7afae6a2e0b6c2b3 (diff)
downloadds-cb3035cb25bac8a4bd963da709075fc94bf1f474.tar.gz
ds-cb3035cb25bac8a4bd963da709075fc94bf1f474.tar.xz
ds-cb3035cb25bac8a4bd963da709075fc94bf1f474.zip
Copyright updates
Diffstat (limited to 'ldap/servers')
-rw-r--r--ldap/servers/plugins/distrib/Makefile8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.AIX8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.BSDI8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.HPUX8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.HPUX648
-rw-r--r--ldap/servers/plugins/distrib/Makefile.IRIX8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.Linux8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.OSF18
-rw-r--r--ldap/servers/plugins/distrib/Makefile.ReliantUNIX8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.SOLARIS8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.SOLARIS648
-rw-r--r--ldap/servers/plugins/distrib/Makefile.SOLARISx868
-rw-r--r--ldap/servers/plugins/distrib/Makefile.UnixWare8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.UnixWareUDK8
-rw-r--r--ldap/servers/plugins/distrib/Makefile.WINNT6
-rw-r--r--ldap/servers/plugins/distrib/README13
-rw-r--r--ldap/servers/plugins/distrib/distrib.c9
-rw-r--r--ldap/servers/plugins/distrib/dllmain.c19
-rw-r--r--ldap/servers/plugins/distrib/libdistrib.def9
-rw-r--r--ldap/servers/plugins/http/Makefile8
-rw-r--r--ldap/servers/plugins/http/dllmain.c10
-rw-r--r--ldap/servers/plugins/http/http.def10
-rw-r--r--ldap/servers/plugins/http/http_client.c9
-rw-r--r--ldap/servers/plugins/http/http_client.h9
-rw-r--r--ldap/servers/plugins/http/http_impl.c10
-rw-r--r--ldap/servers/plugins/http/http_impl.h10
-rw-r--r--ldap/servers/plugins/pam_passthru/config.ldif5
-rw-r--r--ldap/servers/plugins/presence/presence.ldif5
-rw-r--r--ldap/servers/slapd/http.h9
-rw-r--r--ldap/servers/slapd/test-plugins/Makefile.server8
-rwxr-xr-xldap/servers/slapd/test-plugins/installDse.pl6
-rw-r--r--ldap/servers/slapd/test-plugins/testdbinterop.c6
-rw-r--r--ldap/servers/snmp/ldap-agent.c5
-rw-r--r--ldap/servers/snmp/ldap-agent.h5
-rw-r--r--ldap/servers/snmp/main.c5
35 files changed, 157 insertions, 131 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
diff --git a/ldap/servers/plugins/http/Makefile b/ldap/servers/plugins/http/Makefile
index ba10ab35..9d3fe52d 100644
--- a/ldap/servers/plugins/http/Makefile
+++ b/ldap/servers/plugins/http/Makefile
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
LDAP_SRC = ../../..
BUILD_ROOT = ../../../..
diff --git a/ldap/servers/plugins/http/dllmain.c b/ldap/servers/plugins/http/dllmain.c
index ef1f637a..10dc7f82 100644
--- a/ldap/servers/plugins/http/dllmain.c
+++ b/ldap/servers/plugins/http/dllmain.c
@@ -1,9 +1,9 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
+
/*
* Microsoft Windows specifics for BACK-LDBM DLL
*/
diff --git a/ldap/servers/plugins/http/http.def b/ldap/servers/plugins/http/http.def
index ac2f3e05..c36568ee 100644
--- a/ldap/servers/plugins/http/http.def
+++ b/ldap/servers/plugins/http/http.def
@@ -1,9 +1,9 @@
-;-------------------------------------------------------------------------
-; PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-; license terms. Copyright 2001 Sun Microsystems, Inc.
-; Some preexisting portions Copyright 2001 Netscape Communications Corp.
+; --- BEGIN COPYRIGHT BLOCK ---
+; Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+; Copyright (C) 2005 Red Hat, Inc.
; All rights reserved.
-;-------------------------------------------------------------------------
+; --- END COPYRIGHT BLOCK ---
+
DESCRIPTION 'Netscape Directory Server Http Client'
EXPORTS
http_client_init @2
diff --git a/ldap/servers/plugins/http/http_client.c b/ldap/servers/plugins/http/http_client.c
index 3ed24f9b..73889ff8 100644
--- a/ldap/servers/plugins/http/http_client.c
+++ b/ldap/servers/plugins/http/http_client.c
@@ -1,9 +1,8 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
/**
* Simple Http Client API broker plugin
diff --git a/ldap/servers/plugins/http/http_client.h b/ldap/servers/plugins/http/http_client.h
index d849e18d..6851ff30 100644
--- a/ldap/servers/plugins/http/http_client.h
+++ b/ldap/servers/plugins/http/http_client.h
@@ -1,9 +1,8 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
#ifndef _HTTP_CLIENT_H_
#define _HTTP_CLIENT_H_
diff --git a/ldap/servers/plugins/http/http_impl.c b/ldap/servers/plugins/http/http_impl.c
index 8c216775..285d2f24 100644
--- a/ldap/servers/plugins/http/http_impl.c
+++ b/ldap/servers/plugins/http/http_impl.c
@@ -1,9 +1,9 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
+
/**
* Implementation of a Simple HTTP Client
*/
diff --git a/ldap/servers/plugins/http/http_impl.h b/ldap/servers/plugins/http/http_impl.h
index 0bca3ca2..a36730a9 100644
--- a/ldap/servers/plugins/http/http_impl.h
+++ b/ldap/servers/plugins/http/http_impl.h
@@ -1,9 +1,9 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
+
#ifndef HTTP_IMPL_H__
#define HTTP_IMPL_H__
diff --git a/ldap/servers/plugins/pam_passthru/config.ldif b/ldap/servers/plugins/pam_passthru/config.ldif
index 2dd9065c..05b04e80 100644
--- a/ldap/servers/plugins/pam_passthru/config.ldif
+++ b/ldap/servers/plugins/pam_passthru/config.ldif
@@ -1,3 +1,8 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
dn: cn=PAM Pass Through Auth,cn=plugins,cn=config
objectclass: top
objectclass: nsSlapdPlugin
diff --git a/ldap/servers/plugins/presence/presence.ldif b/ldap/servers/plugins/presence/presence.ldif
index 67bb977b..e704a42d 100644
--- a/ldap/servers/plugins/presence/presence.ldif
+++ b/ldap/servers/plugins/presence/presence.ldif
@@ -1,3 +1,8 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
dn:cn=ICQ Presence,cn=Presence,cn=plugins,cn=config
changeType:modify
replace:nsim-onvaluemapgraphic
diff --git a/ldap/servers/slapd/http.h b/ldap/servers/slapd/http.h
index 7c1654a5..5ced21ff 100644
--- a/ldap/servers/slapd/http.h
+++ b/ldap/servers/slapd/http.h
@@ -1,9 +1,8 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright 2001 Netscape Communications Corp.
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
* All rights reserved.
- */
+ * --- END COPYRIGHT BLOCK --- */
#ifndef _HTTP_H_
#define _HTTP_H_
diff --git a/ldap/servers/slapd/test-plugins/Makefile.server b/ldap/servers/slapd/test-plugins/Makefile.server
index dda856e5..f96f72f1 100644
--- a/ldap/servers/slapd/test-plugins/Makefile.server
+++ b/ldap/servers/slapd/test-plugins/Makefile.server
@@ -1,8 +1,8 @@
-#
-# PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
-# license terms. Copyright 2001 Sun Microsystems, Inc.
-# Some preexisting portions Copyright 2001 Netscape Communications Corp.
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
#
#
# GNU Makefile for Directory Server distribution plugin
diff --git a/ldap/servers/slapd/test-plugins/installDse.pl b/ldap/servers/slapd/test-plugins/installDse.pl
index 6b827ab4..e33d8a28 100755
--- a/ldap/servers/slapd/test-plugins/installDse.pl
+++ b/ldap/servers/slapd/test-plugins/installDse.pl
@@ -1,3 +1,9 @@
+# --- BEGIN COPYRIGHT BLOCK ---
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# --- END COPYRIGHT BLOCK ---
+#
# The script is used to load the config mapping tree node for the null suffix
# and to load the test sample plugin node into the Directory Server used to
# demonstrate the Data Interoperability feature for Verisign.
diff --git a/ldap/servers/slapd/test-plugins/testdbinterop.c b/ldap/servers/slapd/test-plugins/testdbinterop.c
index 7da3e72f..edde03ab 100644
--- a/ldap/servers/slapd/test-plugins/testdbinterop.c
+++ b/ldap/servers/slapd/test-plugins/testdbinterop.c
@@ -1,3 +1,9 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
#include <sys/types.h>
#include <stdio.h>
#include "db.h"
diff --git a/ldap/servers/snmp/ldap-agent.c b/ldap/servers/snmp/ldap-agent.c
index efce4106..80b5dea1 100644
--- a/ldap/servers/snmp/ldap-agent.c
+++ b/ldap/servers/snmp/ldap-agent.c
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
#include <stdio.h>
#include <time.h>
#include <net-snmp/net-snmp-config.h>
diff --git a/ldap/servers/snmp/ldap-agent.h b/ldap/servers/snmp/ldap-agent.h
index 4ce3fcf3..eeb010c5 100644
--- a/ldap/servers/snmp/ldap-agent.h
+++ b/ldap/servers/snmp/ldap-agent.h
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
#ifndef DSOPSTABLE_H
#define DSOPSTABLE_H
diff --git a/ldap/servers/snmp/main.c b/ldap/servers/snmp/main.c
index a0900de3..87ff65d5 100644
--- a/ldap/servers/snmp/main.c
+++ b/ldap/servers/snmp/main.c
@@ -1,3 +1,8 @@
+/* --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2005 Red Hat, Inc.
+ * All rights reserved.
+ * --- END COPYRIGHT BLOCK --- */
+
#include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h>
#include <net-snmp/agent/net-snmp-agent-includes.h>