diff options
| author | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 21:15:18 -0800 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 22:11:51 -0800 |
| commit | 18ad8104e674ec8e1fb74d15a248680e51044854 (patch) | |
| tree | 7f69ab6548c6e13babbcd5835ea09a6ecbee2c3d /modules/pam_timestamp/pam_timestamp.c | |
| parent | 4b2748e1c594a8175dfa83b6dc321291da012882 (diff) | |
| parent | c55c14c5c6762139ec6695d84ea0e2e917da5264 (diff) | |
| download | pam-18ad8104e674ec8e1fb74d15a248680e51044854.tar.gz pam-18ad8104e674ec8e1fb74d15a248680e51044854.tar.bz2 pam-18ad8104e674ec8e1fb74d15a248680e51044854.zip | |
merge upstream version 1.1.5
Diffstat (limited to 'modules/pam_timestamp/pam_timestamp.c')
| -rw-r--r-- | modules/pam_timestamp/pam_timestamp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/pam_timestamp/pam_timestamp.c b/modules/pam_timestamp/pam_timestamp.c index 26876769..51937333 100644 --- a/modules/pam_timestamp/pam_timestamp.c +++ b/modules/pam_timestamp/pam_timestamp.c @@ -483,6 +483,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv) pam_syslog(pamh, LOG_NOTICE, "timestamp file `%s' is " "corrupted", path); close(fd); + free(mac); free(message); return PAM_AUTH_ERR; } @@ -636,6 +637,8 @@ pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, int argc, const char * "error setting ownership of `%s': %m", path); } + close(fd); + free(text); return PAM_SESSION_ERR; } @@ -684,7 +687,7 @@ struct pam_module _pam_timestamp_modstruct = { int main(int argc, char **argv) { - int i, pretval = -1, retval = 0, dflag = 0, kflag = 0; + int i, retval = 0, dflag = 0, kflag = 0; const char *target_user = NULL, *user = NULL, *tty = NULL; struct passwd *pwd; struct timeval tv; @@ -826,7 +829,6 @@ main(int argc, char **argv) select(STDOUT_FILENO + 1, NULL, NULL, &write_fds, &tv); - pretval = retval; retval = 0; } } while (dflag > 0); |