summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@altlinux.org>2008-02-18 13:18:43 +0000
committerDmitry V. Levin <ldv@altlinux.org>2008-02-18 13:18:43 +0000
commitf2b7f432bc20a90b836c6c2d2dba53979296ccc0 (patch)
tree279254c3aa35f0eb5169d03356b63401ea646f92
parentb2661a54ac276d20268dba45b4e025d58458241e (diff)
Relevant BUGIDs:
Purpose of commit: bugfix Commit summary: --------------- 2008-02-18 Dmitry V. Levin <ldv@altlinux.org> * modules/pam_exec/pam_exec.c (call_exec): Fix asprintf return code check.
-rw-r--r--ChangeLog5
-rw-r--r--modules/pam_exec/pam_exec.c9
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index fa01eac7..ba1eedbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-18 Dmitry V. Levin <ldv@altlinux.org>
+
+ * modules/pam_exec/pam_exec.c (call_exec): Fix asprintf return
+ code check.
+
2008-02-13 Thorsten Kukuk <kukuk@thkukuk.de>
* release version 0.99.10.0
diff --git a/modules/pam_exec/pam_exec.c b/modules/pam_exec/pam_exec.c
index 766c0a06..14dddd54 100644
--- a/modules/pam_exec/pam_exec.c
+++ b/modules/pam_exec/pam_exec.c
@@ -244,8 +244,8 @@ call_exec (pam_handle_t *pamh, int argc, const char **argv)
if (tmp == NULL)
{
free(envlist);
- pam_syslog (pamh, LOG_ERR, "realloc environment failed : %m");
- exit (ENOMEM);
+ pam_syslog (pamh, LOG_ERR, "realloc environment failed: %m");
+ exit (ENOMEM);
}
envlist = tmp;
for (i = 0; i < nitems; ++i)
@@ -255,11 +255,10 @@ call_exec (pam_handle_t *pamh, int argc, const char **argv)
if (pam_get_item(pamh, env_items[i].item, &item) != PAM_SUCCESS || item == NULL)
continue;
- asprintf(&envstr, "%s=%s", env_items[i].name, (const char *)item);
- if (envstr == NULL)
+ 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_ERR, "prepare environment failed: %m");
exit (ENOMEM);
}
envlist[envlen++] = envstr;