stoddard 99/08/30 08:21:34
Modified: src ApacheCore.def src/modules/standard mod_auth_anon.c mod_digest.c Log: Add couple of hooks to the APacheCore.def file. Port mod_auth_anon and mod_digest to use the new hooks. Revision Changes Path 1.3 +2 -0 apache-2.0/src/ApacheCore.def Index: ApacheCore.def =================================================================== RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ApacheCore.def 1999/08/27 22:56:35 1.2 +++ ApacheCore.def 1999/08/30 15:21:29 1.3 @@ -363,3 +363,5 @@ ap_hook_sort_register @358 ap_hook_process_connection @359 ap_process_http_connection @360 + ap_hook_check_user_id @361 + ap_hook_auth_checker @362 1.3 +8 -15 apache-2.0/src/modules/standard/mod_auth_anon.c Index: mod_auth_anon.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_anon.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_auth_anon.c 1999/08/26 13:57:35 1.2 +++ mod_auth_anon.c 1999/08/30 15:21:32 1.3 @@ -288,27 +288,20 @@ #endif return DECLINED; } - +static void register_hooks(void) +{ + ap_hook_check_user_id(anon_authenticate_basic_user,NULL,NULL,HOOK_MIDDLE); + ap_hook_auth_checker(check_anon_access,NULL,NULL,HOOK_MIDDLE); +} module MODULE_VAR_EXPORT anon_auth_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ - create_anon_auth_dir_config, /* dir config creater */ + STANDARD20_MODULE_STUFF, + create_anon_auth_dir_config,/* dir config creater */ NULL, /* dir merger ensure strictness */ NULL, /* server config */ NULL, /* merge server config */ anon_auth_cmds, /* command table */ NULL, /* handlers */ - NULL, /* filename translation */ - anon_authenticate_basic_user, /* check_user_id */ - check_anon_access, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - NULL, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ - NULL /* post read-request */ + register_hooks /* register hooks */ }; 1.3 +7 -14 apache-2.0/src/modules/standard/mod_digest.c Index: mod_digest.c =================================================================== RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_digest.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_digest.c 1999/08/26 13:57:36 1.2 +++ mod_digest.c 1999/08/30 15:21:33 1.3 @@ -364,26 +364,19 @@ ap_note_digest_auth_failure(r); return AUTH_REQUIRED; } - +static void register_hooks(void) +{ + ap_hook_check_user_id(authenticate_digest_user,NULL,NULL,HOOK_MIDDLE); + ap_hook_auth_checker(digest_check_auth,NULL,NULL,HOOK_MIDDLE); +} module MODULE_VAR_EXPORT digest_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, create_digest_dir_config, /* dir config creater */ NULL, /* dir merger --- default is to override */ NULL, /* server config */ NULL, /* merge server config */ digest_cmds, /* command table */ NULL, /* handlers */ - NULL, /* filename translation */ - authenticate_digest_user, /* check_user_id */ - digest_check_auth, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - NULL, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ - NULL /* post read-request */ + register_hooks /* register hooks */ };