aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2014-03-28 11:07:27 +0100
committerHans Nilsson <[email protected]>2014-03-28 11:07:27 +0100
commit5205b635180f3ae93935d6ff10656d03e606135c (patch)
treec1a705b813e6a4fa321aac60ef7a4e0fcbcc6ed0
parent8d3959c423b79bc8b55c39e039e7ff6517d87212 (diff)
parent0f3f3ee36fe8824c6de165b9091353c1bc058a02 (diff)
downloadotp-5205b635180f3ae93935d6ff10656d03e606135c.tar.gz
otp-5205b635180f3ae93935d6ff10656d03e606135c.tar.bz2
otp-5205b635180f3ae93935d6ff10656d03e606135c.zip
Merge branch 'hans/ssh/failfun_idlog/OTP-11680'
* hans/ssh/failfun_idlog/OTP-11680: ssh: Fix bug in failfun (was not always called)
-rw-r--r--lib/ssh/src/ssh_auth.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index 409a1db6d5..45fd907383 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -196,7 +196,7 @@ handle_userauth_request(#ssh_msg_userauth_request{user = User,
{authorized, User,
ssh_transport:ssh_packet(#ssh_msg_userauth_success{}, Ssh)};
false ->
- {not_authorized, {User, {passwd, Password}},
+ {not_authorized, {User, {error,"Bad user or password"}},
ssh_transport:ssh_packet(#ssh_msg_userauth_failure{
authentications = "",
partial_success = false}, Ssh)}
@@ -228,7 +228,7 @@ handle_userauth_request(#ssh_msg_userauth_request{user = User,
ssh_transport:ssh_packet(
#ssh_msg_userauth_success{}, Ssh)};
false ->
- {not_authorized, {User, {error, "Invalid signature"}},
+ {not_authorized, {User, undefined},
ssh_transport:ssh_packet(#ssh_msg_userauth_failure{
authentications="publickey,password",
partial_success = false}, Ssh)}