Commit 63a3d968 authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Allow relative paths for LDAPTrustedCA to be resolved against ServerRoot PR#26602 

reviewed by: bnicholes, minfrin, trawick, jim


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.0.50









  *) util_ldap: allow relative paths for LDAPTrustedCA to be resolved









     against ServerRoot PR#26602 [Brad Nicholes]









       









  *) SECURITY: CAN-2004-0488 (cve.mitre.org)









     mod_ssl: Fix a buffer overflow in the FakeBasicAuth code for a









     (trusted) client certificate subject DN which exceeds 6K in length.


































STATUS



+1
−6



























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



Original line number
Diff line number
Diff line









APACHE 2.0 STATUS:                                              -*-text-*-









Last modified at [$Date: 2004/06/11 15:48:48 $]









Last modified at [$Date: 2004/06/11 16:15:42 $]



















Release:




















@@ -78,11 +78,6 @@ PATCHES TO BACKPORT FROM 2.1







         server/vhost.c r1.87









       +1: trawick, stoddard, jim



















    *) util_ldap: allow relative paths for LDAPTrustedCA to be resolved









       against ServerRoot PR#26602









       modules/experimental/util_ldap.c r1.31









       +1: bnicholes, minfrin, trawick, jim









       









    *) mod_ssl: Remove some unused functions (after CAN-2004-0488 fix is applied)









       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/ssl/ssl_util.c?r1=1.46&r2=1.47









       +1: jorton, nd


































modules/experimental/util_ldap.c



+1
−1



























Changes for modules/experimental/util_ldap.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -1079,7 +1079,7 @@ static const char *util_ldap_set_cert_auth(cmd_parms *cmd, void *dummy, const ch







                      "LDAP: SSL trusted certificate authority file - %s", 









                       file);



















    st->cert_auth_file = apr_pstrdup(cmd->pool, file);









    st->cert_auth_file = ap_server_root_relative(cmd->pool, file);



















    return(NULL);









}