diff options
| author | Hans Nilsson <[email protected]> | 2017-05-09 18:38:35 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-05-12 11:53:11 +0200 |
| commit | efbae4afb84ef03364a1de349d98413211946ad4 (patch) | |
| tree | b70228d00f0e7b12f2e1d21f80ac6cd478c766d4 /lib/ssh | |
| parent | 773c4d4f0416f25e3c0c6939f8d0871dc4486bab (diff) | |
| download | otp-efbae4afb84ef03364a1de349d98413211946ad4.tar.gz otp-efbae4afb84ef03364a1de349d98413211946ad4.tar.bz2 otp-efbae4afb84ef03364a1de349d98413211946ad4.zip | |
ssh: Option 'auth_methods' available not only in server but also in client
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 6 | ||||
| -rw-r--r-- | 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 342583306b..39bd54869f 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 0886d5b34d..6bd6ab74c3 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}) -> |