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:20:49 GMT
minfrin     2004/05/21 16:20:49

  Modified:    modules/experimental Tag: APACHE_2_0_BRANCH mod_auth_ldap.c
               .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
  Log:
  The Microsoft LDAP SDK escapes filters for us, stop util_ldap
  from escaping filters twice when the backslash character is used.
  PR:	24437
  Submitted by:	Jess Holle <jessh@ptc.com>
  Reviewed by:	minfrin, jim, trawick, bnicholes
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.8.2.14  +4 -0      httpd-2.0/modules/experimental/mod_auth_ldap.c
  
  Index: mod_auth_ldap.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_auth_ldap.c,v
  retrieving revision 1.8.2.13
  retrieving revision 1.8.2.14
  diff -u -r1.8.2.13 -r1.8.2.14
  --- mod_auth_ldap.c	21 May 2004 22:42:56 -0000	1.8.2.13
  +++ mod_auth_ldap.c	21 May 2004 23:20:47 -0000	1.8.2.14
  @@ -224,12 +224,16 @@
       filtbuf_end = filtbuf + FILTER_LENGTH - 1;
       for (p = user, q=filtbuf + strlen(filtbuf);
            *p && q < filtbuf_end; *q++ = *p++) {
  +#if APR_HAS_MICROSOFT_LDAPSDK
  +        /* Note: The Microsoft SDK escapes for us, so is not necessary */
  +#else
           if (strchr("*()\\", *p) != NULL) {
               *q++ = '\\';
               if (q >= filtbuf_end) {
   	        break;
   	    }
           }
  +#endif
       }
       *q = '\0';
   
  
  
  
  No                   revision
  No                   revision
  1.988.2.278 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.277
  retrieving revision 1.988.2.278
  diff -u -r1.988.2.277 -r1.988.2.278
  --- CHANGES	21 May 2004 22:42:54 -0000	1.988.2.277
  +++ CHANGES	21 May 2004 23:20:47 -0000	1.988.2.278
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.50
   
  +  *) The Microsoft LDAP SDK escapes filters for us, stop util_ldap
  +     from escaping filters twice when the backslash character is used.
  +     PR 24437 [Jess Holle <jessh@ptc.com>]
  +
     *) Overhaul handling of LDAP error conditions, so that the util_ldap_*
        functions leave the connections in a sane state after errors have
        occurred. PR 27748, 17274, 17599, 18661, 21787, 24595, 24683, 27134,
  
  
  
  1.751.2.869 +1 -7      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.868
  retrieving revision 1.751.2.869
  diff -u -r1.751.2.868 -r1.751.2.869
  --- STATUS	21 May 2004 22:58:30 -0000	1.751.2.868
  +++ STATUS	21 May 2004 23:20:48 -0000	1.751.2.869
  @@ -95,12 +95,6 @@
          PR 19304
          +1: minfrin, jim, trawick, bnicholes
   
  -    *) The Microsoft LDAP SDK escapes filters for us, stop util_ldap
  -       from escaping filters twice when the backslash character is used.
  -       modules/experimental/mod_auth_ldap.c r1.25
  -       PR 24437 [Jess Holle <jessh@ptc.com>]
  -       +1: minfrin, 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