diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-07-23 19:09:19 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-07-23 19:09:19 +0200 |
| commit | 2c8c92a1922bc72f2ef32887549e4d775868f4e3 (patch) | |
| tree | 13bc512586aea738214c923d2c44ada91287dd5d /LICENSE | |
| parent | Revert r1141201: (diff) | |
| download | apache2-2c8c92a1922bc72f2ef32887549e4d775868f4e3.tar.xz apache2-2c8c92a1922bc72f2ef32887549e4d775868f4e3.zip | |
Revert r1140075:
Pick up the license notices from the LDAP code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@1150163 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 46 |
1 files changed, 0 insertions, 46 deletions
@@ -545,49 +545,3 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 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. - */ |