search for: rpp_echo_off

...adpass.c Thu Jan 23 16:36:23 2003 @@ -99,7 +99,7 @@ char * read_passphrase(const char *prompt, int flags) { - char *askpass = NULL, *ret, buf[1024], response; + char *askpass = NULL, *ret, buf[1024]; int rppflags, use_askpass = 0, ttyfd; rppflags = (flags & RP_ECHO) ? RPP_ECHO_ON : RPP_ECHO_OFF; @@ -126,60 +126,13 @@ return ret; } - /* Before reading the passphrase from the user, find it in the - keychain. */ -#ifdef USE_KEYCHAIN - if (get_passphrase_from_keychain(prompt, buf, sizeof buf) == 0) { - /* We got the password; do nothing now that it's in buf */ - } els...

...SH-portable snapshots on OpenBSD 3.1, I get: readpass.c: In function `read_passphrase': readpass.c:100: `RPP_ECHO_ON' undeclared (first use in this function) readpass.c:100: (Each undeclared identifier is reported only once readpass.c:100: for each function it appears in.) readpass.c:100: `RPP_ECHO_OFF' undeclared (first use in this function) readpass.c:105: `RPP_REQUIRE_TTY' undeclared (first use in this function) readpass.c:121: warning: implicit declaration of function `readpassphrase' *** Error code 1 The required defines are in openbsd-compat/readpassphrase.h, and they assume th...

..._PATH_TTY, O_RDWR) to fail. But /dev/tty is a+rw in the normal case. >From readpass.c: char * read_passphrase(const char *prompt, int flags) { char *askpass = NULL, *ret, buf[1024]; int rppflags, use_askpass = 0, ttyfd; rppflags = (flags & RP_ECHO) ? RPP_ECHO_ON : RPP_ECHO_OFF; if (flags & RP_ALLOW_STDIN) { if (!isatty(STDIN_FILENO)) use_askpass = 1; } else { rppflags |= RPP_REQUIRE_TTY; ttyfd = open(_PATH_TTY, O_RDWR); if (ttyfd >= 0) cl...

...`__nonnull__' attribute directive ignored readpass.c: In function `read_passphrase': readpass.c:119: `RPP_ECHO_ON' undeclared (first use in this function) readpass.c:119: (Each undeclared identifier is reported only once readpass.c:119: for each function it appears in.) readpass.c:119: `RPP_ECHO_OFF' undeclared (first use in this function) readpass.c:128: `RPP_REQUIRE_TTY' undeclared (first use in this function) readpass.c:153: warning: implicit declaration of function `readpassphrase' make: *** [readpass.o] Error 1 -----------------------------------------------------------...

....h" #include "log.h" #include "ssh.h" +#include "readconf.h" + +extern Options options; static char * ssh_askpass(char *askpass, const char *msg) @@ -103,7 +106,9 @@ int rppflags, use_askpass = 0, ttyfd; rppflags = (flags & RP_ECHO) ? RPP_ECHO_ON : RPP_ECHO_OFF; - if (flags & RP_USE_ASKPASS) + if (flags & RP_USE_ASKPASS || + (options.prefer_askpass && getenv(SSH_ASKPASS_ENV) && + !(flags & RP_ECHO))) use_askpass = 1; else if (flags & RP_ALLOW_STDIN) { if (!isatty(STDIN_FILENO)) Index: ssh-add.c ================...

https://bugzilla.mindrot.org/show_bug.cgi?id=69 Damien Miller <djm at mindrot.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |djm at mindrot.org Alias| |generalised-askpass -- Configure bugmail: