diff options
| author | Jan Pazdziora <jpazdziora@redhat.com> | 2016-11-15 13:43:15 +0100 |
|---|---|---|
| committer | Jan Pazdziora <jpazdziora@redhat.com> | 2016-11-16 15:24:44 +0100 |
| commit | f5b67e4ced072c6438757de9a45c690c2cf4dd30 (patch) | |
| tree | 00ed13aeee2393f3b787786843e12464f72a03a5 | |
| parent | 405ff8c85de71735ef5fe7893b6efd1dd19f5508 (diff) | |
| download | mod_authnz_pam-f5b67e4ced072c6438757de9a45c690c2cf4dd30.tar.gz mod_authnz_pam-f5b67e4ced072c6438757de9a45c690c2cf4dd30.tar.xz mod_authnz_pam-f5b67e4ced072c6438757de9a45c690c2cf4dd30.zip | |
Put the name of the module to the start of the message on Apache 2.4.
Replacing
[Tue Nov 15 18:00:42.602043 2016] [:notice] [pid 27824] [client 10.11.12.13:40740] mod_authnz_pam: PAM authentication passed for user bob@EXAMPLE.COM
with
[Tue Nov 15 18:00:42.602043 2016] [authnz_pam:notice] [pid 27824] [client 10.11.12.13:40740] PAM authentication passed for user bob@EXAMPLE.COM
Suggested by: Phil Endecott
| -rw-r--r-- | mod_authnz_pam.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/mod_authnz_pam.c b/mod_authnz_pam.c index 24f56e0..57be02d 100644 --- a/mod_authnz_pam.c +++ b/mod_authnz_pam.c @@ -137,6 +137,12 @@ static const char * format_location(request_rec * r, const char * url, const cha module AP_MODULE_DECLARE_DATA authnz_pam_module; +#ifdef APLOG_USE_MODULE +#define SHOW_MODULE "" +#else +#define SHOW_MODULE "mod_authnz_pam: " +#endif + #define _REMOTE_USER_ENV_NAME "REMOTE_USER" #define _EXTERNAL_AUTH_ERROR_ENV_NAME "EXTERNAL_AUTH_ERROR" #define _PAM_STEP_AUTH 1 @@ -171,7 +177,7 @@ static authn_status pam_authenticate_with_login_password(request_rec * r, const authnz_pam_config_rec * conf = ap_get_module_config(r->per_dir_config, &authnz_pam_module); if (conf && conf->expired_redirect_url) { ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, - "mod_authnz_pam: PAM_NEW_AUTHTOK_REQD: redirect to [%s]", + SHOW_MODULE "PAM_NEW_AUTHTOK_REQD: redirect to [%s]", conf->expired_redirect_url); apr_table_addn(r->headers_out, "Location", format_location(r, conf->expired_redirect_url, login)); return HTTP_TEMPORARY_REDIRECT; @@ -181,14 +187,14 @@ static authn_status pam_authenticate_with_login_password(request_rec * r, const } if (ret != PAM_SUCCESS) { const char * strerr = pam_strerror(pamh, ret); - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "mod_authnz_pam: %s %s: %s", stage, param, strerr); + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, SHOW_MODULE "%s %s: %s", stage, param, strerr); apr_table_setn(r->subprocess_env, _EXTERNAL_AUTH_ERROR_ENV_NAME, apr_pstrdup(r->pool, strerr)); pam_end(pamh, ret); return AUTH_DENIED; } apr_table_setn(r->subprocess_env, _REMOTE_USER_ENV_NAME, login); r->user = apr_pstrdup(r->pool, login); - ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, "mod_authnz_pam: PAM authentication passed for user %s", login); + ap_log_rerror(APLOG_MARK, APLOG_NOTICE, 0, r, SHOW_MODULE "PAM authentication passed for user %s", login); pam_end(pamh, ret); return AUTH_GRANTED; } @@ -270,7 +276,12 @@ static void register_hooks(apr_pool_t * p) { APR_REGISTER_OPTIONAL_FN(pam_authenticate_with_login_password); } -module AP_MODULE_DECLARE_DATA authnz_pam_module = { +#ifdef AP_DECLARE_MODULE +AP_DECLARE_MODULE(authnz_pam) +#else +module AP_MODULE_DECLARE_DATA authnz_pam_module +#endif + = { STANDARD20_MODULE_STUFF, create_dir_conf, /* Per-directory configuration handler */ NULL, /* Merge handler for per-directory configurations */ |