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

Provide unhooked version of getenv() and use it when looking up

Browse Source 
DISPLAY and SUDO_ASKPASS in the environment.
This commit is contained in:
Todd C. Miller
2012-05-27 12:48:55 -04:00
parent 7a6cad5026
commit af9492d117
3 changed files with 86 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tgetpass.c
View File

@@ -78,7 +78,7 @@ tgetpass(const char *prompt, int timeout, int flags)
(void) fflush(stdout);
if (askpass == NULL) {
askpass = getenv("SUDO_ASKPASS");
askpass = getenv_unhooked("SUDO_ASKPASS");
if (askpass == NULL || *askpass == '\0')
askpass = sudo_conf_askpass_path();
}
@@ -86,7 +86,7 @@ tgetpass(const char *prompt, int timeout, int flags)
/* If no tty present and we need to disable echo, try askpass. */
if (!ISSET(flags, TGP_STDIN|TGP_ECHO|TGP_ASKPASS|TGP_NOECHO_TRY) &&
!tty_present()) {
if (askpass == NULL || getenv("DISPLAY") == NULL) {
if (askpass == NULL || getenv_unhooked("DISPLAY") == NULL) {
warningx(_("no tty present and no askpass program specified"));
debug_return_str(NULL);
}