diff options
| author | Erlang/OTP <[email protected]> | 2018-03-02 12:40:23 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-03-02 12:40:23 +0100 |
| commit | 5105992b03757bd0f4ee47b7852da19766a009e3 (patch) | |
| tree | f778e356fc895ad20dd0cb47cb317b089200cc2c /lib/ssh/src/ssh.erl | |
| parent | 8c3a10c0049fb197f438fef5380a85d7e1c53396 (diff) | |
| parent | 7d44b20a3346132d3f2800a567c2130820732f32 (diff) | |
| download | otp-5105992b03757bd0f4ee47b7852da19766a009e3.tar.gz otp-5105992b03757bd0f4ee47b7852da19766a009e3.tar.bz2 otp-5105992b03757bd0f4ee47b7852da19766a009e3.zip | |
Merge branch 'hans/ssh/execfix18/OTP-14881' into maint-18
* hans/ssh/execfix18/OTP-14881:
ssh: Fix cli
ssh: Test for disabled shell
Diffstat (limited to 'lib/ssh/src/ssh.erl')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 54f94acbdc..96a51bcefc 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -134,7 +134,7 @@ daemon(Port, Options) -> daemon(HostAddr, Port, Options0) -> Options1 = case proplists:get_value(shell, Options0) of undefined -> - [{shell, {shell, start, []}} | Options0]; + [{shell, ?DEFAULT_SHELL} | Options0]; _ -> Options0 end, |