From ce3754bbf39ae2a978bdda68cf61fe311b4103d0 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 26 Mar 2010 12:09:13 +1100 Subject: - dtucker@cvs.openbsd.org 2010/03/26 01:06:13 [ssh_config.5] Reformat default value of PreferredAuthentications entry (current formatting implies ", " is acceptable as a separator, which it's not. ok djm@ --- ChangeLog | 6 ++++++ ssh_config.5 | 10 +++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b64f17c8..7e662faa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,12 @@ pkg-config, patch from Colin Watson. Needed for newer linkers (ie gold). - (djm) [contrib/ssh-copy-id] Don't blow up when the agent has no keys; bz#1723 patch from Adeodato Simóvia Colin Watson; ok dtucker@ + - (dtucker) OpenBSD CVS Sync + - dtucker@cvs.openbsd.org 2010/03/26 01:06:13 + [ssh_config.5] + Reformat default value of PreferredAuthentications entry (current + formatting implies ", " is acceptable as a separator, which it's not. + ok djm@ 20100324 - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory diff --git a/ssh_config.5 b/ssh_config.5 index 8cf02597..41085356 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -34,8 +34,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.129 2010/03/05 10:28:21 djm Exp $ -.Dd $Mdocdate: March 5 2010 $ +.\" $OpenBSD: ssh_config.5,v 1.130 2010/03/26 01:06:13 dtucker Exp $ +.Dd $Mdocdate: March 26 2010 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -734,11 +734,7 @@ This allows a client to prefer one method (e.g.\& over another method (e.g.\& .Cm password ) The default for this option is: -.Do gssapi-with-mic , -hostbased, -publickey, -keyboard-interactive, -password +.Do gssapi-with-mic,hostbased,publickey,keyboard-interactive,password .Dc . .It Cm Protocol Specifies the protocol versions -- cgit v1.2.3