isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove now-obsolete arg to env_merge()

Browse Source
This commit is contained in:
Todd C. Miller
2013-08-18 14:33:35 -06:00
parent ffef732acb
commit ebbdee421a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sudoers/auth/pam.c
View File

@@ -260,7 +260,7 @@ sudo_pam_begin_session(struct passwd *pw, char **user_envp[], sudo_auth *auth)
if (pam_envp != NULL) { if (pam_envp != NULL) {
/* Merge pam env with user env but do not overwrite. */ /* Merge pam env with user env but do not overwrite. */
env_init(*user_envp); env_init(*user_envp);
env_merge(pam_envp, false); env_merge(pam_envp);
*user_envp = env_get(); *user_envp = env_get();
env_init(NULL); env_init(NULL);
efree(pam_envp); efree(pam_envp);