cvs commit: apr-util/ldap Makefile.in apr_ldap_compat.c

[mi...@apache.org]

minfrin     01/08/18 02:48:05

  Added:       ldap     Makefile.in apr_ldap_compat.c
  Log:
  Second part of LDAP-to-apr-util patch: The compatibility functions
  
  Revision  Changes    Path
  1.1                  apr-util/ldap/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  
  top_builddir=@top_builddir@
  INCLUDES=-I$(top_builddir)/include -I$(top_builddir)/../apr/include
  
  TARGETS = apr_ldap_compat.lo
  
  # bring in rules.mk for standard functionality
  @INCLUDE_RULES@
  
  
  
  1.1                  apr-util/ldap/apr_ldap_compat.c
  
  Index: apr_ldap_compat.c
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 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 end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``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 APACHE SOFTWARE 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.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  /*
   * apr_ldap_compat.c: LDAP v2/v3 compatibility things
   * 
   * Original code from auth_ldap module for Apache v1.3:
   * Copyright 1998, 1999 Enbridge Pipelines Inc. 
   * Copyright 1999-2001 Dave Carrigan
   */
  
  #include <apr_ldap.h>
  
  #ifdef APU_HAS_LDAP
  
  
  /* 
   * Compatibility for LDAPv2 libraries. Differences between LDAPv2 and 
   * LDAPv3, as they affect this module
   * 
   *  LDAPv3 uses ldap_search_ext_s; LDAPv2 uses only basic ldap_search_s
   *
   *  LDAPv3 uses ldap_memfree; LDAPv2 just uses free().
   *
   * In this section, we just implement the LDAPv3 SDK functions that are 
   * missing in LDAPv2. 
   * 
   */
  #if LDAP_VERSION_MAX == 2
  
  /*
   * LDAPv2 doesn't support extended search. Since auth_ldap doesn't use
   * it anyway, we just translate the extended search into a normal search.
   */
  int
  ldap_search_ext_s(LDAP *ldap, char *base, int scope, char *filter,
  		  char **attrs, int attrsonly, void *servertrls, void *clientctrls,
  		  void *timeout, int sizelimit, LDAPMessage **res)
  {
    return ldap_search_s(ldap, base, scope, filter, attrs, attrsonly, res);
  }
  
  void
  ldap_memfree(void *p)
  {
    free(p);
  }
  
  #endif /* if LDAP_VERSION_MAX */
  
  #endif /* APU_HAS_LDAP */