Commit c65b2ddb authored by Graham Leggett's avatar Graham Leggett
Browse files

The Microsoft LDAP SDK escapes filters for us, stop util_ldap 

from escaping filters twice when the backslash character is used.
PR:	24437
Obtained from:
Submitted by:	Jess Holle <jessh@ptc.com>
Reviewed by:	minfrin, jim, trawick, bnicholes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@103730 13f79535-47bb-0310-9956-ffa450edef68
parent 70fb6f21

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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,


































STATUS



+1
−7



























Changes for STATUS: 1 added line, 7 removed lines.



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/05/21 22:58:30 $]









Last modified at [$Date: 2004/05/21 23:20:48 $]



















Release:




















@@ -95,12 +95,6 @@ PATCHES TO BACKPORT FROM 2.1







       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


































modules/experimental/mod_auth_ldap.c



+4
−0



























Changes for modules/experimental/mod_auth_ldap.c: 4 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -224,12 +224,16 @@ void mod_auth_ldap_build_filter(char *filtbuf,







    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';