svn commit: r1150163 - /httpd/httpd/branches/revert-ap-ldap/LICENSE

[sf...@apache.org]

Author: sf
Date: Sat Jul 23 17:09:19 2011
New Revision: 1150163

URL: http://svn.apache.org/viewvc?rev=1150163&view=rev
Log:
Revert r1140075:

    Pick up the license notices from the LDAP code.


Modified:
    httpd/httpd/branches/revert-ap-ldap/LICENSE

Modified: httpd/httpd/branches/revert-ap-ldap/LICENSE
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/revert-ap-ldap/LICENSE?rev=1150163&r1=1150162&r2=1150163&view=diff
==============================================================================
--- httpd/httpd/branches/revert-ap-ldap/LICENSE (original)
+++ httpd/httpd/branches/revert-ap-ldap/LICENSE Sat Jul 23 17:09:19 2011
@@ -545,49 +545,3 @@ 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.
- */