[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 75/156: Merge in http://svn.apache.org/viewvc?view=rev&revision=354394

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository libapache2-mod-nss.

commit f85e30e8fb8feeb0d25f9d095dd6bbed62fe31a1
Author: rcritten <>
Date:   Wed Aug 9 20:32:47 2006 +0000

    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(-)

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.
      * 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git