From 43769b5bb370cb932012eccb3bca7487955760f0 Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Thu, 18 Apr 2013 21:47:38 +0800 Subject: [PATCH] Don't enable CLI_IMMEDIATE_AUTH by default, it breaks blank password logins --- options.h | 7 +++++++ sysoptions.h | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/options.h b/options.h index 88b17ca..7d06322 100644 --- a/options.h +++ b/options.h @@ -204,6 +204,13 @@ much traffic. */ * return the password on standard output */ /*#define ENABLE_CLI_ASKPASS_HELPER*/ +/* Send a real auth request first rather than requesting a list of available methods. + * It saves a network round trip at login but prevents immediate login to + * accounts with no password, and might be rejected by some strict servers (none + * encountered yet) - hence it isn't enabled by default. */ +/* #define CLI_IMMEDIATE_AUTH */ + + /* Source for randomness. This must be able to provide hundreds of bytes per SSH * connection without blocking. In addition /dev/random is used for seeding * rsa/dss key generation */ diff --git a/sysoptions.h b/sysoptions.h index 3072d3d..be736ef 100644 --- a/sysoptions.h +++ b/sysoptions.h @@ -198,9 +198,6 @@ #define DROPBEAR_KEY_LINES /* ie we're using authorized_keys or known_hosts */ #endif -/* Send an auth request straight away rather than trying "none" type to get a list */ -#define CLI_IMMEDIATE_AUTH - /* Changing this is inadvisable, it appears to have problems * with flushing compressed data */ #define DROPBEAR_ZLIB_MEM_LEVEL 8