#include Perl files before OpenLDAP files, and #undef _ (ITS#2513)

[openldap] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index 447503e187212153d938001672dfe450a55cab1c..fe386f433ba6a9af6531302e3bf03eb312a8f7bd 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,14 +1,16 @@
-Copyright 1998-2001 The OpenLDAP Foundation
+Copyright 1998-2003 The OpenLDAP Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted only as authorized by the OpenLDAP
 Public License.  A copy of this license is available at
-http://www.OpenLDAP.org/license.html or in file LICENSE in the
+http://www.OpenLDAP.org/license.html or in the file LICENSE in the
 top-level directory of the distribution.
 
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
 Individual files and/or contributed packages may be copyright by
-other parties and use subject to additional restrictions.
+other parties and subject to additional restrictions.
 
 This work is derived from the University of Michigan LDAP v3.3
 distribution.  Information concerning this software is available
@@ -16,11 +18,25 @@ at: http://www.umich.edu/~dirsvcs/ldap/
 
 This work also contains materials derived from public sources.
 
-Additional Information about OpenLDAP can be obtained at:
+Additional information about OpenLDAP can be obtained at:
     http://www.openldap.org/
 
-or by sending e-mail to:
-    info@OpenLDAP.org
+---
+
+Portions Copyright 1998-2003 Kurt D. Zeilenga.
+Portions Copyright 1998-2003 Net Boolean Incorporated.
+Portions Copyright 1999-2003 Howard Y.H. Chu.
+Portions Copyright 1999-2003 Symas Corporation.
+Portions Copyright 2001-2003 IBM Corporation.
+Portions Copyright 1998-2003 Hallvard B. Furuseth.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that this notice is preserved.
+The names of the copyright holders may not be used to endorse or
+promote products derived from this software without their specific
+prior written permission.  This software is provided ``as is''
+without express or implied warranty.
 
 ---
 
@@ -29,10 +45,8 @@ All rights reserved.
 
 Redistribution and use in source and binary forms are permitted
 provided that this notice is preserved and that due credit is given
-to the University of Michigan at Ann Arbor. The name of the University
-may not be used to endorse or promote products derived from this
-software without specific prior written permission. This software
-is provided ``as is'' without express or implied warranty.
+to the University of Michigan at Ann Arbor.  The name of the
+University may not be used to endorse or promote products derived
+from this software without specific prior written permission.  This
+software is provided ``as is'' without express or implied warranty.
 
----
-$OpenLDAP$