diff options
| author | Steve Langasek <vorlon@debian.org> | 2019-02-11 16:13:42 -0800 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-02-12 06:07:57 +0000 |
| commit | 668b13da8f830c38388cecac45539972e80cb246 (patch) | |
| tree | ba3a4e02ed5ec62fe645dfa810c01d26decf591f /modules/pam_exec | |
| parent | f00afb1ef201b2eef7f9ddbe5a0c6ca802cf49bb (diff) | |
| parent | 3b77a78d575b8ab56bb0e828499df328d55c925f (diff) | |
New upstream version 1.3.1
Diffstat (limited to 'modules/pam_exec')
| -rw-r--r-- | modules/pam_exec/pam_exec.8 | 4 | ||||
| -rw-r--r-- | modules/pam_exec/pam_exec.c | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/modules/pam_exec/pam_exec.8 b/modules/pam_exec/pam_exec.8 index 877223c3..f4cff034 100644 --- a/modules/pam_exec/pam_exec.8 +++ b/modules/pam_exec/pam_exec.8 @@ -2,12 +2,12 @@ .\" Title: pam_exec .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 04/01/2016 +.\" Date: 05/18/2017 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" Language: English .\" -.TH "PAM_EXEC" "8" "04/01/2016" "Linux-PAM Manual" "Linux\-PAM Manual" +.TH "PAM_EXEC" "8" "05/18/2017" "Linux-PAM Manual" "Linux\-PAM Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c index 0ab65489..52dc6818 100644 --- a/modules/pam_exec/pam_exec.c +++ b/modules/pam_exec/pam_exec.c @@ -177,9 +177,12 @@ call_exec (const char *pam_type, pam_handle_t *pamh, return retval; } - pam_set_item (pamh, PAM_AUTHTOK, resp); - authtok = strndupa (resp, PAM_MAX_RESP_SIZE); - _pam_drop (resp); + if (resp) + { + pam_set_item (pamh, PAM_AUTHTOK, resp); + authtok = strndupa (resp, PAM_MAX_RESP_SIZE); + _pam_drop (resp); + } } else authtok = strndupa (void_pass, PAM_MAX_RESP_SIZE); @@ -426,7 +429,7 @@ call_exec (const char *pam_type, pam_handle_t *pamh, if (tmp == NULL) { free(envlist); - pam_syslog (pamh, LOG_ERR, "realloc environment failed: %m"); + pam_syslog (pamh, LOG_CRIT, "realloc environment failed: %m"); _exit (ENOMEM); } envlist = tmp; @@ -439,7 +442,7 @@ call_exec (const char *pam_type, pam_handle_t *pamh, if (asprintf(&envstr, "%s=%s", env_items[i].name, (const char *)item) < 0) { free(envlist); - pam_syslog (pamh, LOG_ERR, "prepare environment failed: %m"); + pam_syslog (pamh, LOG_CRIT, "prepare environment failed: %m"); _exit (ENOMEM); } envlist[envlen++] = envstr; @@ -449,7 +452,7 @@ call_exec (const char *pam_type, pam_handle_t *pamh, if (asprintf(&envstr, "PAM_TYPE=%s", pam_type) < 0) { free(envlist); - pam_syslog (pamh, LOG_ERR, "prepare environment failed: %m"); + pam_syslog (pamh, LOG_CRIT, "prepare environment failed: %m"); _exit (ENOMEM); } envlist[envlen++] = envstr; |