From dfd46c234e83219230978b44d27d3680d4f87015 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Wed, 11 Dec 2013 23:08:42 +0000 Subject: [PATCH] mod_auth_form: Make the trace logging consistent through the notes, session and form authentication steps. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1550307 13f79535-47bb-0310-9956-ffa450edef68 --- modules/aaa/mod_auth_form.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c index 0c3bb2b3a9..e72857a6a7 100644 --- a/modules/aaa/mod_auth_form.c +++ b/modules/aaa/mod_auth_form.c @@ -505,7 +505,7 @@ static void get_notes_auth(request_rec *r, r->user = (char *) *user; } - ap_log_rerror(APLOG_MARK, APLOG_TRACE6, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, "from notes: user: %s, pw: %s, method: %s, mimetype: %s", user ? *user : "", pw ? *pw : "", method ? *method : "", mimetype ? *mimetype : ""); @@ -566,7 +566,7 @@ static apr_status_t get_session_auth(request_rec * r, r->user = (char *) *user; } - ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r, + ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, "from session: " MOD_SESSION_USER ": %s, " MOD_SESSION_PW ": %s, " MOD_AUTH_FORM_HASH ": %s", user ? *user : "", pw ? *pw : "", @@ -668,6 +668,13 @@ static int get_form_auth(request_rec * r, } } + ap_log_rerror(APLOG_MARK, APLOG_TRACE1, 0, r, + "from form: user: %s, pw: %s, method: %s, mimetype: %s, location: %s", + sent_user ? *sent_user : "", sent_pw ? *sent_pw : "", + sent_method ? *sent_method : "", + sent_mimetype ? *sent_mimetype : "", + sent_loc ? *sent_loc : ""); + /* set the user, even though the user is unauthenticated at this point */ if (sent_user && *sent_user) { r->user = (char *) *sent_user; -- 2.40.0