aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-11-08 16:48:58 +0100
committerFredrik Gustafsson <[email protected]>2012-11-08 16:48:58 +0100
commite0095dfe77c48fe2b6c369b5247c67cc86a6feab (patch)
tree110aa9914df134435a53d275764d9e962a83e577 /lib/ssh
parent8a3e11e386c216ad3c122f241b3758596de2ff32 (diff)
parent0f2b8f9905de6290bc570c4c101490b144060504 (diff)
downloadotp-e0095dfe77c48fe2b6c369b5247c67cc86a6feab.tar.gz
otp-e0095dfe77c48fe2b6c369b5247c67cc86a6feab.tar.bz2
otp-e0095dfe77c48fe2b6c369b5247c67cc86a6feab.zip
Merge branch 'fredrik/ssh-quiet-mode/OTP-10429' into maint
* fredrik/ssh-quiet-mode/OTP-10429: Doc for quiet_mode SSH quiet mode
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/doc/src/ssh.xml4
-rw-r--r--lib/ssh/src/ssh.erl5
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 4ab25a8f9b..57f09c0cf0 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -183,6 +183,10 @@
<c><![CDATA[add_host_key/3]]></c>. This is considered
somewhat experimental and will be better documented later on.</p>
</item>
+ <tag><c><![CDATA[{quiet_mode, atom() = boolean()}]]></c></tag>
+ <item>
+ <p>If true, the client will not print out anything on authorization.</p>
+ </item>
<tag><c><![CDATA[{fd, file_descriptor()}]]></c></tag>
<item>
<p>Allow an existing file-descriptor to be used
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 66d1d024ed..d09f6cf34b 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -344,6 +344,8 @@ handle_option([{auth_methods, _} = Opt | Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
handle_option([{pref_public_key_algs, _} = Opt | Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+handle_option([{quiet_mode, _} = Opt|Rest], SocketOptions, SshOptions) ->
+ handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
handle_option([Opt | Rest], SocketOptions, SshOptions) ->
handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions).
@@ -416,6 +418,9 @@ handle_ssh_option({shell, {Module, Function, _}} = Opt) when is_atom(Module),
Opt;
handle_ssh_option({shell, Value} = Opt) when is_function(Value) ->
Opt;
+handle_ssh_option({quiet_mode, Value} = Opt) when Value == true;
+ Value == false ->
+ Opt;
handle_ssh_option(Opt) ->
throw({error, {eoptions, Opt}}).