Updated COPYRIGHT/LICENSE to be even less restrictive.

This commit is contained in:
Kurt Zeilenga 2001-09-05 02:42:18 +00:00
parent 1b42a20565
commit 3f59fb4e17
3 changed files with 29 additions and 26 deletions

View File

@ -5,7 +5,11 @@ 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
top-level directory of the distribution.
top-level directory of the distribution. The name of the OpenLDAP
Foundation may not be used to endorse or promote products derived
from this work.
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.

View File

@ -1,36 +1,31 @@
The OpenLDAP Public License
Version 2.6, 14 June 2001
Version DRAFT, 5 September 2001
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.
and notices,
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.
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.
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.
5. 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,
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
@ -39,8 +34,8 @@ 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.
OpenLDAP is a trademark of the OpenLDAP Foundation.
OpenLDAP is a registered trademark of the OpenLDAP Foundation.
Copyright 1999-2001 The OpenLDAP Foundation, Redwood City,
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.

View File

@ -16,9 +16,13 @@ H2: OpenLDAP Copyright Notice
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 {{URL:http://www.OpenLDAP.org/license.html}}
or in file {{F:LICENSE}} in the top-level directory of the distribution.
{{only as authorized}} by the OpenLDAP Public License. A copy of
this license is available at {{URL:http://www.OpenLDAP.org/license.html}}
or in file {{F:LICENSE}} in the top-level directory of the
distribution. The name of the OpenLDAP Foundation may not be used
to endorse or promote products derived from this work.
OpenLDAP is a trademark of the OpenLDAP Foundation.
Individual files and/or contributed packages may be copyright by
other parties and their use subject to additional restrictions.