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 01:12:26 GMT
minfrin     2004/05/20 18:12:26

  Modified:    modules/experimental mod_auth_ldap.c
               .        CHANGES
  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
  
  Revision  Changes    Path
  1.25      +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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- mod_auth_ldap.c	20 May 2004 22:41:25 -0000	1.24
  +++ mod_auth_ldap.c	21 May 2004 01:12:25 -0000	1.25
  @@ -223,12 +223,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 */
  +#elif
           if (strchr("*()\\", *p) != NULL) {
               *q++ = '\\';
               if (q >= filtbuf_end) {
   	        break;
   	    }
           }
  +#endif
       }
       *q = '\0';
   
  
  
  
  1.1483    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1482
  retrieving revision 1.1483
  diff -u -r1.1482 -r1.1483
  --- CHANGES	20 May 2004 22:41:24 -0000	1.1482
  +++ CHANGES	21 May 2004 01:12:25 -0000	1.1483
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) 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,
  
  
  

Mime
View raw message