aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-12-15 18:32:15 +0100
committerHans Nilsson <[email protected]>2016-12-15 18:32:15 +0100
commita9b1aef133bfaac885ae2f1a83d23d1079758535 (patch)
tree546a85a1d4379a53fb9f340251d46c7e9fca4d8f /lib/ssh/src
parent248aa0f8a3356e503e6887a0365d66a9f4892528 (diff)
parent6b28c962113429b212020336e145ccd78ca699fd (diff)
downloadotp-a9b1aef133bfaac885ae2f1a83d23d1079758535.tar.gz
otp-a9b1aef133bfaac885ae2f1a83d23d1079758535.tar.bz2
otp-a9b1aef133bfaac885ae2f1a83d23d1079758535.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh_auth.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index ac35b70209..9b54ecb2dd 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -406,7 +406,11 @@ handle_userauth_info_response(#ssh_msg_userauth_info_response{num_responses = 1,
kb_tries_left = KbTriesLeft,
user = User,
userauth_supported_methods = Methods} = Ssh) ->
- SendOneEmpty = proplists:get_value(tstflg, Opts) == one_empty,
+ SendOneEmpty =
+ (proplists:get_value(tstflg,Opts) == one_empty)
+ orelse
+ proplists:get_value(one_empty, proplists:get_value(tstflg,Opts,[]), false),
+
case check_password(User, unicode:characters_to_list(Password), Opts, Ssh) of
{true,Ssh1} when SendOneEmpty==true ->
Msg = #ssh_msg_userauth_info_request{name = "",