Eliminate calls to fatal()/fatalx()/log_fatal() in env.c and just

pass back a return value.
This commit is contained in:
Todd C. Miller
2014-04-30 16:57:12 -06:00
parent e45b388a37
commit 5086194c67
6 changed files with 141 additions and 67 deletions

View File

@@ -261,7 +261,8 @@ sudo_pam_begin_session(struct passwd *pw, char **user_envp[], sudo_auth *auth)
if (pam_envp != NULL) {
/* Merge pam env with user env. */
env_init(*user_envp);
env_merge(pam_envp);
if (!env_merge(pam_envp))
status = PAM_SYSTEM_ERR;
*user_envp = env_get();
env_init(NULL);
efree(pam_envp);