diff options
| author | Hans Nilsson <[email protected]> | 2018-02-22 12:13:18 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-02-22 12:13:18 +0100 |
| commit | 41979694d18637c62433a44aaf4a07b2e02e104d (patch) | |
| tree | e3be25825b8cb63e693f640840ab2dfa79f11d45 /lib/ssh/src/ssh_transport.erl | |
| parent | 1540a0758b8d60af7b3832158015bd8cf64016af (diff) | |
| parent | 398dcda0815f12fb177bbb3bf68f6b424c2a62f2 (diff) | |
| download | otp-41979694d18637c62433a44aaf4a07b2e02e104d.tar.gz otp-41979694d18637c62433a44aaf4a07b2e02e104d.tar.bz2 otp-41979694d18637c62433a44aaf4a07b2e02e104d.zip | |
Merge branch 'maint'
* maint:
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
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssh/src/ssh_transport.erl')
| -rw-r--r-- | lib/ssh/src/ssh_transport.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_transport.erl b/lib/ssh/src/ssh_transport.erl index ad9efc4755..975053d301 100644 --- a/lib/ssh/src/ssh_transport.erl +++ b/lib/ssh/src/ssh_transport.erl @@ -889,10 +889,13 @@ known_host_key(#ssh{opts = Opts, key_cb = {KeyCb,KeyCbOpts}, peer = {PeerName,_} {_,true} -> ok; {_,false} -> + DoAdd = ?GET_OPT(save_accepted_host, Opts), case accepted_host(Ssh, PeerName, Public, Opts) of - true -> + true when DoAdd == true -> {_,R} = add_host_key(KeyCb, PeerName, Public, [{key_cb_private,KeyCbOpts}|UserOpts]), R; + true when DoAdd == false -> + ok; false -> {error, rejected_by_user}; {error,E} -> |