diff options
| author | Jan Pazdziora <jpazdziora@redhat.com> | 2014-01-09 09:48:57 +0800 |
|---|---|---|
| committer | Jan Pazdziora <jpazdziora@redhat.com> | 2014-01-09 10:04:34 +0800 |
| commit | 5a2f5474d4d2c87a12089deb59202c46884acf7d (patch) | |
| tree | c3a7c5cde2932c923dc065b85172eacf99c6832d | |
| parent | 5584425eb859481b8c9405641b52da34ec01a32c (diff) | |
| download | mod_intercept_form_submit-0.9.2.tar.gz mod_intercept_form_submit-0.9.2.tar.xz mod_intercept_form_submit-0.9.2.zip | |
If pam_authenticate_with_login_password is not available, skip calling it.mod_intercept_form_submit-0.9.2
| -rw-r--r-- | mod_intercept_form_submit.c | 4 | ||||
| -rw-r--r-- | mod_intercept_form_submit.spec | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/mod_intercept_form_submit.c b/mod_intercept_form_submit.c index 2682753..2eedaae 100644 --- a/mod_intercept_form_submit.c +++ b/mod_intercept_form_submit.c @@ -246,6 +246,10 @@ static int intercept_form_submit_process_buffer(ap_filter_t * f, ifs_config * co } } if (run_auth) { + if (! pam_authenticate_with_login_password_fn) { + ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, "mod_intercept_form_submit: pam_authenticate_with_login_password not found; perhaps mod_authnz_pam is not loaded"); + return 0; + } authn_status auth_result = pam_authenticate_with_login_password_fn(r, config->pam_service, *login_value, *password_value, 3); if (auth_result == AUTH_GRANTED) { if (lookup_identity_hook_fn) { diff --git a/mod_intercept_form_submit.spec b/mod_intercept_form_submit.spec index 471ec9a..e9f7a59 100644 --- a/mod_intercept_form_submit.spec +++ b/mod_intercept_form_submit.spec @@ -6,7 +6,7 @@ Summary: Apache module to intercept login form submission and run PAM authentication. Name: mod_intercept_form_submit -Version: 0.9.1 +Version: 0.9.2 Release: 1%{?dist} License: ASL 2.0 Group: System Environment/Daemons @@ -16,7 +16,7 @@ BuildRequires: httpd-devel BuildRequires: pkgconfig Requires(pre): httpd Requires: httpd -Requires: mod_authnz_pam >= 0.6 +Requires: mod_authnz_pam >= 0.7 # Suppres auto-provides for module DSO %{?filter_provides_in: %filter_provides_in %{_libdir}/httpd/modules/.*\.so$} @@ -56,6 +56,11 @@ install -Dp -m 0644 intercept_form_submit.conf $RPM_BUILD_ROOT%{_httpd_confdir}/ %{_httpd_moddir}/*.so %changelog +* Thu Jan 09 2014 Jan Pazdziora - 0.9.2-1 +- If pam_authenticate_with_login_password is not available (mod_authnz_pam + not loaded), skip calling it. +- Declare all functions static for proper isolation. + * Wed Jan 08 2014 Jan Pazdziora - 0.9.1-1 - Use mod_authnz_pam for the actual PAM authentication. |