diff options
author | Hans Nilsson <[email protected]> | 2015-06-09 13:29:33 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-06-09 13:29:33 +0200 |
commit | 974042641bcde0b4761bf6f9c8633e36145948fd (patch) | |
tree | 0f05666a159950f21fa9afc169b5fef9db741edb | |
parent | 2629a97b9270a84a62aba44ecfb118c007798d96 (diff) | |
parent | 2ce77297d3475448d2f969b851ddaaa6c4c2e4e2 (diff) | |
download | otp-974042641bcde0b4761bf6f9c8633e36145948fd.tar.gz otp-974042641bcde0b4761bf6f9c8633e36145948fd.tar.bz2 otp-974042641bcde0b4761bf6f9c8633e36145948fd.zip |
Merge branch 'hans/ssh/missing_doc'
* hans/ssh/missing_doc:
ssh: add missing doc for option auth_method_kb_interactive_data
-rw-r--r-- | lib/ssh/doc/src/ssh.xml | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 5402d91e03..5edd790400 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -360,7 +360,7 @@ kex is implicit but public_key is set explicitly.</p> an own CLI channel. If set to <c>no_cli</c>, the CLI channels are disabled and only subsystem channels are allowed.</p> </item> - <tag><c><![CDATA[{user_dir, String}]]></c></tag> + <tag><c><![CDATA[{user_dir, string()}]]></c></tag> <item> <p>Sets the user directory. That is, the directory containing <c>ssh</c> configuration files for the user, such as @@ -377,6 +377,7 @@ kex is implicit but public_key is set explicitly.</p> <c><![CDATA[/etc/ssh]]></c>. For security reasons, this directory is normally accessible only to the root user.</p> </item> + <tag><c><![CDATA[{auth_methods, string()}]]></c></tag> <item> <p>Comma-separated string that determines which @@ -384,6 +385,19 @@ kex is implicit but public_key is set explicitly.</p> in what order they are tried. Defaults to <c><![CDATA["publickey,keyboard-interactive,password"]]></c></p> </item> + + <tag><c><![CDATA[{auth_method_kb_interactive_data, PromptTexts}]]> + <br/>where: + <br/>PromptTexts = kb_int_tuple() | fun(PeerName::string(), User::string(), Service::string()) -> kb_int_tuple() + <br/>kb_int_tuple() = {Name::string(), Instruction::string(), Prompt::string(), Echo::boolean()}</c> + </tag> + <item> + <p>Sets the text strings that the daemon sends to the client for presentation to the user when using <c>keyboar-interactive</c> authentication. If the fun/3 is used, it is called when the actual authentication occurs and may therefore return dynamic data like time, remote ip etc.</p> + <p>The parameter <c>Echo</c> guides the client about need to hide the password.</p> + <p>The default value is: + <c>{auth_method_kb_interactive_data, {"SSH server", "Enter password for \""++User++"\"", "pwd: ", false}></c></p> + </item> + <tag><c><![CDATA[{user_passwords, [{string() = User, string() = Password}]}]]></c></tag> <item> |