httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/experimental util_ldap.c
Date Tue, 03 Dec 2002 00:36:10 GMT
wrowe       2002/12/02 16:36:10

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               modules/experimental Tag: APACHE_2_0_BRANCH util_ldap.c
  Log:
    Backport the patch to permit Mozilla/Netscape LDAP to work for Apache.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.8 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.7
  retrieving revision 1.988.2.8
  diff -u -r1.988.2.7 -r1.988.2.8
  --- CHANGES	2 Dec 2002 23:53:37 -0000	1.988.2.7
  +++ CHANGES	3 Dec 2002 00:36:10 -0000	1.988.2.8
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.44
   
  +  *) Replace APU_HAS_LDAPSSL_CLIENT_INIT with APU_HAS_LDAP_NETSCAPE_SSL
  +     as set by apr-util in util_ldap.c. This should allow mod_ldap
  +     to work with the Netscape/Mozilla LDAP library. [Øyvin Sømme
  +     <somme@oslo.westerngeco.slb.com>, Graham Leggett]
  +
     *) Fix critical bug in new --enable-v4-mapped configure option
        implementation which broke IPv4 listening sockets on some
        systems.  [hiroyuki hanai <hanai@imgsrc.co.jp>]
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.1   +3 -3      httpd-2.0/modules/experimental/util_ldap.c
  
  Index: util_ldap.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap.c,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- util_ldap.c	9 Oct 2002 06:48:08 -0000	1.6
  +++ util_ldap.c	3 Dec 2002 00:36:10 -0000	1.6.2.1
  @@ -205,7 +205,7 @@
    * with the pool cleanup function - causing the LDAP connections to be
    * shut down cleanly on graceful restart.
    */
  -apr_status_t util_ldap_connection_destroy(void *param)
  +LDAP_DECLARE(apr_status_t) util_ldap_connection_destroy(void *param)
   {
       util_ldap_connection_t *ldc = param;
   
  @@ -1011,7 +1011,7 @@
       return NULL;
   }
   
  -#ifdef APU_HAS_LDAPSSL_CLIENT_INIT
  +#ifdef APU_HAS_LDAP_NETSCAPE_SSL
   static const char *util_ldap_set_certdbpath(cmd_parms *cmd, void *dummy, const char *path)
   {
       util_ldap_state_t *st = 
  @@ -1092,7 +1092,7 @@
                     "Sets the maximum time (in seconds) that an item is cached in the LDAP
"
                     "operation cache. Zero means no limit. Defaults to 600 seconds (10 minutes)."),
   
  -#ifdef APU_HAS_LDAPSSL_CLIENT_INIT
  +#ifdef APU_HAS_LDAP_NETSCAPE_SSL
       AP_INIT_TAKE1("LDAPCertDBPath", util_ldap_set_certdbpath, NULL, RSRC_CONF,
                     "Specifies the file containing Certificate Authority certificates "
                     "for validating secure LDAP server certificates. This file must be the
"
  
  
  

Mime
View raw message