]> granicus.if.org Git - sudo/commitdiff
Remove now-obsolete arg to env_merge()
authorTodd C. Miller <Todd.Miller@courtesan.com>
Sun, 18 Aug 2013 20:33:35 +0000 (14:33 -0600)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Sun, 18 Aug 2013 20:33:35 +0000 (14:33 -0600)
plugins/sudoers/auth/pam.c

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