From: Paul Querna <pquerna@apache.org>
Date: Tue, 22 Mar 2005 21:35:02 +0000 (+0000)
Subject: Turn LDAPTrustedClientCert and LDAPTrustedMode into the RSRC_CONF context.  The curre... 
X-Git-Tag: 2.1.5~273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3982db6f2d5798ebb0dd679a35b579e2113942b2;p=thirdparty%2Fapache%2Fhttpd.git

Turn LDAPTrustedClientCert and LDAPTrustedMode into the RSRC_CONF context.  The current code is broken for use as OR_ALL.


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

diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 18fd26abd52..148e4e81dee 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -1914,7 +1914,7 @@ command_rec util_ldap_cmds[] = {
                   "  KEY_DER       - Client cert key file in DER format "
                   "  KEY_BASE64    - Client cert key file in Base64 format "),
 
-    AP_INIT_TAKE23("LDAPTrustedClientCert", util_ldap_set_trusted_client_cert, NULL, OR_ALL,
+    AP_INIT_TAKE23("LDAPTrustedClientCert", util_ldap_set_trusted_client_cert, NULL, RSRC_CONF,
                   "Specifies a file containing a client certificate or private "
                   "key, or the ID of the certificate to usethe type of the Certificate Authority file.  "
                  "The following types are supported:  "
@@ -1929,7 +1929,7 @@ command_rec util_ldap_cmds[] = {
                  "  KEY_DER       - Client cert key file in DER format "
                  "  KEY_BASE64    - Client cert key file in Base64 format "),
 
-    AP_INIT_TAKE1("LDAPTrustedMode", util_ldap_set_trusted_mode, NULL, OR_ALL,
+    AP_INIT_TAKE1("LDAPTrustedMode", util_ldap_set_trusted_mode, NULL, RSRC_CONF,
                   "Specifies the type of security that should be applied to "
                   "an LDAP connection. The types supported are: "
                   "   NONE - no encryption enabled "