File 2514-ssh-Option-auth_methods-available-not-only... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2514-ssh-Option-auth_methods-available-not-only-in-server.patch of Package erlang (Revision 66a224e208ffe9ee89602bad56a74dfa)

Currently displaying revision 66a224e208ffe9ee89602bad56a74dfa , Show latest

From efbae4afb84ef03364a1de349d98413211946ad4 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 9 May 2017 18:38:35 +0200
Subject: [PATCH 1/3] ssh: Option 'auth_methods' available not only in server
 but also in client

---
 lib/ssh/src/ssh_connection_handler.erl |  6 +-----
 lib/ssh/src/ssh_options.erl            | 12 ++++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 342583306..39bd54869 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -434,11 +434,7 @@ init_ssh_record(Role, Socket, Opts) ->
 
 init_ssh_record(Role, _Socket, PeerAddr, Opts) ->
     KeyCb = ?GET_OPT(key_cb, Opts),
-    AuthMethods =
-        case Role of
-            server -> ?GET_OPT(auth_methods, Opts);
-            client -> undefined
-        end,
+    AuthMethods = ?GET_OPT(auth_methods, Opts),
     S0 = #ssh{role = Role,
 	      key_cb = KeyCb,
 	      opts = Opts,
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl
index 0886d5b34..6bd6ab74c 100644
--- a/lib/ssh/src/ssh_options.erl
+++ b/lib/ssh/src/ssh_options.erl
@@ -293,12 +293,6 @@ default(server) ->
             class => user_options
            },
 
-      {auth_methods, def} =>
-          #{default => ?SUPPORTED_AUTH_METHODS,
-            chk => fun check_string/1,
-            class => user_options
-           },
-
       {auth_method_kb_interactive_data, def} =>
           #{default => undefined, % Default value can be constructed when User is known
             chk => fun({S1,S2,S3,B}) ->
@@ -583,6 +577,12 @@ default(common) ->
            },
 
 %%%%% Undocumented
+      {auth_methods, def} =>
+          #{default => ?SUPPORTED_AUTH_METHODS,
+            chk => fun check_string/1,
+            class => user_options
+           },
+
        {transport, def} =>
            #{default => ?DEFAULT_TRANSPORT,
              chk => fun({A,B,C}) ->
-- 
2.13.0

Places

File 2514-ssh-Option-auth_methods-available-not-only-in-server.patch of Package erlang (Revision 66a224e208ffe9ee89602bad56a74dfa)

Places