diff options
Diffstat (limited to 'lib/ssh/doc/src')
| -rw-r--r-- | lib/ssh/doc/src/Makefile | 2 | ||||
| -rw-r--r-- | lib/ssh/doc/src/notes.xml | 72 | ||||
| -rw-r--r-- | lib/ssh/doc/src/ssh.xml | 14 |
3 files changed, 82 insertions, 6 deletions
diff --git a/lib/ssh/doc/src/Makefile b/lib/ssh/doc/src/Makefile index 38782a3b00..da99c4ea0f 100644 --- a/lib/ssh/doc/src/Makefile +++ b/lib/ssh/doc/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2004-2011. All Rights Reserved. +# Copyright Ericsson AB 2004-2012. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index a85cada732..36010da07a 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2004</year><year>2011</year> + <year>2004</year><year>2012</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> @@ -29,6 +29,76 @@ <file>notes.xml</file> </header> +<section><title>Ssh 2.1.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Ssh now only sends one channel close message under all + circumstances, before it would sometimes incorrectly send + two.</p> + <p> + Own Id: OTP-10060</p> + </item> + <item> + <p> + The options check mistreated the ip_v6_disable-option, + and did not handle some, at the moment, undocumented + options correctly.</p> + <p> + Own Id: OTP-10061</p> + </item> + <item> + <p> + The channel id in a channel failure message, sent to the + peer, is now in all cases the remote channel id</p> + <p> + Own Id: OTP-10062</p> + </item> + <item> + <p> + Improved handling of multiple closes to avoid occasional + crashes when a channel is closed more than once.</p> + <p> + Own Id: OTP-10112</p> + </item> + <item> + <p> + Fix lib/src/test/ssh_basic_SUITE.erl to fix IPv6 option + typos</p> + <p> + Fixed incorrect option "ipv6_disable" to "ipv6_disabled" + as documented in the ssh manual.</p> + <p> + Own Id: OTP-10219</p> + </item> + <item> + <p> + SSH: Make "auth_methods" server option re-usable</p> + <p> + The 'auth_methods' option is used by the server side of + the SSH code to tell a connecting SSH client about the + authentication methods that are supported by the server. + The code still extracts and handles the 'auth_methods' + option from Opts in appropriate places, but the Opts + checking code in ssh.erl didn't allow that option to be + specified.</p> + <p> + Own Id: OTP-10224</p> + </item> + <item> + <p> + Use the correct channel id when adjusting the channel + window</p> + <p> + Own Id: OTP-10232</p> + </item> + </list> + </section> + +</section> + <section><title>Ssh 2.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml index e30c6f1ccc..b84b3a3dcb 100644 --- a/lib/ssh/doc/src/ssh.xml +++ b/lib/ssh/doc/src/ssh.xml @@ -259,11 +259,17 @@ that identifies the host for ssh. The default is <c><![CDATA[/etc/ssh]]></c>, note that SSH normally requires the host files there to be readable only by - root.</p> + root.</p> + </item> + <tag><c><![CDATA[{auth_methods, string()}]]></c></tag> + <item> + <p>Comma separated string that determines which authentication methodes that the server + should support and in what order they will be tried. Defaults to + <c><![CDATA["publickey,keyboard_interactive,password"]]></c></p> </item> - <tag><c><![CDATA[{user_passwords, [{string() = User, string() = Password}]}]]></c></tag> - <item> - <p>Provide passwords for password authentication.They will + <tag><c><![CDATA[{user_passwords, [{string() = User, string() = Password}]}]]></c></tag> + <item> + <p>Provide passwords for password authentication.They will be used when someone tries to connect to the server and public key user authentication fails. The option provides a list of valid user names and the corresponding password. |