summaryrefslogtreecommitdiff
path: root/libpam/pam_start.c
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@ubuntu.com>2019-01-03 21:23:37 -0800
committerSteve Langasek <vorlon@debian.org>2019-01-08 22:11:51 -0800
commit7e6c4749370338c9af7e1b959f8ab96d089786d6 (patch)
tree2da5e702d7da7b222237ea5ac71e208dd70791a6 /libpam/pam_start.c
parentfa4960114fc50965a9696f2db7406a9d792e3ff8 (diff)
parent795badba7f95e737f979917859cd32c9bd47bcad (diff)
Merge upstream version 1.1.8
Diffstat (limited to 'libpam/pam_start.c')
-rw-r--r--libpam/pam_start.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libpam/pam_start.c b/libpam/pam_start.c
index 0156c61a..328416d2 100644
--- a/libpam/pam_start.c
+++ b/libpam/pam_start.c
@@ -3,7 +3,7 @@
/* Creator Marc Ewing
* Maintained by AGM
*
- * $Id: pam_start.c,v 1.11 2008/12/11 19:41:49 kukuk Exp $
+ * $Id$
*
*/
@@ -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);