Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 32145 invoked from network); 9 Apr 2008 17:26:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Apr 2008 17:26:03 -0000 Received: (qmail 82798 invoked by uid 500); 9 Apr 2008 17:26:03 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 82730 invoked by uid 500); 9 Apr 2008 17:26:03 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 82719 invoked by uid 99); 9 Apr 2008 17:26:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Apr 2008 10:26:03 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Apr 2008 17:25:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AEFBE1A9832; Wed, 9 Apr 2008 10:25:35 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r646445 - in /httpd/httpd/trunk/modules/aaa: mod_auth_basic.c mod_auth_digest.c Date: Wed, 09 Apr 2008 17:25:34 -0000 To: cvs@httpd.apache.org From: chrisd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080409172535.AEFBE1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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);