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 STATUS
Date Fri, 21 May 2004 23:49:11 GMT
minfrin     2004/05/21 16:49:11

  Modified:    modules/experimental Tag: APACHE_2_0_BRANCH
                        util_ldap_cache.c
               .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
  Log:
  Fix a potential segfault if the bind password in the LDAP cache
  is NULL.
  PR:	26686
  Submitted by:	Jari Ahonen <jah@progress.com>
  Reviewed by:	jim, trawick, bnicholes, minfrin
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.6.2.7   +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.6.2.6
  retrieving revision 1.6.2.7
  diff -u -r1.6.2.6 -r1.6.2.7
  --- util_ldap_cache.c	11 Feb 2004 18:07:46 -0000	1.6.2.6
  +++ util_ldap_cache.c	21 May 2004 23:49:09 -0000	1.6.2.7
  @@ -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;
   
  
  
  
  No                   revision
  No                   revision
  1.988.2.280 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.279
  retrieving revision 1.988.2.280
  diff -u -r1.988.2.279 -r1.988.2.280
  --- CHANGES	21 May 2004 23:39:41 -0000	1.988.2.279
  +++ CHANGES	21 May 2004 23:49:09 -0000	1.988.2.280
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.50
   
  +  *) 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
  
  
  
  1.751.2.871 +1 -7      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.870
  retrieving revision 1.751.2.871
  diff -u -r1.751.2.870 -r1.751.2.871
  --- STATUS	21 May 2004 23:39:41 -0000	1.751.2.870
  +++ STATUS	21 May 2004 23:49:10 -0000	1.751.2.871
  @@ -79,12 +79,6 @@
          PR 24922 [Pascal Terjan <pterjan@linuxfr.org>]
          +1: minfrin
   
  -    *) Fix a potential segfault if the bind password in the LDAP cache
  -       is NULL.
  -       modules/experimental/util_ldap_cache.c r1.16
  -       PR 26686 [Jari Ahonen <jah@progress.com>]
  -       +1: jim, trawick, bnicholes
  -
       *) Fix handling of IPv6 numeric strings in mod_proxy.
            modules/proxy/proxy_ftp.c r1.141, r1.142
            modules/proxy/proxy_http.c r1.186
  
  
  

Mime
View raw message