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

diff --git a/CHANGES b/CHANGES
index 751e3bffde854ef7e5dc2926af803574e6ee6f09..7e8253ec4869643e78e0e970a22a81cbc485d785 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 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.

diff --git a/STATUS b/STATUS
index 8ac951953383b0aa25001f92af0d772027f8b88d..fc3685a1683c6a94cc5e32185c19088ec39bbd5a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 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

diff --git a/modules/experimental/util_ldap.c b/modules/experimental/util_ldap.c
index 444c0ab2ed401bba8c79e61ab54771417b05d8c2..30c2ef12e318cab452e77ef6e6c818dae84c8657 100644 (file)
--- a/modules/experimental/util_ldap.c
+++ b/modules/experimental/util_ldap.c
@@ -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);
 }