diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2007-11-29 11:38:06 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2007-11-29 11:38:06 +0000 |
| commit | bb84e33d99f5cbdb362940fc5eb7e4548df4cf23 (patch) | |
| tree | 84f270382532c10a4d213b51ca2d33ebf31b817b | |
| parent | e41452afebbe0a8520ddcb2220d62f5a15845815 (diff) | |
| parent | 25554bc331cc684c3521b3c3ed4c0659c454d5df (diff) | |
propagate from branch 'au.asn.ucc.matt.dropbear' (head fb7080ca6e254faaf7cfaee93b0ab6ab6de4ed59)
to branch 'au.asn.ucc.matt.dropbear.cli-agent' (head 78d02301ae8310efa2639f15da0ea62dea110e4b)
--HG--
branch : agent-client
extra : convert_revision : 833d0adef6cdbf43ea75283524c665e70b0ee1ee
| -rw-r--r-- | cli-authpasswd.c | 12 | ||||
| -rw-r--r-- | cli-runopts.c | 5 | ||||
| -rw-r--r-- | configure.in | 5 |
3 files changed, 18 insertions, 4 deletions
diff --git a/cli-authpasswd.c b/cli-authpasswd.c index 2500a25..1e0bd41 100644 --- a/cli-authpasswd.c +++ b/cli-authpasswd.c @@ -38,7 +38,9 @@ static int want_askpass() 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 @@ void cli_auth_password() { 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); diff --git a/cli-runopts.c b/cli-runopts.c index c0d2c5d..c7d9b8b 100644 --- a/cli-runopts.c +++ b/cli-runopts.c @@ -92,6 +92,9 @@ void cli_getopts(int argc, char ** argv) { #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 @@ void cli_getopts(int argc, char ** argv) { 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++) { diff --git a/configure.in b/configure.in index 4370b91..52a75e0 100644 --- a/configure.in +++ b/configure.in @@ -635,6 +635,9 @@ AS_MKDIR_P(libtomcrypt/src/mac/hmac) 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/cfb) 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) |