From: Doug MacEachern <dougm@apache.org>
Date: Tue, 21 Aug 2001 06:08:04 +0000 (+0000)
Subject: and swap Auth/UserCheck names to match the hook names, in hopes of preventing further... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d6b7ae77845b4e9ebaabfd38ec1c4c8d72caee1;p=thirdparty%2Fapache%2Fhttpd.git

and swap Auth/UserCheck names to match the hook names, in hopes of preventing further foncusion


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

diff --git a/mod_ssl.c b/mod_ssl.c
index ff6b5394997..97c2c4c1bda 100644
--- a/mod_ssl.c
+++ b/mod_ssl.c
@@ -465,10 +465,10 @@ static void ssl_register_hooks(apr_pool_t *p)
     ap_hook_pre_config    (ssl_hook_pre_config,    NULL,NULL, APR_HOOK_MIDDLE);
     ap_hook_child_init    (ssl_init_Child,         NULL,NULL, APR_HOOK_MIDDLE);
     ap_hook_translate_name(ssl_hook_Translate,     NULL,NULL, APR_HOOK_MIDDLE);
-    ap_hook_check_user_id (ssl_hook_Auth,          NULL,NULL, APR_HOOK_FIRST);
+    ap_hook_check_user_id (ssl_hook_UserCheck,     NULL,NULL, APR_HOOK_FIRST);
     ap_hook_fixups        (ssl_hook_Fixup,         NULL,NULL, APR_HOOK_MIDDLE);
     ap_hook_access_checker(ssl_hook_Access,        NULL,NULL, APR_HOOK_MIDDLE);
-    ap_hook_auth_checker  (ssl_hook_UserCheck,     NULL,NULL, APR_HOOK_MIDDLE);
+    ap_hook_auth_checker  (ssl_hook_Auth,          NULL,NULL, APR_HOOK_MIDDLE);
 
     ssl_var_register();
 }
diff --git a/ssl_engine_kernel.c b/ssl_engine_kernel.c
index 95bd472a95c..943a190a181 100644
--- a/ssl_engine_kernel.c
+++ b/ssl_engine_kernel.c
@@ -1166,7 +1166,7 @@ int ssl_hook_Access(request_rec *r)
 }
 
 /*
- *  Auth Handler:
+ *  Authentication Handler:
  *  Fake a Basic authentication from the X509 client certificate.
  *
  *  This must be run fairly early on to prevent a real authentication from
@@ -1174,7 +1174,7 @@ int ssl_hook_Access(request_rec *r)
  *  authenticates a user.  This means that the Module statement for this
  *  module should be LAST in the Configuration file.
  */
-int ssl_hook_Auth(request_rec *r)
+int ssl_hook_UserCheck(request_rec *r)
 {
     SSLSrvConfigRec *sc = mySrvConfig(r->server);
     SSLDirConfigRec *dc = myDirConfig(r);
@@ -1245,7 +1245,8 @@ int ssl_hook_Auth(request_rec *r)
     return DECLINED;
 }
 
-int ssl_hook_UserCheck(request_rec *r)
+/* authorization phase */
+int ssl_hook_Auth(request_rec *r)
 {
     SSLDirConfigRec *dc = myDirConfig(r);