Updated copyright info

44 files changed, 176 insertions, 314 deletions

diff --git a/ldap/clients/dsgw/Makefile b/ldap/clients/dsgw/Makefile
index bcff7220..523ed9ae 100644
--- a/ldap/clients/dsgw/Makefile
+++ b/ldap/clients/dsgw/Makefile
@@ -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
 
 # Gmakefile for Directory Server Gateway
 #
diff --git a/ldap/clients/dsgw/Versiongw.c b/ldap/clients/dsgw/Versiongw.c
index 93c5c970..27aa9e7f 100644
--- a/ldap/clients/dsgw/Versiongw.c
+++ b/ldap/clients/dsgw/Versiongw.c
@@ -1,13 +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) 1996 Netscape Communications Corp.
- * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 
 #if defined( XP_WIN32 )
 #undef MCC_HTTPD
diff --git a/ldap/clients/dsgw/auth.c b/ldap/clients/dsgw/auth.c
index 88b2ba82..d8925cc5 100644
--- a/ldap/clients/dsgw/auth.c
+++ b/ldap/clients/dsgw/auth.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * auth.c -- CGI authentication form generator -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/cgiutil.c b/ldap/clients/dsgw/cgiutil.c
index a95fa441..c4cb3394 100644
--- a/ldap/clients/dsgw/cgiutil.c
+++ b/ldap/clients/dsgw/cgiutil.c
@@ -1,17 +1,13 @@
-/**
- * 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 ---  */
 /*
  * cgiutil.c -- CGI-related utility functions -- HTTP gateway
  *
  * Note: tihs code is derived from the extras/changepw.c code that ships
  *	with the FastTrack 2.0 server
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/ckdel.c b/ldap/clients/dsgw/ckdel.c
index d823da14..434322f3 100644
--- a/ldap/clients/dsgw/ckdel.c
+++ b/ldap/clients/dsgw/ckdel.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 <stdio.h>
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/ckdump.c b/ldap/clients/dsgw/ckdump.c
index a7dea8da..2c3993f8 100644
--- a/ldap/clients/dsgw/ckdump.c
+++ b/ldap/clients/dsgw/ckdump.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 <stdio.h>
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/ckget.c b/ldap/clients/dsgw/ckget.c
index b436712c..d6e412d8 100644
--- a/ldap/clients/dsgw/ckget.c
+++ b/ldap/clients/dsgw/ckget.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 <stdio.h>
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/ckpurge.c b/ldap/clients/dsgw/ckpurge.c
index b2192476..318cdc4d 100644
--- a/ldap/clients/dsgw/ckpurge.c
+++ b/ldap/clients/dsgw/ckpurge.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 <stdio.h>
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/ckput.c b/ldap/clients/dsgw/ckput.c
index 09782c7c..59d0eb10 100644
--- a/ldap/clients/dsgw/ckput.c
+++ b/ldap/clients/dsgw/ckput.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 <stdio.h>
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/collate.c b/ldap/clients/dsgw/collate.c
index 0e421a9b..fb34f6a7 100644
--- a/ldap/clients/dsgw/collate.c
+++ b/ldap/clients/dsgw/collate.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * collate.c -- routines to collate character strings
- *
- * Copyright (c) 1997 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include <stdio.h>
diff --git a/ldap/clients/dsgw/config.c b/ldap/clients/dsgw/config.c
index 07e84830..54b91801 100644
--- a/ldap/clients/dsgw/config.c
+++ b/ldap/clients/dsgw/config.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * config.c -- parse config file for directory server gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 
diff --git a/ldap/clients/dsgw/cookie.c b/ldap/clients/dsgw/cookie.c
index 5206a751..6fd066eb 100644
--- a/ldap/clients/dsgw/cookie.c
+++ b/ldap/clients/dsgw/cookie.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * cookie.c -- routines to generate and manipulate cookies for dsgw
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h" 
diff --git a/ldap/clients/dsgw/csearch.c b/ldap/clients/dsgw/csearch.c
index f4fe0c5b..a915055d 100644
--- a/ldap/clients/dsgw/csearch.c
+++ b/ldap/clients/dsgw/csearch.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * csearch.c -- CGI program to generate complex search form -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/dbtdsgw.h b/ldap/clients/dsgw/dbtdsgw.h
index 2812c26e..ffa59125 100644
--- a/ldap/clients/dsgw/dbtdsgw.h
+++ b/ldap/clients/dsgw/dbtdsgw.h
@@ -1,20 +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.
- */
-/**************************************************************************/
-/* CONFIDENTIAL AND PROPRIETARY SOURCE CODE                               */
-/* OF NETSCAPE COMMUNICATIONS CORPORATION                                 */
-/*                                                                        */
-/* Copyright © 1996,1997 Netscape Communications Corporation.  All Rights */
-/* Reserved.  Use of this Source Code is subject to the terms of the      */
-/* applicable license agreement from Netscape Communications Corporation. */
-/*                                                                        */
-/* The copyright notice(s) in this Source Code does not indicate actual   */
-/* or intended publication of this Source Code.                           */
-/**************************************************************************/
+  --- END COPYRIGHT BLOCK ---  */
 
 #define LIBRARY_NAME "dsgw"
 
diff --git a/ldap/clients/dsgw/dnedit.c b/ldap/clients/dsgw/dnedit.c
index 5ee761ef..8d066b5c 100644
--- a/ldap/clients/dsgw/dnedit.c
+++ b/ldap/clients/dsgw/dnedit.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 ---  */
 /* 
  * Generate a DN edit screen.
  */
diff --git a/ldap/clients/dsgw/doauth.c b/ldap/clients/dsgw/doauth.c
index 41d5f4f8..88ed8412 100644
--- a/ldap/clients/dsgw/doauth.c
+++ b/ldap/clients/dsgw/doauth.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * doauth.c -- CGI authentication handler -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 #include "dsgw.h"
 #include "dbtdsgw.h"
diff --git a/ldap/clients/dsgw/domodify.c b/ldap/clients/dsgw/domodify.c
index 5535311e..7dbb39d5 100644
--- a/ldap/clients/dsgw/domodify.c
+++ b/ldap/clients/dsgw/domodify.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * domodify.c -- LDAP modify CGI handler -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/dosearch.c b/ldap/clients/dsgw/dosearch.c
index 01afe6c9..f4b79774 100644
--- a/ldap/clients/dsgw/dosearch.c
+++ b/ldap/clients/dsgw/dosearch.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * dosearch.c -- CGI search handler -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/dsconfig.c b/ldap/clients/dsgw/dsconfig.c
index a2ba6858..4ade6e17 100644
--- a/ldap/clients/dsgw/dsconfig.c
+++ b/ldap/clients/dsgw/dsconfig.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * dsconfig.c -- CGI configuration update handler -- directory gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/dsexpldif.c b/ldap/clients/dsgw/dsexpldif.c
index 613f65c8..8ba95159 100644
--- a/ldap/clients/dsgw/dsexpldif.c
+++ b/ldap/clients/dsgw/dsexpldif.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * dsexpldif.c -- CGI configuration update handler -- directory gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/dsgw.h b/ldap/clients/dsgw/dsgw.h
index 224a2f6f..e0a06981 100644
--- a/ldap/clients/dsgw/dsgw.h
+++ b/ldap/clients/dsgw/dsgw.h
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * dsgw.h -- defines for HTTP gateway 
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #if !defined( DSGW_NO_SSL ) && !defined( NET_SSL )
diff --git a/ldap/clients/dsgw/dsgw_include.mk b/ldap/clients/dsgw/dsgw_include.mk
index 10bafd8a..cfba17f7 100644
--- a/ldap/clients/dsgw/dsgw_include.mk
+++ b/ldap/clients/dsgw/dsgw_include.mk
@@ -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
 
 # These are macro definitions for use by components of the dsgw
 DSGW_DEFAULT_LANG = en
diff --git a/ldap/clients/dsgw/dsgwutil.c b/ldap/clients/dsgw/dsgwutil.c
index 88bc4d9a..fae88a74 100644
--- a/ldap/clients/dsgw/dsgwutil.c
+++ b/ldap/clients/dsgw/dsgwutil.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * dsgwutil.c -- misc. utility functions -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include <limits.h> /* PATH_MAX */
diff --git a/ldap/clients/dsgw/dsimpldif.c b/ldap/clients/dsgw/dsimpldif.c
index 16550f87..b012d821 100644
--- a/ldap/clients/dsgw/dsimpldif.c
+++ b/ldap/clients/dsgw/dsimpldif.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * dsimpldif.c -- CGI import ldif file handler -- directory gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/edit.c b/ldap/clients/dsgw/edit.c
index c67af18f..a869501c 100644
--- a/ldap/clients/dsgw/edit.c
+++ b/ldap/clients/dsgw/edit.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * edit.c -- CGI editable entry display -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/emitauth.c b/ldap/clients/dsgw/emitauth.c
index e8b8c076..02757c12 100644
--- a/ldap/clients/dsgw/emitauth.c
+++ b/ldap/clients/dsgw/emitauth.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * emitauth.c -- generate authentication form -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/emitf.c b/ldap/clients/dsgw/emitf.c
index b4e6c709..67680096 100644
--- a/ldap/clients/dsgw/emitf.c
+++ b/ldap/clients/dsgw/emitf.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 <stdarg.h> /* va_list etc. */
 #include <stdio.h> /* sprintf */
 #include <stdlib.h> /* malloc, realloc, free */
diff --git a/ldap/clients/dsgw/entrydisplay.c b/ldap/clients/dsgw/entrydisplay.c
index f1f4cce7..2b94018a 100644
--- a/ldap/clients/dsgw/entrydisplay.c
+++ b/ldap/clients/dsgw/entrydisplay.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * entrydisplay.c --  output entries one at a time or in a list -- HTTP gateway 
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/error.c b/ldap/clients/dsgw/error.c
index 572702b4..c1320251 100644
--- a/ldap/clients/dsgw/error.c
+++ b/ldap/clients/dsgw/error.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * error.c -- error handling functions -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/genscreen.c b/ldap/clients/dsgw/genscreen.c
index ab2f89cd..08b0a5c4 100644
--- a/ldap/clients/dsgw/genscreen.c
+++ b/ldap/clients/dsgw/genscreen.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 ---  */
 /* 
  * Generate a screen.
  */
diff --git a/ldap/clients/dsgw/getopt.c b/ldap/clients/dsgw/getopt.c
index a66a3770..f6a18416 100644
--- a/ldap/clients/dsgw/getopt.c
+++ b/ldap/clients/dsgw/getopt.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 ---  */
 /*
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
diff --git a/ldap/clients/dsgw/htmlout.c b/ldap/clients/dsgw/htmlout.c
index 456a649a..5d82d834 100644
--- a/ldap/clients/dsgw/htmlout.c
+++ b/ldap/clients/dsgw/htmlout.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * htmlout.c -- routines to output HTML elements -- HTTP gateway 
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/htmlparse.c b/ldap/clients/dsgw/htmlparse.c
index cbb706af..7f9e778c 100644
--- a/ldap/clients/dsgw/htmlparse.c
+++ b/ldap/clients/dsgw/htmlparse.c
@@ -1,16 +1,12 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * htmlparse.c -- routines to parse HTML templates -- HTTP gateway.
  * Stolen from libadmin/template.c and libadmin/form_get.c, originally
  *	by Mike McCool.
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include <stdio.h>
diff --git a/ldap/clients/dsgw/lang.c b/ldap/clients/dsgw/lang.c
index 3771ead5..8e3cb932 100644
--- a/ldap/clients/dsgw/lang.c
+++ b/ldap/clients/dsgw/lang.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 ---  */
 /* 
  * Convert a document from ../html, or redirect the server to it.
  */
diff --git a/ldap/clients/dsgw/ldaputil.c b/ldap/clients/dsgw/ldaputil.c
index d574cd1f..919ebbf0 100644
--- a/ldap/clients/dsgw/ldaputil.c
+++ b/ldap/clients/dsgw/ldaputil.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * ldaputil.c -- LDAP utility functions -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/newentry.c b/ldap/clients/dsgw/newentry.c
index 67145195..23998e11 100644
--- a/ldap/clients/dsgw/newentry.c
+++ b/ldap/clients/dsgw/newentry.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * newentry.c -- CGI program to generate newentry form -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 #include "dsgw.h"
 #include "dbtdsgw.h"
diff --git a/ldap/clients/dsgw/search.c b/ldap/clients/dsgw/search.c
index 90b40fcc..0deed96d 100644
--- a/ldap/clients/dsgw/search.c
+++ b/ldap/clients/dsgw/search.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * search.c -- CGI program to generate smart search form -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/secglue.c b/ldap/clients/dsgw/secglue.c
index 3a317185..411e5f30 100644
--- a/ldap/clients/dsgw/secglue.c
+++ b/ldap/clients/dsgw/secglue.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 ---  */
 /*
  * secglue.c: Glue routines for the httpd.so shared object. These are 
  * necessary because on many system no garbage collection is performed for
diff --git a/ldap/clients/dsgw/sort.c b/ldap/clients/dsgw/sort.c
index f88a1282..0faf19d1 100644
--- a/ldap/clients/dsgw/sort.c
+++ b/ldap/clients/dsgw/sort.c
@@ -1,10 +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) 1998 Netscape Communications Corp.  All rights reserved. */
+  --- END COPYRIGHT BLOCK ---  */
 
 /* DON'T SHIP THIS PROGRAM.  It's terribly un-secure, as it
    enables an HTTP client to read the contents of any file.
diff --git a/ldap/clients/dsgw/templateindex.c b/ldap/clients/dsgw/templateindex.c
index 103b4fa1..4bf62f66 100644
--- a/ldap/clients/dsgw/templateindex.c
+++ b/ldap/clients/dsgw/templateindex.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * templateindex.c -- CGI template indexer -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/tutor.c b/ldap/clients/dsgw/tutor.c
index 682e0843..6c250fc1 100644
--- a/ldap/clients/dsgw/tutor.c
+++ b/ldap/clients/dsgw/tutor.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 ---  */
 /* 
  * tutor.c - Take a qs, and spit out the appropriate tutorial
  *
diff --git a/ldap/clients/dsgw/unauth.c b/ldap/clients/dsgw/unauth.c
index 3dec0bd7..669ac047 100644
--- a/ldap/clients/dsgw/unauth.c
+++ b/ldap/clients/dsgw/unauth.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * unauth.c -- CGI to discard cookies -- HTTP gateway
- *
- * Copyright (c) 1996 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"
diff --git a/ldap/clients/dsgw/utf8compare.c b/ldap/clients/dsgw/utf8compare.c
index 59c85253..0cfea736 100644
--- a/ldap/clients/dsgw/utf8compare.c
+++ b/ldap/clients/dsgw/utf8compare.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 <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/ldap/clients/dsgw/vcard.c b/ldap/clients/dsgw/vcard.c
index 89a6a801..db5d3ba4 100644
--- a/ldap/clients/dsgw/vcard.c
+++ b/ldap/clients/dsgw/vcard.c
@@ -1,14 +1,10 @@
-/**
- * PROPRIETARY/CONFIDENTIAL. Use of this product is subject to
- * license terms. Copyright © 2001 Sun Microsystems, Inc.
- * Some preexisting portions Copyright © 2001 Netscape Communications Corp.
+/** --- BEGIN COPYRIGHT BLOCK ---
+ * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+ * Copyright (C) 2005 Red Hat, Inc.
  * All rights reserved.
- */
+  --- END COPYRIGHT BLOCK ---  */
 /*
  * vcard.c -- vCard utility functions -- HTTP gateway
- *
- * Copyright (c) 1997 Netscape Communications Corp.
- * All rights reserved.
  */
 
 #include "dsgw.h"