Mercurial > dropbear
changeset 463:33d5e9fb0f78 agent-client
propagate from branch 'au.asn.ucc.matt.dropbear' (head fb7080ca6e254faaf7cfaee93b0ab6ab6de4ed59)
to branch 'au.asn.ucc.matt.dropbear.cli-agent' (head 78d02301ae8310efa2639f15da0ea62dea110e4b)
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 29 Nov 2007 11:38:06 +0000 |
| parents | c1e9c81d1d27 (current diff) db4f6adcb7e2 (diff) |
| children | d588e3ea557a |
| files | cli-runopts.c |
| diffstat | 3 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/cli-authpasswd.c Thu Aug 16 13:34:37 2007 +0000 +++ b/cli-authpasswd.c Thu Nov 29 11:38:06 2007 +0000 @@ -38,7 +38,9 @@ char* askpass_prog = NULL; askpass_prog = getenv("SSH_ASKPASS"); - return askpass_prog && !isatty(STDIN_FILENO) && getenv("DISPLAY"); + return askpass_prog && + ((!isatty(STDIN_FILENO) && getenv("DISPLAY") ) + || getenv("SSH_ASKPASS_ALWAYS")); } /* returns a statically allocated password from a helper app, or NULL @@ -125,10 +127,16 @@ cli_opts.username, cli_opts.remotehost); #ifdef ENABLE_CLI_ASKPASS_HELPER if (want_askpass()) + { password = gui_getpass(prompt); - else + if (!password) { + dropbear_exit("No password"); + } + } else #endif + { password = getpass_or_cancel(prompt); + } buf_putbyte(ses.writepayload, SSH_MSG_USERAUTH_REQUEST);
--- a/cli-runopts.c Thu Aug 16 13:34:37 2007 +0000 +++ b/cli-runopts.c Thu Nov 29 11:38:06 2007 +0000 @@ -92,6 +92,9 @@ #endif char* dummy = NULL; /* Not used for anything real */ + char* recv_window_arg = NULL; + char* keepalive_arg = NULL; + /* see printhelp() for options */ cli_opts.progname = argv[0]; cli_opts.remotehost = NULL; @@ -121,8 +124,6 @@ opts.ipv6 = 1; */ opts.recv_window = DEFAULT_RECV_WINDOW; - char* recv_window_arg = NULL; - char* keepalive_arg = NULL; /* Iterate all the arguments */ for (i = 1; i < (unsigned int)argc; i++) {
--- a/configure.in Thu Aug 16 13:34:37 2007 +0000 +++ b/configure.in Thu Nov 29 11:38:06 2007 +0000 @@ -635,6 +635,9 @@ AS_MKDIR_P(libtomcrypt/src/mac/omac) AS_MKDIR_P(libtomcrypt/src/mac/pelican) AS_MKDIR_P(libtomcrypt/src/mac/pmac) +AS_MKDIR_P(libtomcrypt/src/mac/f9) +AS_MKDIR_P(libtomcrypt/src/mac/xcbc) +AS_MKDIR_P(libtomcrypt/src/math/fp) AS_MKDIR_P(libtomcrypt/src/misc/base64) AS_MKDIR_P(libtomcrypt/src/misc/crypt) AS_MKDIR_P(libtomcrypt/src/misc/mpi) @@ -644,6 +647,8 @@ AS_MKDIR_P(libtomcrypt/src/modes/ctr) AS_MKDIR_P(libtomcrypt/src/modes/ecb) AS_MKDIR_P(libtomcrypt/src/modes/ofb) +AS_MKDIR_P(libtomcrypt/src/modes/f8) +AS_MKDIR_P(libtomcrypt/src/modes/lrw) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/bit) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/choice) AS_MKDIR_P(libtomcrypt/src/pk/asn1/der/ia5)