www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

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

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90464 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2001-08-21 06:08:04 +00:00
parent ac9c800d11
commit 3468587a6c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/ssl/mod_ssl.c
View File

@@ -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_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_child_init (ssl_init_Child, NULL,NULL, APR_HOOK_MIDDLE);
ap_hook_translate_name(ssl_hook_Translate, 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_fixups (ssl_hook_Fixup, NULL,NULL, APR_HOOK_MIDDLE);
ap_hook_access_checker(ssl_hook_Access, 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(); ssl_var_register();
} }

7
modules/ssl/ssl_engine_kernel.c
View File

@@ -1166,7 +1166,7 @@ int ssl_hook_Access(request_rec *r)
} }
/* /*
* Auth Handler: * Authentication Handler:
* Fake a Basic authentication from the X509 client certificate. * Fake a Basic authentication from the X509 client certificate.
* *
* This must be run fairly early on to prevent a real authentication from * 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 * authenticates a user. This means that the Module statement for this
* module should be LAST in the Configuration file. * 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); SSLSrvConfigRec *sc = mySrvConfig(r->server);
SSLDirConfigRec *dc = myDirConfig(r); SSLDirConfigRec *dc = myDirConfig(r);
@@ -1245,7 +1245,8 @@ int ssl_hook_Auth(request_rec *r)
return DECLINED; return DECLINED;
} }
int ssl_hook_UserCheck(request_rec *r) /* authorization phase */
int ssl_hook_Auth(request_rec *r)
{ {
SSLDirConfigRec *dc = myDirConfig(r); SSLDirConfigRec *dc = myDirConfig(r);