Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1140075 - /httpd/httpd/trunk/LICENSE
Date: Mon, 27 Jun 2011 09:31:22 -0000
To: cvs@httpd.apache.org
From: jorton@apache.org
Message-Id: <20110627093122.1AC2423889EC@eris.apache.org>

Author: jorton
Date: Mon Jun 27 09:31:21 2011
New Revision: 1140075

URL: http://svn.apache.org/viewvc?rev=1140075&view=rev
Log:
Pick up the license notices from the LDAP code.

Modified:
    httpd/httpd/trunk/LICENSE

Modified: httpd/httpd/trunk/LICENSE
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/LICENSE?rev=1140075&r1=1140074&r2=1140075&view=diff
==============================================================================
--- httpd/httpd/trunk/LICENSE (original)
+++ httpd/httpd/trunk/LICENSE Mon Jun 27 09:31:21 2011
@@ -545,3 +545,49 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF 
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ====================================================================
+
+For the LDAP components (modules/ldap):
+
+/*
+ * ap_ldap_init.c: LDAP v2/v3 common initialise
+ * 
+ * Original code from auth_ldap module for Apache v1.3:
+ * Copyright 1998, 1999 Enbridge Pipelines Inc. 
+ * Copyright 1999-2001 Dave Carrigan
+ */
+
+/* Portions Copyright 1998-2002 The OpenLDAP Foundation
+ * All rights reserved.
+ * 
+ * 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.
+ * 
+ * OpenLDAP is a registered trademark of the OpenLDAP Foundation.
+ * 
+ * Individual files and/or contributed packages may be copyright by
+ * other parties and subject to additional restrictions.
+ * 
+ * This work is derived from the University of Michigan LDAP v3.3
+ * distribution.  Information concerning this software is available
+ * at: http://www.umich.edu/~dirsvcs/ldap/
+ * 
+ * This work also contains materials derived from public sources.
+ * 
+ * Additional information about OpenLDAP can be obtained at:
+ *     http://www.openldap.org/
+ */
+
+/* 
+ * Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */