diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-11-08 16:50:56 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-11-08 16:50:56 +0100 |
| commit | 94db3fe12a76c24154a241f9b8afe12b9949f4b9 (patch) | |
| tree | a0888e2ab661acfb0e819d6a53ece9336887f509 /lib | |
| parent | 645372700c4c2d799595ba4c964bb5945990009f (diff) | |
| parent | e0095dfe77c48fe2b6c369b5247c67cc86a6feab (diff) | |
| download | otp-94db3fe12a76c24154a241f9b8afe12b9949f4b9.tar.gz otp-94db3fe12a76c24154a241f9b8afe12b9949f4b9.tar.bz2 otp-94db3fe12a76c24154a241f9b8afe12b9949f4b9.zip | |
Merge branch 'maint'
* maint:
Doc for quiet_mode
SSH quiet mode
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 4 | ||||
| -rw-r--r-- | lib/ssh/src/ssh.erl | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 0b715cece9..9de1dd1dad 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}}). |