From: Graham Leggett <minfrin@apache.org>
Date: Sat, 22 May 2004 01:09:58 +0000 (+0000)
Subject: Throw an error message if an attempt is made to use the LDAPTrustedCA
X-Git-Tag: pre_ajp_proxy~238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89c8360df098fca846cba589d333f762335235b6;p=apache

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 13a77bbc19..0f5b150624 100644
--- 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 0c755c3f10..eec58e939b 100644
--- 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",