Throw an error message if an attempt is made to use the LDAPTrustedCA

or LDAPTrustedCAType directives in a VirtualHost.
PR:	26390
Obtained from:
Submitted by:	Brad Nicholes
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103736 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 13a77bbc19584070cbaaa5a7913f929845052b3c..0f5b15062499680b5e1e2814be7fa96f97303c1c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Throw an error message if an attempt is made to use the LDAPTrustedCA
+     or LDAPTrustedCAType directives in a VirtualHost. PR 26390
+     [Brad Nicholes]
+
   *) Small fix to allow reverse proxying to an ftp server. Previously
      an attempt to do this would try and connect to 0.0.0.0, regardless
      of the server specified. PR 24922

diff --git a/modules/experimental/util_ldap.c b/modules/experimental/util_ldap.c
index 0c755c3f1078d63a2419af6f841bfec8cc9130b9..eec58e939b0b1c8102146576313e1abaf4186b40 100644 (file)
--- a/modules/experimental/util_ldap.c
+++ b/modules/experimental/util_ldap.c
@@ -1071,6 +1071,10 @@ static const char *util_ldap_set_cert_auth(cmd_parms *cmd, void *dummy, const ch
     util_ldap_state_t *st = 
         (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config, 
                                                  &ldap_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+    if (err != NULL) {
+        return err;
+    }
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->server, 
                       "LDAP: SSL trusted certificate authority file - %s", 
@@ -1087,6 +1091,10 @@ static const char *util_ldap_set_cert_type(cmd_parms *cmd, void *dummy, const ch
     util_ldap_state_t *st = 
     (util_ldap_state_t *)ap_get_module_config(cmd->server->module_config, 
                                               &ldap_module);
+    const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
+    if (err != NULL) {
+        return err;
+    }
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->server, 
                       "LDAP: SSL trusted certificate authority file type - %s",