aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh.erl
diff options
context:
space:
mode:
authorMarcus Arendt <[email protected]>2014-08-28 10:34:17 +0200
committerMarcus Arendt <[email protected]>2014-08-28 10:34:17 +0200
commit7df69f3a0934cd4417d2a1083dc833a0cbb7c651 (patch)
tree0a5663ad4f4dd7ac693a836874e596d84e74b075 /lib/ssh/src/ssh.erl
parentdeb3008fb728f2089e844a53c95a8d7bfb4dfb5c (diff)
parent94b7ece322468e30a3dda9e6c8aba57d62bdaac5 (diff)
downloadotp-7df69f3a0934cd4417d2a1083dc833a0cbb7c651.tar.gz
otp-7df69f3a0934cd4417d2a1083dc833a0cbb7c651.tar.bz2
otp-7df69f3a0934cd4417d2a1083dc833a0cbb7c651.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/src/ssh.erl')
-rw-r--r--lib/ssh/src/ssh.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 743c01a42c..8a8d4bb89e 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -392,7 +392,8 @@ handle_ssh_option({compression, Value} = Opt) when is_atom(Value) ->
Opt;
handle_ssh_option({exec, {Module, Function, _}} = Opt) when is_atom(Module),
is_atom(Function) ->
-
+ Opt;
+handle_ssh_option({exec, Function} = Opt) when is_function(Function) ->
Opt;
handle_ssh_option({auth_methods, Value} = Opt) when is_list(Value) ->
Opt;