diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-11-30 22:51:51 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-11-30 22:51:51 +0100 |
| commit | 7ecccc1570579528009a27eaebeb853f1f973f6e (patch) | |
| tree | 06ddc1d55de84bf955e12ae92dc4883ef6d8320c /modules/aaa | |
| parent | Clarify the peer IP of the connection and the client IP of the request within (diff) | |
| download | apache2-7ecccc1570579528009a27eaebeb853f1f973f6e.tar.xz apache2-7ecccc1570579528009a27eaebeb853f1f973f6e.zip | |
Remove some more now redundant log prefixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208816 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/aaa')
| -rw-r--r-- | modules/aaa/mod_auth_form.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c index 1a60e2a5a1..f1e449f4f0 100644 --- a/modules/aaa/mod_auth_form.c +++ b/modules/aaa/mod_auth_form.c @@ -35,7 +35,6 @@ #include "mod_session.h" #include "mod_request.h" -#define LOG_PREFIX "mod_auth_form: " #define FORM_LOGIN_HANDLER "form-login-handler" #define FORM_LOGOUT_HANDLER "form-logout-handler" #define FORM_REDIRECT_HANDLER "form-redirect-handler" @@ -743,7 +742,7 @@ static int check_authn(request_rec * r, const char *sent_user, const char *sent_ AUTHN_PROVIDER_VERSION); if (!provider || !provider->check_password) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, LOG_PREFIX + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "no authn provider configured"); auth_result = AUTH_GENERAL_ERROR; break; @@ -787,14 +786,14 @@ static int check_authn(request_rec * r, const char *sent_user, const char *sent_ switch (auth_result) { case AUTH_DENIED: - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, LOG_PREFIX + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "user '%s': authentication failure for \"%s\": " "password Mismatch", sent_user, r->uri); return_code = HTTP_UNAUTHORIZED; break; case AUTH_USER_NOT_FOUND: - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, LOG_PREFIX + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "user '%s' not found: %s", sent_user, r->uri); return_code = HTTP_UNAUTHORIZED; break; @@ -869,7 +868,7 @@ static int authenticate_form_authn(request_rec * r) */ if (PROXYREQ_PROXY == r->proxyreq) { ap_log_rerror(APLOG_MARK, APLOG_ERR, - 0, r, LOG_PREFIX "form auth cannot be used for proxy " + 0, r, "form auth cannot be used for proxy " "requests due to XSS risk, access denied: %s", r->uri); return HTTP_INTERNAL_SERVER_ERROR; } @@ -877,7 +876,7 @@ static int authenticate_form_authn(request_rec * r) /* We need an authentication realm. */ if (!ap_auth_name(r)) { ap_log_rerror(APLOG_MARK, APLOG_ERR, - 0, r, LOG_PREFIX "need AuthName: %s", r->uri); + 0, r, "need AuthName: %s", r->uri); return HTTP_INTERNAL_SERVER_ERROR; } @@ -1069,7 +1068,7 @@ static int authenticate_form_login_handler(request_rec * r) } if (r->method_number != M_POST) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, LOG_PREFIX + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "the " FORM_LOGIN_HANDLER " only supports the POST method for %s", r->uri); return HTTP_METHOD_NOT_ALLOWED; @@ -1171,7 +1170,7 @@ static int authenticate_form_redirect_handler(request_rec * r) if (r->kept_body && sent_method && sent_mimetype) { - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, LOG_PREFIX + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "internal redirect to method '%s' and body mimetype '%s' for the " "uri: %s", sent_method, sent_mimetype, r->uri); @@ -1180,7 +1179,7 @@ static int authenticate_form_redirect_handler(request_rec * r) } else { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, LOG_PREFIX + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "internal redirect requested but one or all of method, mimetype or " "body are NULL: %s", r->uri); return HTTP_INTERNAL_SERVER_ERROR; |