Re: svn commit: r646445 - in /httpd/httpd/trunk/modules/aaa: mod_auth_basic.c mod_auth_digest.c

[Ruediger Pluem]

On 09.04.2008 19:25, [EMAIL PROTECTED] wrote:
Author: chrisd
Date: Wed Apr  9 10:25:33 2008
New Revision: 646445
URL: http://svn.apache.org/viewvc?rev=646445&view=rev
Log:
Let each consumer of authn providers redefine the list_provider_names
callback in case they are loaded individually without mod_authn_core.

Modified:
    httpd/httpd/trunk/modules/aaa/mod_auth_basic.c
    httpd/httpd/trunk/modules/aaa/mod_auth_digest.c

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_basic.c
URL: 
http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_basic.c?rev=646445&r1=646444&r2=646445&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_basic.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_basic.c Wed Apr  9 10:25:33 2008
@@ -284,8 +284,15 @@
     return OK;
 }
 
+static apr_array_header_t *authn_ap_list_provider_names(apr_pool_t *ptemp)
+{
+    return ap_list_provider_names(ptemp, AUTHN_PROVIDER_GROUP, "0");
+}
+
 static void register_hooks(apr_pool_t *p)
 {
+    APR_REGISTER_OPTIONAL_FN(authn_ap_list_provider_names);
+
     ap_hook_check_authn(authenticate_basic_user, NULL, NULL, APR_HOOK_MIDDLE,
                         AP_AUTH_INTERNAL_PER_CONF);
 }

Modified: httpd/httpd/trunk/modules/aaa/mod_auth_digest.c
URL: 
http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_auth_digest.c?rev=646445&r1=646444&r2=646445&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth_digest.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth_digest.c Wed Apr  9 10:25:33 2008
@@ -1961,11 +1961,17 @@
     return OK;
 }
 
+static apr_array_header_t *authn_ap_list_provider_names(apr_pool_t *ptemp)
+{
+    return ap_list_provider_names(ptemp, AUTHN_PROVIDER_GROUP, "0");
+}
 
 static void register_hooks(apr_pool_t *p)
 {
     static const char * const cfgPost[]={ "http_core.c", NULL };
     static const char * const parsePre[]={ "mod_proxy.c", NULL };
+
+    APR_REGISTER_OPTIONAL_FN(authn_ap_list_provider_names);
 
     ap_hook_post_config(initialize_module, NULL, cfgPost, APR_HOOK_MIDDLE);
     ap_hook_child_init(initialize_child, NULL, NULL, APR_HOOK_MIDDLE);

Lets hope that we never decide to change anything to 
authn_ap_list_provider_names. Otherwise I bet that we run into inconsistencies 
which might be hard to track and lead to funny bug reports.
So I feel -0.5 on this.

Regards

Rüdiger