You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ro...@apache.org on 2006/03/31 23:35:44 UTC
svn commit: r390506 - in /httpd/httpd/trunk/modules/aaa: mod_auth.h
mod_authz_core.c
Author: rooneg
Date: Fri Mar 31 13:35:44 2006
New Revision: 390506
URL: http://svn.apache.org/viewcvs?rev=390506&view=rev
Log:
Clean up some stuff found by Coverity.
* modules/aaa/mod_authz_core.c
(check_provider_list): Remove redundant code.
* modules/aaa/mod_auth.h
(AUTHZ_DEFAULT_PROVIDER): Remove redundant definition.
Submitted by: Max Bowsher <maxb apache.org>
Reviewed by: bnicholes, rooneg
Modified:
httpd/httpd/trunk/modules/aaa/mod_auth.h
httpd/httpd/trunk/modules/aaa/mod_authz_core.c
Modified: httpd/httpd/trunk/modules/aaa/mod_auth.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_auth.h?rev=390506&r1=390505&r2=390506&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_auth.h (original)
+++ httpd/httpd/trunk/modules/aaa/mod_auth.h Fri Mar 31 13:35:44 2006
@@ -38,7 +38,6 @@
#define AUTHN_PROVIDER_GROUP "authn"
#define AUTHZ_PROVIDER_GROUP "authz"
#define AUTHN_DEFAULT_PROVIDER "file"
-#define AUTHZ_DEFAULT_PROVIDER "default"
#define AUTHZ_GROUP_NOTE "authz_group_note"
#define AUTHN_PROVIDER_NAME_NOTE "authn_provider_name"
Modified: httpd/httpd/trunk/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/aaa/mod_authz_core.c?rev=390506&r1=390505&r2=390506&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_core.c Fri Mar 31 13:35:44 2006
@@ -482,27 +482,9 @@
const authz_provider *provider;
- /* For now, if a provider isn't set, we'll be nice and use the file
- * provider.
- */
- if (!current_provider) {
- provider = ap_lookup_provider(AUTHZ_PROVIDER_GROUP,
- AUTHZ_DEFAULT_PROVIDER, "0");
-
- if (!provider || !provider->check_authorization) {
- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "No default authz provider configured");
- auth_result = AUTHZ_GENERAL_ERROR;
- return auth_result;
- }
- apr_table_setn(r->notes, AUTHZ_PROVIDER_NAME_NOTE,
- AUTHZ_DEFAULT_PROVIDER);
- }
- else {
- provider = current_provider->provider;
- apr_table_setn(r->notes, AUTHZ_PROVIDER_NAME_NOTE,
- current_provider->provider_name);
- }
+ provider = current_provider->provider;
+ apr_table_setn(r->notes, AUTHZ_PROVIDER_NAME_NOTE,
+ current_provider->provider_name);
/* check to make sure that the request method requires
* authorization before calling the provider