diff options
author | Hans Nilsson <[email protected]> | 2018-02-22 12:11:05 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-02-22 12:11:05 +0100 |
commit | 398dcda0815f12fb177bbb3bf68f6b424c2a62f2 (patch) | |
tree | 28cdd37f4c77fae6e7999507b07485fbd2e04cbb /lib/ssh/src/ssh_options.erl | |
parent | 4a319977e7f8578435a97e700bebf65b3ee49992 (diff) | |
parent | 13c6a4bf01d39a5002e09ef1f82619cde9f2c90c (diff) | |
download | otp-398dcda0815f12fb177bbb3bf68f6b424c2a62f2.tar.gz otp-398dcda0815f12fb177bbb3bf68f6b424c2a62f2.tar.bz2 otp-398dcda0815f12fb177bbb3bf68f6b424c2a62f2.zip |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Prepare release
ssh: Add option save_accepted_host
ssh: No error message for signal kill
ssh: Dont repeat supervisor defaults in map fields
ssh: Move starting of channel child to ssh_channel_sup
ssh: Test case for sup tree when shell server proc times out
Diffstat (limited to 'lib/ssh/src/ssh_options.erl')
-rw-r--r-- | lib/ssh/src/ssh_options.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl index 68c99743ee..cf1534bd78 100644 --- a/lib/ssh/src/ssh_options.erl +++ b/lib/ssh/src/ssh_options.erl @@ -439,6 +439,12 @@ default(client) -> class => user_options }, + {save_accepted_host, def} => + #{default => true, + chk => fun erlang:is_boolean/1, + class => user_options + }, + {pref_public_key_algs, def} => #{default => ssh_transport:default_algorithms(public_key), chk => fun check_pref_public_key_algs/1, |