diff options
| author | Steve Langasek <vorlon@debian.org> | 2019-02-11 22:09:25 -0800 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-02-11 22:09:59 -0800 |
| commit | 1a2cb1c4f6c710630ebe46a728bb8b8fb5f68946 (patch) | |
| tree | ba50a9673cb6324c5dfcbdad3f5144588772fbfe /modules/pam_exec/pam_exec.c | |
| parent | b12d7595dfcc20c809f3c11c579e34d115b3060e (diff) | |
| parent | 668b13da8f830c38388cecac45539972e80cb246 (diff) | |
| download | pam-1a2cb1c4f6c710630ebe46a728bb8b8fb5f68946.tar.gz pam-1a2cb1c4f6c710630ebe46a728bb8b8fb5f68946.tar.bz2 pam-1a2cb1c4f6c710630ebe46a728bb8b8fb5f68946.zip | |
Merge upstream version 1.3.1
Diffstat (limited to 'modules/pam_exec/pam_exec.c')
| -rw-r--r-- | modules/pam_exec/pam_exec.c | 15 |
1 files changed, 9 insertions, 6 deletions
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; |