From: Kurt Zeilenga Date: Tue, 15 Oct 2002 23:22:20 +0000 (+0000) Subject: Add copy of OPL 2.0.1 and note in files which specifically refer X-Git-Tag: NO_SLAP_OP_BLOCKS~883 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=75e1620ee4360f0784e3d0edb67e36ba880a7d18;p=openldap Add copy of OPL 2.0.1 and note in files which specifically refer to 2.0.1 as to the location to the copy. --- diff --git a/build/LICENSE-2.0.1 b/build/LICENSE-2.0.1 new file mode 100644 index 0000000000..db93ec5a7c --- /dev/null +++ b/build/LICENSE-2.0.1 @@ -0,0 +1,56 @@ +A number of files contained in OpenLDAP Software contain +a statement: + USE, MODIFICATION, AND REDISTRIBUTION OF THIS WORK IS SUBJECT + TO VERSION 2.0.1 OF THE OPENLDAP PUBLIC LICENSE, A COPY OF + WHICH IS AVAILABLE AT HTTP://WWW.OPENLDAP.ORG/LICENSE.HTML OR + IN THE FILE "LICENSE" IN THE TOP-LEVEL DIRECTORY OF THE + DISTRIBUTION. + +The following is a verbatim copy of version 2.0.1 of the OpenLDAP +Public License referenced in the above statement. + + +The OpenLDAP Public License + + Version 2.0.1, 21 December 1999 + Copyright 1999, The OpenLDAP Foundation, Redwood City, California, USA. + All Rights Reserved. + +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. Redistributions must also contain a +copy of this document. + +2. 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. + +3. The name "OpenLDAP" must not be used to endorse or promote +products derived from this Software without prior written +permission of the OpenLDAP Foundation. For written permission, +please contact foundation@openldap.org. + +4. 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. OpenLDAP is a trademark +of the OpenLDAP Foundation. + +5. Due credit should be given to the OpenLDAP Project +(http://www.openldap.org/). + +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. diff --git a/libraries/libldap/controls.c b/libraries/libldap/controls.c index 3d9f3a5ac5..6701defb9b 100644 --- a/libraries/libldap/controls.c +++ b/libraries/libldap/controls.c @@ -382,6 +382,10 @@ ldap_control_dup( const LDAPControl *c ) * Modification to OpenLDAP source by Novell, Inc. * June 2000 sfs Added control utilities */ +/* Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License + * can be found in the file "build/LICENSE-2.0.1" in this distribution + * of OpenLDAP Software. + */ /*--- ldap_create_control diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c index ed80127306..b1ed8dba4a 100644 --- a/libraries/libldap/request.c +++ b/libraries/libldap/request.c @@ -26,6 +26,10 @@ * April 2000 sfs Added code to chase V3 referrals * request.c - sending of ldap requests; handling of referrals */ +/* Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License + * can be found in the file "build/LICENSE-2.0.1" in this distribution + * of OpenLDAP Software. + */ #include "portable.h" diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c index 2f82aa9422..7ea3a474f4 100644 --- a/libraries/libldap/result.c +++ b/libraries/libldap/result.c @@ -27,6 +27,10 @@ * * result.c - wait for an ldap result */ +/* Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License + * can be found in the file "build/LICENSE-2.0.1" in this distribution + * of OpenLDAP Software. + */ /* * LDAPv3 (RFC2251) diff --git a/libraries/libldap/sortctrl.c b/libraries/libldap/sortctrl.c index f215a839d2..37bf38f2e9 100644 --- a/libraries/libldap/sortctrl.c +++ b/libraries/libldap/sortctrl.c @@ -16,6 +16,10 @@ * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. * *---*/ +/* Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License + * can be found in the file "build/LICENSE-2.0.1" in this distribution + * of OpenLDAP Software. + */ #include "portable.h" diff --git a/libraries/libldap/utf-8-conv.c b/libraries/libldap/utf-8-conv.c index 9b51bcd6f6..e5aeeeca36 100644 --- a/libraries/libldap/utf-8-conv.c +++ b/libraries/libldap/utf-8-conv.c @@ -17,6 +17,10 @@ * PUBLIC LICENSE, OR OTHER PRIOR WRITTEN CONSENT FROM NOVELL, COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. ******************************************************************************/ +/* Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License + * can be found in the file "build/LICENSE-2.0.1" in this distribution + * of OpenLDAP Software. + */ /* * UTF-8 Conversion Routines diff --git a/libraries/libldap/vlvctrl.c b/libraries/libldap/vlvctrl.c index 0ee5ed2ab4..64b5cfe5ab 100644 --- a/libraries/libldap/vlvctrl.c +++ b/libraries/libldap/vlvctrl.c @@ -15,6 +15,10 @@ * PUBLIC LICENSE, OR OTHER PRIOR WRITTEN CONSENT FROM NOVELL, COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. *---*/ +/* Note: A verbatim copy of version 2.0.1 of the OpenLDAP Public License + * can be found in the file "build/LICENSE-2.0.1" in this distribution + * of OpenLDAP Software. + */ #include "portable.h"