X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=COPYRIGHT;h=db69cf2d0e7f9cb8ca584cdf1b04f8273ca7bf3e;hb=219779952a29f0e04bc1c13a3e7749f463e23cfb;hp=2f68ca5a694c0ba936f8ef8d3ae28cc4894ec684;hpb=2cd2afb6672770d7d1a71a9d04246a629bac4553;p=openldap

diff --git a/COPYRIGHT b/COPYRIGHT
index 2f68ca5a69..db69cf2d0e 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,22 +1,52 @@
-Copyright 1998 The OpenLDAP Foundation, Redwood City, California, USA
+Copyright 1998-2007 The OpenLDAP Foundation
 All rights reserved.
 
-Redistribution and use in source and binary forms 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 top-level directory of the distribution.
+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 in the file LICENSE in the
+top-level directory of the distribution or, alternatively, at
+<http://www.OpenLDAP.org/license.html>.
+
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+
+Individual files and/or contributed packages may be copyright by
+other parties and/or subject to additional restrictions.
 
 This work is derived from the University of Michigan LDAP v3.3
-distribution.  Information concerning is available at
-    http://www.umich.edu/~dirsvcs/ldap/ldap.html.
+distribution.  Information concerning this software is available
+at <http://www.umich.edu/~dirsvcs/ldap/ldap.html>.
 
 This work also contains materials derived from public sources.
 
-Additional Information about OpenLDAP can be obtained at:
-    http://www.openldap.org/
+Additional information about OpenLDAP can be obtained at
+<http://www.openldap.org/>.
+
+---
+
+Portions Copyright 1998-2006 Kurt D. Zeilenga.
+Portions Copyright 1998-2006 Net Boolean Incorporated.
+Portions Copyright 2001-2006 IBM Corporation.
+All rights reserved.
 
-or by sending e-mail to:
-    info@OpenLDAP.org
+Redistribution and use in source and binary forms, with or without
+modification, are permitted only as authorized by the OpenLDAP
+Public License.
+
+---
+
+Portions Copyright 1999-2005 Howard Y.H. Chu.
+Portions Copyright 1999-2005 Symas 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.
 
 ---
 
@@ -25,7 +55,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.
+