return to releng

[openldap] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index 9e073bcef46929076cefd4a054ebdfa3454d697b..5550e3abe11f6d76e401ff57942166f1d1dca005 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,25 +1,52 @@
-Copyright 1998-2001 The OpenLDAP Foundation
+Copyright 1998-2005 The OpenLDAP Foundation

 All rights reserved.
 
 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
 
 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
 
 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/
+at <http://www.umich.edu/~dirsvcs/ldap/>.

 
 This work also contains materials derived from public sources.
 
 
 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-2004 Kurt D. Zeilenga.
+Portions Copyright 1998-2004 Net Boolean Incorporated.
+Portions Copyright 2001-2004 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-2003 Howard Y.H. Chu.
+Portions Copyright 1999-2003 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.

 
 ---
 
 
 ---
 


@@ -28,10 +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
 
 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$