aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-05-08 12:10:38 +0200
committerErlang/OTP <[email protected]>2018-05-08 12:10:38 +0200
commit91ae9f0af8eba1af8b9a0da0842aaf9b6027433f (patch)
treebf8a1c78120c52b3072b4dc7d225a2bfc3d526fb /lib/ssh/src
parent02457f4625ace93add5c5203cf737a19ece68043 (diff)
parent1f9cb0d28987f61e10599d6660e3b1ab2fc6bc04 (diff)
downloadotp-91ae9f0af8eba1af8b9a0da0842aaf9b6027433f.tar.gz
otp-91ae9f0af8eba1af8b9a0da0842aaf9b6027433f.tar.bz2
otp-91ae9f0af8eba1af8b9a0da0842aaf9b6027433f.zip
Merge branch 'hans/ssh/reneg_bug_19/OTP-15066' into maint-19
* hans/ssh/reneg_bug_19/OTP-15066: ssh: Renegotiation -> renegotiate
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh_connection_handler.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 60008b6301..7d055f0579 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -1488,7 +1488,7 @@ role({_,Role,_}) -> Role.
%%--------------------------------------------------------------------
%% Check the StateName to see if we are in the renegotiation phase
-renegotiation({_,_,ReNeg}) -> ReNeg == renegotiation;
+renegotiation({_,_,ReNeg}) -> ReNeg == renegotiate;
renegotiation(_) -> false.
%%--------------------------------------------------------------------