diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2012-01-03 12:34:12 +0100 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2012-01-03 12:34:12 +0100 |
| commit | 0f585d99d70fc14fe3c1335b7626642096dc2eef (patch) | |
| tree | 57ef29c840b4daf42bbeaf9822daf1875285fc13 | |
| parent | 0baf28fa03dfa46482e13390fd9a7545c30ccd7f (diff) | |
| parent | c9148666f5d9dd59804a3d29c59207ef067f7093 (diff) | |
| download | pam-0f585d99d70fc14fe3c1335b7626642096dc2eef.tar.gz pam-0f585d99d70fc14fe3c1335b7626642096dc2eef.tar.bz2 pam-0f585d99d70fc14fe3c1335b7626642096dc2eef.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/linux-pam
| -rw-r--r-- | libpam/pam_start.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libpam/pam_start.c b/libpam/pam_start.c index b7cd771e..328416d2 100644 --- a/libpam/pam_start.c +++ b/libpam/pam_start.c @@ -111,6 +111,7 @@ int pam_start ( (*pamh)->data = NULL; if ( _pam_make_env(*pamh) != PAM_SUCCESS ) { pam_syslog(*pamh,LOG_ERR,"pam_start: failed to initialize environment"); + _pam_drop((*pamh)->pam_conversation); _pam_drop((*pamh)->service_name); _pam_drop((*pamh)->user); _pam_drop(*pamh); @@ -127,6 +128,7 @@ int pam_start ( if ( _pam_init_handlers(*pamh) != PAM_SUCCESS ) { pam_syslog(*pamh, LOG_ERR, "pam_start: failed to initialize handlers"); _pam_drop_env(*pamh); /* purge the environment */ + _pam_drop((*pamh)->pam_conversation); _pam_drop((*pamh)->service_name); _pam_drop((*pamh)->user); _pam_drop(*pamh); |