From f85e30e8fb8feeb0d25f9d095dd6bbed62fe31a1 Mon Sep 17 00:00:00 2001
From: rcritten <>
Date: Wed, 9 Aug 2006 20:32:47 +0000
Subject: Merge in http://svn.apache.org/viewvc?view=rev&revision=354394

* nss_engine_kernel.c (nss_hook_Access): Omit further access control
  checks if SSL is not in use regardless of vhost settings.
---
 nss_engine_kernel.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'nss_engine_kernel.c')

diff --git a/nss_engine_kernel.c b/nss_engine_kernel.c
index 6a73007..0e5b8ad 100644
--- a/nss_engine_kernel.c
+++ b/nss_engine_kernel.c
@@ -126,11 +126,14 @@ int nss_hook_Access(request_rec *r)
     }
 
     /*
-     * Check to see if SSL protocol is on
+     * Check to see if SSL protocol is enabled. If it's not then
+     * no further access control checks are relevant. The test for
+     * sc->enabled is probably strictly unnecessary
      */
-    if (!(sc->enabled || ssl)) {
+    if (!(sc->enabled || !ssl)) {
         return DECLINED;
     }
+
     /*
      * Support for per-directory reconfigured SSL connection parameters.
      * 
-- 
cgit