diff options
| author | Erlang/OTP <[email protected]> | 2018-02-28 12:13:43 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-02-28 12:13:43 +0100 |
| commit | 5814acb88d84fd13573bc04de2acbe64398eb749 (patch) | |
| tree | 44ad13d2433d5f1c2b0de56bfdf567f6a68fe6dc /lib/ssh/src/ssh.erl | |
| parent | 2e7160f3c28d495a8b798c5f8b484b1b977cee8e (diff) | |
| parent | ca0582834661c54018d82e1f5b1abe6824053963 (diff) | |
| download | otp-5814acb88d84fd13573bc04de2acbe64398eb749.tar.gz otp-5814acb88d84fd13573bc04de2acbe64398eb749.tar.bz2 otp-5814acb88d84fd13573bc04de2acbe64398eb749.zip | |
Merge branch 'hans/ssh/execfix19/OTP-14881' into maint-19
* hans/ssh/execfix19/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 290525cec0..ecdb184db3 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -289,7 +289,7 @@ is_tcp_socket(Socket) -> daemon_shell_opt(Options) -> case proplists:get_value(shell, Options) of undefined -> - [{shell, {shell, start, []}} | Options]; + [{shell, ?DEFAULT_SHELL} | Options]; _ -> Options end. |