aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2012-10-01 11:20:41 +0200
committerHenrik Nord <henrik@erlang.org>2012-10-01 11:20:44 +0200
commitaf9a8a011fd06ae54187bae73192c52495090933 (patch)
tree12a2575104a714b31f6090467b92c283c6496acf /lib
parent56fad3f0d4d17194e772e04ac6840354e6377dfc (diff)
parent4ed113fb4918c3fb886a87ca0e2063ee81cc25ca (diff)
downloadotp-af9a8a011fd06ae54187bae73192c52495090933.tar.gz
otp-af9a8a011fd06ae54187bae73192c52495090933.tar.bz2
otp-af9a8a011fd06ae54187bae73192c52495090933.zip
Merge branch 'dg/keyboard_interactive'
* dg/keyboard_interactive: fix typo in keyboard-interactive string OTP-10456
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/doc/src/ssh.xml2
-rw-r--r--lib/ssh/src/ssh_auth.hrl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index b84b3a3dcb..0133250979 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -265,7 +265,7 @@
<item>
<p>Comma separated string that determines which authentication methodes that the server
should support and in what order they will be tried. Defaults to
- <c><![CDATA["publickey,keyboard_interactive,password"]]></c></p>
+ <c><![CDATA["publickey,keyboard-interactive,password"]]></c></p>
</item>
<tag><c><![CDATA[{user_passwords, [{string() = User, string() = Password}]}]]></c></tag>
<item>
diff --git a/lib/ssh/src/ssh_auth.hrl b/lib/ssh/src/ssh_auth.hrl
index 7d7bad4436..e74ee10041 100644
--- a/lib/ssh/src/ssh_auth.hrl
+++ b/lib/ssh/src/ssh_auth.hrl
@@ -21,7 +21,7 @@
%%% Description: Ssh User Authentication Protocol
--define(SUPPORTED_AUTH_METHODS, "publickey,keyboard_interactive,password").
+-define(SUPPORTED_AUTH_METHODS, "publickey,keyboard-interactive,password").
-define(PREFERRED_PK_ALG, ssh_rsa).