Warning fixes

[openldap] / LICENSE

diff --git a/LICENSE b/LICENSE
index ca4afcf2fb14bc24810a99edb1f9d7c24bd2aa0a..05ad7571e448b9d83ead5d4691274d9484574714 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,38 +1,31 @@
 The OpenLDAP Public License
 The OpenLDAP Public License

-  Version 2.5, 11 May 2001
+  Version 2.8, 17 August 2003

 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided
 that the following conditions are met:
 
 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided
 that the following conditions are met:
 

-1. Redistributions of source code must retain copyright statements
-and notices.
+1. Redistributions in source form must retain copyright statements
+   and notices,

 
 2. Redistributions in binary form must reproduce applicable copyright
 
 2. Redistributions in binary form must reproduce applicable copyright

-statements and notices, this list of conditions, and the following
-disclaimer in the documentation and/or other materials provided
-with the distribution.
+   statements and notices, this list of conditions, and the following
+   disclaimer in the documentation and/or other materials provided
+   with the distribution, and

 
 3. Redistributions must contain a verbatim copy of this document.
 
 
 3. Redistributions must contain a verbatim copy of this document.
 

-4. The names and trademarks of the authors and copyright holders
-must not be used in advertising or otherwise to promote the sale,
-use or other dealing in this Software without specific, written
-prior permission.
-
-5. Due credit should be given to the authors of the Software.
-
-6. The OpenLDAP Foundation may revise this license from time to
-time.  Each revision is distinguished by a version number.  You
-may use the Software under terms of this license revision or under
-the terms of any subsequent revision of the license.
-
-THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S) OR
-OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+The OpenLDAP Foundation may revise this license from time to time.
+Each revision is distinguished by a version number.  You may use
+this Software under terms of this license revision or under the
+terms of any subsequent revision of the license.
+
+THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS
+CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT
+SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S)
+OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,

 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER


@@ -41,8 +34,14 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 

-OpenLDAP is a trademark of the OpenLDAP Foundation.
+The names of the authors and copyright holders must not be used in
+advertising or otherwise to promote the sale, use or other dealing
+in this Software without specific, written prior permission.  Title
+to copyright in this Software shall at all times remain with copyright
+holders.
+
+OpenLDAP is a registered trademark of the OpenLDAP Foundation.

 
 

-Copyright 1999-2001 The OpenLDAP Foundation, Redwood City,
+Copyright 1999-2003 The OpenLDAP Foundation, Redwood City,

 California, USA.  All Rights Reserved.  Permission to copy and
 California, USA.  All Rights Reserved.  Permission to copy and

-distributed verbatim copies of this document is granted.
+distribute verbatim copies of this document is granted.