diff options
author | Hans Nilsson <[email protected]> | 2015-06-10 13:37:32 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2015-06-10 13:37:32 +0200 |
commit | 98dcf1a06c2084909e546b779e4bb514a5f232f6 (patch) | |
tree | a6ea624f15a24fa648a9a749bc95dab3a20786ab | |
parent | 16daf50edbd7efa8afa6381b4cd9f3e83201d9ad (diff) | |
parent | 3cb23ddc6bea946a729630def0f76d06a37ec63d (diff) | |
download | otp-98dcf1a06c2084909e546b779e4bb514a5f232f6.tar.gz otp-98dcf1a06c2084909e546b779e4bb514a5f232f6.tar.bz2 otp-98dcf1a06c2084909e546b779e4bb514a5f232f6.zip |
Merge branch 'hans/ssh/pwd_correction'
* hans/ssh/pwd_correction:
ssh: doc change for keyboard-interaction, pwd->password
-rw-r--r-- | lib/ssh/doc/src/ssh.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index 5edd790400..878dcb33d0 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -388,14 +388,14 @@ kex is implicit but public_key is set explicitly.</p> <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/>PromptTexts = kb_int_tuple() | fun(Peer::{IP::tuple(),Port::integer()}, 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> + <c>{auth_method_kb_interactive_data, {"SSH server", "Enter password for \""++User++"\"", "password: ", false}></c></p> </item> <tag><c><![CDATA[{user_passwords, [{string() = User, |