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

[openldap] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index ea961e7c24214709f7920ca86855cf5280812b65..fe386f433ba6a9af6531302e3bf03eb312a8f7bd 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,9 +1,52 @@
-Copyright (c) 1992-1996 Regents of the University of Michigan.
+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 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 subject to additional restrictions.
+
+This work is derived from the University of Michigan LDAP v3.3
+distribution.  Information concerning this software is available
+at: http://www.umich.edu/~dirsvcs/ldap/
+
+This work also contains materials derived from public sources.
+
+Additional information about OpenLDAP can be obtained at:
+    http://www.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.
+
+---
+
+Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
 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.
+