From d80886477127168f5780ea1782793bfaf1608cca Mon Sep 17 00:00:00 2001
From: Stefan Zegenhagen <stefan.zegenhagen@arcutronix.com>
Date: Wed, 1 Aug 2012 10:24:36 +0200
Subject: SSH: Make "auth_methods" server option re-usable

The 'auth_methods' option is used by the server side of the SSH code to
tell a connecting SSH client about the authentication methods that are
supported by the server. The code still extracts and handles the
'auth_methods' option from Opts in appropriate places, but the Opts
checking code in ssh.erl didn't allow that option to be specified.
---
 lib/ssh/src/ssh.erl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index f4a40c81a4..85f5f680e6 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -369,6 +369,8 @@ handle_option([{shell, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{exec, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+handle_option([{auth_methods, _} = Opt | Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions).
 
@@ -407,6 +409,8 @@ handle_ssh_option({compression, Value} = Opt) when is_atom(Value) ->
 handle_ssh_option({exec, {Module, Function, _}} = Opt) when is_atom(Module), 
 							    is_atom(Function) ->
 
+    Opt;
+handle_ssh_option({auth_methods, Value} = Opt)  when is_list(Value) ->
     Opt;
 handle_ssh_option({infofun, Value} = Opt)  when is_function(Value) ->
     Opt;
-- 
cgit v1.2.3


From ea2ad51e8522b1305ea2aa1043458df4ac432784 Mon Sep 17 00:00:00 2001
From: Fredrik Gustafsson <fredrik@erlang.org>
Date: Wed, 22 Aug 2012 15:27:21 +0200
Subject: Corrected some documentation according to original

---
 lib/ssh/doc/src/ssh.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index e30c6f1ccc..b84b3a3dcb 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -259,11 +259,17 @@
             that identifies the host for ssh. The default is
             <c><![CDATA[/etc/ssh]]></c>, note that SSH normally
             requires the host files there to be readable only by
-            root.</p>
+	    root.</p>
+	  </item>
+	  <tag><c><![CDATA[{auth_methods, string()}]]></c></tag>
+	  <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>
           </item>
-          <tag><c><![CDATA[{user_passwords, [{string() = User, string() = Password}]}]]></c></tag>
-          <item>
-	    <p>Provide passwords for password authentication.They will
+	  <tag><c><![CDATA[{user_passwords, [{string() = User, string() = Password}]}]]></c></tag>
+	  <item>
+            <p>Provide passwords for password authentication.They will
 	    be used when someone tries to connect to the server and
 	    public key user authentication fails. The option provides
 	    a list of valid user names and the corresponding password.
-- 
cgit v1.2.3