diff options
| author | Hans Nilsson <[email protected]> | 2018-03-02 11:44:39 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-03-02 11:44:39 +0100 |
| commit | cae492cdf842addf31cd43956278f98efe4e2443 (patch) | |
| tree | d63512db7108abb1550a07cf22a913791535dc76 /lib/ssh/src/ssh_options.erl | |
| parent | fb218aaf3ef9da8f21a95f7e5a96e0210812d04b (diff) | |
| parent | 2c525a02f087fff609cc6c7736c5c582f91e00dc (diff) | |
| download | otp-cae492cdf842addf31cd43956278f98efe4e2443.tar.gz otp-cae492cdf842addf31cd43956278f98efe4e2443.tar.bz2 otp-cae492cdf842addf31cd43956278f98efe4e2443.zip | |
Merge branch 'hans/ssh/execfix20/OTP-14881' into maint
* hans/ssh/execfix20/OTP-14881:
ssh: Disable exec for non-default shell
ssh: Test for disabled shell
Diffstat (limited to 'lib/ssh/src/ssh_options.erl')
| -rw-r--r-- | lib/ssh/src/ssh_options.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_options.erl b/lib/ssh/src/ssh_options.erl index cf1534bd78..1e10f72956 100644 --- a/lib/ssh/src/ssh_options.erl +++ b/lib/ssh/src/ssh_options.erl @@ -268,7 +268,7 @@ default(server) -> }, {shell, def} => - #{default => {shell, start, []}, + #{default => ?DEFAULT_SHELL, chk => fun({M,F,A}) -> is_atom(M) andalso is_atom(F) andalso is_list(A); (V) -> check_function1(V) orelse check_function2(V) end, |