aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-06-17 13:34:47 +0200
committerHans Nilsson <[email protected]>2016-06-27 13:48:35 +0200
commit2219cdc9dfa500625527510a4e179cd9c068407a (patch)
tree6a519a841ab20cb7adab5310ca2763959b86b338
parent4f24fd3f8943d8c7ebd56336d15f699dde9bcc61 (diff)
downloadotp-2219cdc9dfa500625527510a4e179cd9c068407a.tar.gz
otp-2219cdc9dfa500625527510a4e179cd9c068407a.tar.bz2
otp-2219cdc9dfa500625527510a4e179cd9c068407a.zip
ssh: Fix type error in args of ssh_auth:sort_selected_mthds
-rw-r--r--lib/ssh/src/ssh_auth.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl
index 1c6f656913..c8f66c9d61 100644
--- a/lib/ssh/src/ssh_auth.erl
+++ b/lib/ssh/src/ssh_auth.erl
@@ -66,11 +66,15 @@ userauth_request_msg(#ssh{userauth_methods = ServerMethods,
sort_select_mthds(Clients, undefined, Servers) ->
%% User has not expressed an opinion via option "auth_methods", use the server's prefs
- sort_select_mthds(Clients, Servers, Servers);
+ sort_select_mthds1(Clients, Servers, string:tokens(?SUPPORTED_AUTH_METHODS,","));
sort_select_mthds(Clients, Users0, Servers0) ->
%% The User has an opinion, use the intersection of that and the Servers whishes but
%% in the Users order
+ sort_select_mthds1(Clients, string:tokens(Users0,","), Servers0).
+
+
+sort_select_mthds1(Clients, Users0, Servers0) ->
Servers = unique(Servers0),
Users = unique(Users0),
[C || Key <- Users,