embedaddon/sudo/src/tgetpass.c - diff

Return to tgetpass.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / sudo / src

version 1.1.1.2, 2012/05/29 12:26:49	version 1.1.1.3, 2012/10/09 09:29:52
Line 78 tgetpass(const char *prompt, int timeout, int flags)	Line 78 tgetpass(const char *prompt, int timeout, int flags)
(void) fflush(stdout);	(void) fflush(stdout);

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