httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject cvs commit: httpd-2.0 CHANGES
Date Tue, 25 May 2004 16:18:24 GMT
minfrin     2004/05/25 09:18:24

  Modified:    modules/experimental Tag: APACHE_2_0_BRANCH util_ldap.c
               .        Tag: APACHE_2_0_BRANCH CHANGES
  Log:
  Throw an error message if an attempt is made to use the LDAPTrustedCA
  or LDAPTrustedCAType directives in a VirtualHost.
  PR:	26390
  Reviewed by:	minfrin, bnicholes, jim
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.6.2.16  +8 -0      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.2.15
  retrieving revision 1.6.2.16
  diff -u -r1.6.2.15 -r1.6.2.16
  --- util_ldap.c	21 May 2004 22:42:56 -0000	1.6.2.15
  +++ util_ldap.c	25 May 2004 16:18:22 -0000	1.6.2.16
  @@ -1070,6 +1070,10 @@
       util_ldap_state_t *st = 
           (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config, 
   						  &ldap_module);
  +    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
  +    if (err != NULL) {
  +        return err;
  +    }
   
       ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->server, 
                         "LDAP: SSL trusted certificate authority file - %s", 
  @@ -1086,6 +1090,10 @@
       util_ldap_state_t *st = 
       (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config, 
                                                 &ldap_module);
  +    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
  +    if (err != NULL) {
  +        return err;
  +    }
   
       ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->server, 
                         "LDAP: SSL trusted certificate authority file type - %s", 
  
  
  
  No                   revision
  No                   revision
  1.988.2.282 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.281
  retrieving revision 1.988.2.282
  diff -u -r1.988.2.281 -r1.988.2.282
  --- CHANGES	21 May 2004 23:53:08 -0000	1.988.2.281
  +++ CHANGES	25 May 2004 16:18:22 -0000	1.988.2.282
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.50
   
  +  *) Throw an error message if an attempt is made to use the LDAPTrustedCA
  +     or LDAPTrustedCAType directives in a VirtualHost. PR 26390
  +     [Brad Nicholes]
  +
     *) Fix a potential segfault if the bind password in the LDAP cache
        is NULL. PR 28250 [Jari Ahonen <jah@progress.com>]
   
  
  
  

Mime
View raw message