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 Fri, 21 May 2004 15:02:45 GMT
minfrin     2004/05/21 08:02:44

  Modified:    modules/experimental util_ldap_cache.c
               .        CHANGES
  Log:
  Fix a potential segfault if the bind password in the LDAP cache
  is NULL.
  PR:	26686
  Submitted by:	Jari Ahonen <jah@progress.com>
  
  Revision  Changes    Path
  1.16      +9 -2      httpd-2.0/modules/experimental/util_ldap_cache.c
  
  Index: util_ldap_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/util_ldap_cache.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- util_ldap_cache.c	9 Feb 2004 20:29:18 -0000	1.15
  +++ util_ldap_cache.c	21 May 2004 15:02:43 -0000	1.16
  @@ -122,10 +122,17 @@
               newnode->vals = NULL;
           }
           if (!(newnode->username = util_ald_strdup(cache, node->username)) ||
  -            !(newnode->dn = util_ald_strdup(cache, node->dn)) ||
  -            !(newnode->bindpw = util_ald_strdup(cache, node->bindpw)) ) {
  +            !(newnode->dn = util_ald_strdup(cache, node->dn)) ) {
               util_ldap_search_node_free(cache, newnode);
               return NULL;
  +        }
  +        if(node->bindpw) {
  +            if(!(newnode->bindpw = util_ald_strdup(cache, node->bindpw))) {
  +                util_ldap_search_node_free(cache, newnode);
  +                return NULL;
  +            }
  +        } else {
  +            newnode->bindpw = NULL;
           }
           newnode->lastbind = node->lastbind;
   
  
  
  
  1.1485    +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1484
  retrieving revision 1.1485
  diff -u -r1.1484 -r1.1485
  --- CHANGES	21 May 2004 03:14:05 -0000	1.1484
  +++ CHANGES	21 May 2004 15:02:44 -0000	1.1485
  @@ -2,6 +2,9 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) Fix a potential segfault if the bind password in the LDAP cache
  +     is NULL. PR 26686 [Jari Ahonen <jah@progress.com>]
  +
     *) Quotes cannot be used around require group and require dn
        directives, update the documentation to reflect this. Also add
        quotes around the dn and group within debug messages, to make it
  
  
  

Mime
View raw message