diff options
| author | Hans Nilsson <[email protected]> | 2016-06-17 13:34:47 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-06-22 12:31:31 +0200 |
| commit | 688a278d0050ed088df17e351d14e3f9ba193501 (patch) | |
| tree | e945ad8fcdc22b0a74436cef740bf11d198de676 | |
| parent | 3ad4e41e4653a910d592ac9912ec380b1cb1b25b (diff) | |
| download | otp-688a278d0050ed088df17e351d14e3f9ba193501.tar.gz otp-688a278d0050ed088df17e351d14e3f9ba193501.tar.bz2 otp-688a278d0050ed088df17e351d14e3f9ba193501.zip | |
ssh: Fix type error in args of ssh_auth:sort_selected_mthds
| -rw-r--r-- | lib/ssh/src/ssh_auth.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_auth.erl b/lib/ssh/src/ssh_auth.erl index 86a91c6d22..07585dbacd 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, |