Merge branch 'fredrik/ssh-quiet-mode/OTP-10429' into maint

* fredrik/ssh-quiet-mode/OTP-10429: Doc for quiet_mode SSH quiet mode
gleber · Nov 8, 2012 · e0095df · e0095df
2 parents 8a3e11e + 0f2b8f9
commit e0095df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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}}).