From: Kurt Zeilenga Date: Sat, 22 Jul 2000 18:59:40 +0000 (+0000) Subject: Copyright/License updates X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2375 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9bf1190a20bae790de3ca9b8d43221b69e534d86;p=openldap Copyright/License updates --- diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT index e11bb1fbb7..53856a21bc 100644 --- a/doc/guide/COPYRIGHT +++ b/doc/guide/COPYRIGHT @@ -3,7 +3,7 @@ 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 or +license is available at http://www.OpenLDAP.org/license.html or in file LICENSE in the top-level directory of the distribution. Individual files and/or contributed packages may be copyright by @@ -11,7 +11,7 @@ other parties and use subject to additional restrictions. This work is derived from the University of Michigan LDAP v3.3 distribution. Information concerning this software is available -at . +at: http://www.umich.edu/~dirsvcs/ldap/ This work also contains materials derived from public sources. diff --git a/doc/guide/admin/abstract.sdf b/doc/guide/admin/abstract.sdf index 2e5ebd6215..e25e91ba8e 100644 --- a/doc/guide/admin/abstract.sdf +++ b/doc/guide/admin/abstract.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # # OpenLDAP Administrator's Guide: Abstract diff --git a/doc/guide/admin/config.sdf b/doc/guide/admin/config.sdf index fb8e81976e..6024c547a5 100644 --- a/doc/guide/admin/config.sdf +++ b/doc/guide/admin/config.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. H1: The Big Picture - Configuration Choices diff --git a/doc/guide/admin/dbtools.sdf b/doc/guide/admin/dbtools.sdf index f6cca4274c..f246477143 100644 --- a/doc/guide/admin/dbtools.sdf +++ b/doc/guide/admin/dbtools.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. H1: Database Creation and Maintenance Tools diff --git a/doc/guide/admin/guide.sdf b/doc/guide/admin/guide.sdf index f41056e9ad..2043a72b5a 100644 --- a/doc/guide/admin/guide.sdf +++ b/doc/guide/admin/guide.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # # guide.sdf diff --git a/doc/guide/admin/index.sdf b/doc/guide/admin/index.sdf index 739b0bec66..8e1d0c9e2d 100644 --- a/doc/guide/admin/index.sdf +++ b/doc/guide/admin/index.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # # index.sdf diff --git a/doc/guide/admin/install.sdf b/doc/guide/admin/install.sdf index 2cedb3c1b5..0728e36fc8 100644 --- a/doc/guide/admin/install.sdf +++ b/doc/guide/admin/install.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. H1: Building and Installing slapd & slurpd diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf index 6b8d47981c..9851cb0575 100644 --- a/doc/guide/admin/intro.sdf +++ b/doc/guide/admin/intro.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. H1: Introduction to slapd and slurpd diff --git a/doc/guide/admin/master.sdf b/doc/guide/admin/master.sdf index 1ce1d053f9..5a89d81653 100644 --- a/doc/guide/admin/master.sdf +++ b/doc/guide/admin/master.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # # master file for the OpenLDAP Administrator's Guide diff --git a/doc/guide/admin/monitoringslapd.sdf b/doc/guide/admin/monitoringslapd.sdf index 601903de58..31e95e5a51 100644 --- a/doc/guide/admin/monitoringslapd.sdf +++ b/doc/guide/admin/monitoringslapd.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. H1: Monitoring Slapd diff --git a/doc/guide/admin/preface.sdf b/doc/guide/admin/preface.sdf index 0a0e78309d..68bc53795b 100644 --- a/doc/guide/admin/preface.sdf +++ b/doc/guide/admin/preface.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # @@ -9,7 +9,7 @@ P1: Preface # document's copyright P2[notoc] Copyright -Copyright 1998-1999, The OpenLDAP Foundation, All Rights Reserved. +Copyright 1998-2000, The OpenLDAP Foundation, All Rights Reserved. Copyright 1992-1996, University of Michigan, All Rights Reserved. diff --git a/doc/guide/admin/quickstart.sdf b/doc/guide/admin/quickstart.sdf index 45be7ff0a1..bac0729fea 100644 --- a/doc/guide/admin/quickstart.sdf +++ b/doc/guide/admin/quickstart.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. H1: A Quick-Start Guide to Running slapd diff --git a/doc/guide/admin/referrals.sdf b/doc/guide/admin/referrals.sdf index 50c7b117bb..9a5b3ff93a 100644 --- a/doc/guide/admin/referrals.sdf +++ b/doc/guide/admin/referrals.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. H1: Distributing {{I: slapd}} DATA diff --git a/doc/guide/admin/replication.sdf b/doc/guide/admin/replication.sdf index 0ee7729bc3..63fd00a949 100644 --- a/doc/guide/admin/replication.sdf +++ b/doc/guide/admin/replication.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. H1: Replication with slurpd diff --git a/doc/guide/admin/runningslapd.sdf b/doc/guide/admin/runningslapd.sdf index 43fc05b833..a1bbecbbdc 100644 --- a/doc/guide/admin/runningslapd.sdf +++ b/doc/guide/admin/runningslapd.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. H1: Running slapd diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf index 5f3e61be44..66efdd1895 100644 --- a/doc/guide/admin/slapdconfig.sdf +++ b/doc/guide/admin/slapdconfig.sdf @@ -1,6 +1,7 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. + H1: The {{I: slapd}} Configuration File Once the software has been built and installed, you are ready to configure it diff --git a/doc/guide/admin/title.sdf b/doc/guide/admin/title.sdf index e9aa7a345a..93e21fb2f5 100644 --- a/doc/guide/admin/title.sdf +++ b/doc/guide/admin/title.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # # Document: OpenLDAP Administrator's Guide diff --git a/doc/guide/admin/tuning.sdf b/doc/guide/admin/tuning.sdf index c66eeb4a81..afe821c990 100644 --- a/doc/guide/admin/tuning.sdf +++ b/doc/guide/admin/tuning.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. H1: Performance Tuning diff --git a/doc/guide/plain.sdf b/doc/guide/plain.sdf index c12874f6e2..8488c49c99 100644 --- a/doc/guide/plain.sdf +++ b/doc/guide/plain.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # template for plain documents @@ -12,7 +12,7 @@ !endmacro !macro HTML_FOOTER {{INLINE:______
}} -Copyright 1999, The OpenLDAP Foundation. {{EMAIL:info@openldap.org}} +Copyright 1999-2000, The OpenLDAP Foundation. {{EMAIL:info@openldap.org}} All Rights Reserved. {{INLINE:}} !endmacro diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf index d626a9fc56..1ecfca429a 100644 --- a/doc/guide/preamble.sdf +++ b/doc/guide/preamble.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # diff --git a/doc/guide/release/copyright-plain.sdf b/doc/guide/release/copyright-plain.sdf index af603bfdf9..7479aa92a6 100644 --- a/doc/guide/release/copyright-plain.sdf +++ b/doc/guide/release/copyright-plain.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf index c00e209f55..14c45be104 100644 --- a/doc/guide/release/copyright.sdf +++ b/doc/guide/release/copyright.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. !if OPT_PP_HTML @@ -12,19 +12,19 @@ H1: OpenLDAP Software Copyrights H2: OpenLDAP Copyright -[[copyright]] 1998-1999 The OpenLDAP Foundation, Redwood City, California, USA +[[copyright]] 1998-2000 The OpenLDAP Foundation, Redwood City, California, USA 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/}} -or in file LICENSE in the top-level directory of the distribution. +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/}} or in file +LICENSE in the top-level directory of the distribution. Individual files and/or contributed packages may be copyright by other parties and their use subject to additional restrictions. This work is derived from the University of Michigan LDAP v3.3 -distribution. Information concerning is available at +distribution. Information concerning is available at: .{{URL:http://www.umich.edu/~dirsvcs/ldap/ldap.html}}. This work also contains materials derived from public sources. diff --git a/doc/guide/release/install.sdf b/doc/guide/release/install.sdf index b41978d204..a0c199cfc3 100644 --- a/doc/guide/release/install.sdf +++ b/doc/guide/release/install.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. P1: Making and Installing the OpenLDAP Distribution diff --git a/doc/guide/release/license-plain.sdf b/doc/guide/release/license-plain.sdf index d8508862a3..58d46d87fe 100644 --- a/doc/guide/release/license-plain.sdf +++ b/doc/guide/release/license-plain.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. # diff --git a/doc/guide/release/license.sdf b/doc/guide/release/license.sdf index e1ebe7199b..f5bab5c30d 100644 --- a/doc/guide/release/license.sdf +++ b/doc/guide/release/license.sdf @@ -1,5 +1,5 @@ # $OpenLDAP$ -# Copyright 1999, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. !if OPT_PP_HTML @@ -9,150 +9,53 @@ !endif H1: The OpenLDAP Public License +.Version 2.2.1, 1 March 2000 + +Redistribution and use of this software and associated documentation +("Software"), with or without modification, are permitted provided +that the following conditions are met: + +^ Redistributions of source code must retain copyright statements +and notices. Redistributions must also contain a copy of this +document. + ++ Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the +distribution. + ++ The name "OpenLDAP" must not be used to endorse or promote +products derived from this Software without prior written permission +of the OpenLDAP Foundation. + ++ Products derived from this Software may not be called "OpenLDAP" +nor may "OpenLDAP" appear in their names without prior written +permission of the OpenLDAP Foundation. + ++ Due credit should be given to the OpenLDAP Project +({{URL:http://www.openldap.org/}}). + ++ 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 OR ITS CONTRIBUTORS 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 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT 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. + +Copyright 1999-2000 The OpenLDAP Foundation, Redwood City, +California, USA. All Rights Reserved. Permission to copy and +distributed verbatim copies of this document is granted. -.Version 1.5, 5 May 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 significant differences exist, -{{B: the complete license should be read}}. - -P2[notoc] 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. - -P2[notoc] Definitions - -. "Package" refers to the collection of files distributed by the -Copyright Holder, and derivatives of that collection of files -created through textual modification. - -. "Standard Version" refers to such a Package if it has not been -modified, or has been modified in accordance with the wishes -of the Copyright Holder. - -. "Copyright Holder" is whoever is named in the copyright or -copyrights for the Package. - -. "You" is you, if you're thinking about copying or distributing -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.) - -. "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. - -P2[notoc] Terms and Conditions - -^ 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. - -+ 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. - -+ 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. - -+ 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. - -.. 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. - -.. d) -make other distribution arrangements with the Copyright Holder. - -+ 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. - -+ 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. - -+ 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. - -+ 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. - -+ The name of the Copyright Holder may not be used to endorse or -promote products derived from this software without specific prior -written permission. - -+ 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. - -The End