From: Chris Darroch <chrisd@apache.org>
Date: Wed, 9 Apr 2008 17:25:33 +0000 (+0000)
Subject: Let each consumer of authn providers redefine the list_provider_names
X-Git-Tag: 2.3.0~737
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e69b9c41b53f4a405802b2b81a065e261a28a06;p=apache

Let each consumer of authn providers redefine the list_provider_names
callback in case they are loaded individually without mod_authn_core.


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

diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c
index 628e7a2dd4..2bd3b96b5f 100644
--- a/modules/aaa/mod_auth_basic.c
+++ b/modules/aaa/mod_auth_basic.c
@@ -284,8 +284,15 @@ static int authenticate_basic_user(request_rec *r)
     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);
 }
diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index ad2e0e9159..0ecb101eb3 100644
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -1961,12 +1961,18 @@ static int add_auth_info(request_rec *r)
     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);
     ap_hook_post_read_request(parse_hdr_and_update_nc, parsePre, NULL, APR_HOOK_MIDDLE);