mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-18 11:05:48 +08:00
Import doc changes from devel
This commit is contained in:
Kurt Zeilenga
parent
350544db03
commit
fcbb2b0f8a
2
CHANGES
2
CHANGES
@ -2,6 +2,8 @@ OpenLDAP Change Log
|
||||
|
||||
Changes included in OpenLDAP 1.1.x
|
||||
CVS Tag: OPENLDAP_REL_ENG_1_1
|
||||
Updated LICENSE to allow open use of linked software
|
||||
Updated docs
|
||||
Fixed slapd/ldbm/delete initialization bug (ITS#31)
|
||||
Fixed slapd/ldif2ldbm MAXARGS bug (ITS#34)
|
||||
Fixed slapd/delete bugs (ITS#39)
|
||||
|
||||
158
LICENSE
158
LICENSE
@ -1,22 +1,22 @@
|
||||
The OpenLDAP Public License
|
||||
|
||||
Version 1.2, 1 September 1998
|
||||
Copyright 1998, The OpenLDAP Foundation.
|
||||
Version 1.4, 18 January 1999
|
||||
Copyright 1998-1999, The OpenLDAP Foundation.
|
||||
All Rights Reserved.
|
||||
|
||||
Note:
|
||||
This license is derived from the "Artistic License" as distributed
|
||||
with the Perl Programming Language. As differences may exist, the
|
||||
complete license should be read.
|
||||
with the Perl Programming Language. As significant differences
|
||||
exist, the complete license should be read.
|
||||
|
||||
PREAMBLE
|
||||
|
||||
The intent of this document is to state the conditions under which a
|
||||
Package may be copied, such that the Copyright Holder maintains some
|
||||
semblance of artistic control over the development of the package,
|
||||
while giving the users of the package the right to use and distribute
|
||||
the Package in a more-or-less customary fashion, plus the right to make
|
||||
reasonable modifications.
|
||||
The intent of this document is to state the conditions under which
|
||||
a Package may be copied, such that the Copyright Holder maintains
|
||||
some semblance of artistic control over the development of the
|
||||
package, while giving the users of the package the right to use
|
||||
and distribute the Package in a more-or-less customary fashion,
|
||||
plus the right to make reasonable modifications.
|
||||
|
||||
Definitions:
|
||||
|
||||
@ -35,87 +35,105 @@ Definitions:
|
||||
this Package.
|
||||
|
||||
"Reasonable copying fee" is whatever you can justify on the
|
||||
basis of media cost, duplication charges, time of people involved,
|
||||
and so on. (You will not be required to justify it to the
|
||||
Copyright Holder, but only to the computing community at large
|
||||
as a market that must bear the fee.)
|
||||
basis of media cost, duplication charges, time of people
|
||||
involved, and so on. (You will not be required to justify it
|
||||
to the Copyright Holder, but only to the computing community
|
||||
at large as a market that must bear the fee.)
|
||||
|
||||
"Freely Available" means that no fee is charged for the item
|
||||
itself, though there may be fees involved in handling the item.
|
||||
It also means that recipients of the item may redistribute it
|
||||
under the same conditions they received it.
|
||||
|
||||
1. You may make and give away verbatim copies of the source form of the
|
||||
Standard Version of this Package without restriction, provided that you
|
||||
duplicate all of the original copyright notices and associated disclaimers.
|
||||
1. You may make and give away verbatim copies of the source form
|
||||
of the Standard Version of this Package without restriction, provided
|
||||
that you duplicate all of the original copyright notices and
|
||||
associated disclaimers.
|
||||
|
||||
2. You may apply bug fixes, portability fixes and other modifications
|
||||
derived from the Public Domain or from the Copyright Holder. A Package
|
||||
modified in such a way shall still be considered the Standard Version.
|
||||
derived from the Public Domain or from the Copyright Holder. A
|
||||
Package modified in such a way shall still be considered the Standard
|
||||
Version.
|
||||
|
||||
3. You may otherwise modify your copy of this Package in any way, provided
|
||||
that you insert a prominent notice in each changed file stating how and
|
||||
when you changed that file, and provided that you do at least ONE of the
|
||||
3. You may otherwise modify your copy of this Package in any way,
|
||||
provided that you insert a prominent notice in each changed file
|
||||
stating how and when you changed that file, and provided that you
|
||||
do at least ONE of the following:
|
||||
|
||||
a) place your modifications in the Public Domain or otherwise
|
||||
make them Freely Available, such as by posting said modifications
|
||||
to Usenet or an equivalent medium, or placing the modifications
|
||||
on a major archive site such as uunet.uu.net, or by allowing
|
||||
the Copyright Holder to include your modifications in the
|
||||
Standard Version of the Package.
|
||||
|
||||
b) use the modified Package only within your corporation or
|
||||
organization.
|
||||
|
||||
c) rename any non-standard executables so the names do not
|
||||
conflict with standard executables, which must also be provided,
|
||||
and provide a separate manual page for each non-standard
|
||||
executable that clearly documents how it differs from the
|
||||
Standard Version.
|
||||
|
||||
d) make other distribution arrangements with the Copyright
|
||||
Holder.
|
||||
|
||||
4. You may distribute the programs of this Package in object code
|
||||
or executable form, provided that you do at least ONE of the
|
||||
following:
|
||||
|
||||
a) place your modifications in the Public Domain or otherwise make them
|
||||
Freely Available, such as by posting said modifications to Usenet or
|
||||
an equivalent medium, or placing the modifications on a major archive
|
||||
site such as uunet.uu.net, or by allowing the Copyright Holder to include
|
||||
your modifications in the Standard Version of the Package.
|
||||
a) distribute a Standard Version of the executables and library
|
||||
files, together with instructions (in the manual page or
|
||||
equivalent) on where to get the Standard Version.
|
||||
|
||||
b) use the modified Package only within your corporation or organization.
|
||||
|
||||
c) rename any non-standard executables so the names do not conflict
|
||||
with standard executables, which must also be provided, and provide
|
||||
a separate manual page for each non-standard executable that clearly
|
||||
documents how it differs from the Standard Version.
|
||||
|
||||
d) make other distribution arrangements with the Copyright Holder.
|
||||
|
||||
4. You may distribute the programs of this Package in object code or
|
||||
executable form, provided that you do at least ONE of the following:
|
||||
|
||||
a) distribute a Standard Version of the executables and library files,
|
||||
together with instructions (in the manual page or equivalent) on where
|
||||
to get the Standard Version.
|
||||
|
||||
b) accompany the distribution with the machine-readable source of
|
||||
the Package with your modifications.
|
||||
b) accompany the distribution with the machine-readable source
|
||||
of the Package with your modifications.
|
||||
|
||||
c) accompany any non-standard executables with their corresponding
|
||||
Standard Version executables, giving the non-standard executables
|
||||
non-standard names, and clearly documenting the differences in manual
|
||||
pages (or equivalent), together with instructions on where to get
|
||||
the Standard Version.
|
||||
non-standard names, and clearly documenting the differences in
|
||||
manual pages (or equivalent), together with instructions on
|
||||
where to get the Standard Version.
|
||||
|
||||
d) make other distribution arrangements with the Copyright Holder.
|
||||
d) make other distribution arrangements with the Copyright
|
||||
Holder.
|
||||
|
||||
5. You may charge a reasonable copying fee for any distribution of this
|
||||
Package. You may charge any fee you choose for support of this Package.
|
||||
You may not charge a fee for this Package itself. However,
|
||||
you may distribute this Package in aggregate with other (possibly
|
||||
commercial) programs as part of a larger (possibly commercial) software
|
||||
distribution provided that you do not advertise this Package as a
|
||||
product of your own.
|
||||
5. You may charge a reasonable copying fee for any distribution of
|
||||
this Package. You may charge any fee you choose for support of
|
||||
this Package. You may not charge a fee for this Package itself.
|
||||
However, you may distribute this Package in aggregate with other
|
||||
(possibly commercial) programs as part of a larger (possibly
|
||||
commercial) software distribution provided that you do not advertise
|
||||
this Package as a product of your own.
|
||||
|
||||
6. The scripts and library files supplied as input to or produced as
|
||||
output from the programs of this Package do not automatically fall
|
||||
under the copyright of this Package, but belong to whomever generated
|
||||
them, and may be sold commercially, and may be aggregated with this
|
||||
Package.
|
||||
6. The scripts and library files supplied as input to or produced
|
||||
as output from the programs of this Package do not automatically
|
||||
fall under the copyright of this Package, but belong to whomever
|
||||
generated them, and may be sold commercially, and may be aggregated
|
||||
with this Package.
|
||||
|
||||
7. C subroutines supplied by you and linked into this Package in order
|
||||
to emulate subroutines and variables of the language defined by this
|
||||
Package shall not be considered part of this Package, but are the
|
||||
equivalent of input as in Paragraph 6, provided these subroutines do
|
||||
not change the language in any way that would cause it to fail the
|
||||
regression tests for the language.
|
||||
7. C subroutines supplied by you and linked into this Package in
|
||||
order to emulate subroutines and variables defined by this Package
|
||||
shall not be considered part of this Package, but are the equivalent
|
||||
of input as in Paragraph 6, provided these subroutines do not change
|
||||
the behavior of the Package in any way that would cause it to fail
|
||||
the regression tests for the Package.
|
||||
|
||||
8. The name of the Copyright Holder may not be used to endorse or promote
|
||||
products derived from this software without specific prior written permission.
|
||||
8. Software supplied by you and linked with this Package in order
|
||||
to use subroutines and variables defined by this Package shall not
|
||||
be considered part of this Package and do not automatically fall
|
||||
under the copyright of this Package. Executables produced
|
||||
by linking your software with this Package may be used and
|
||||
redistributed without restriction and may be sold commercially
|
||||
so long as the primary function of your software is different
|
||||
than the package itself.
|
||||
|
||||
9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
|
||||
9. The name of the Copyright Holder may not be used to endorse or
|
||||
promote products derived from this software without specific prior
|
||||
written permission.
|
||||
|
||||
10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
|
||||
IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user