Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

MFH (r261320): upgrade openssh to 6.5p1
MFH (r261340): enable sandboxing by default

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Upgrade to 6.3p1.

Approved by: re (gjb)

Upgrade to OpenSSH 6.2p1. The most important new features are support
for a key revocation list and more fine-grained authentication control.

Upgrade OpenSSH to 6.1p1.

Upgrade to OpenSSH 5.9p1.

MFC after: 3 months

Upgrade to OpenSSH 5.8p2.

Upgrade to OpenSSH 5.6p1.

Missing commas

Upgrade to OpenSSH 5.5p1.

Upgrade to OpenSSH 5.4p1.

MFC after: 1 month

Upgrade to OpenSSH 5.3p1.

Upgrade to OpenSSH 5.2p1.

MFC after: 3 months

Our groff doesn't understand $Mdocdate$, so replace them with bare dates.

MFC after: 3 days

Upgrade to OpenSSH 5.1p1.

I have worked hard to reduce diffs against the vendor branch. One
notable change in that respect is that we no longer prefer DSA over
RSA - the reasons for doing so went away years ago. This may cause
some surprises, as ssh will warn about unknown host keys even for
hosts whose keys haven't changed.

MFC after: 6 weeks

Consistently set svn:eol-style.

Resolve conflicts.

Merge conflicts.

MFC after: 1 week

Merge conflicts.

Resolve conflicts.

Resolve conflicts.

Resolve conflicts

Resolve conflicts.

Resolve conflicts.

Resolve conflicts and remove obsolete files.

Sponsored by: registrar.no

Resolve conflicts.

Resolve conflicts.

Resolve conflicts.

Sponsored by: DARPA, NAI Labs

Document FreeBSD defaults and paths.

Sponsored by: DARPA, NAI Labs

Forcibly revert to mainline.

Resolve conflicts and document local changes.

Fix conflicts.

mdoc(7) police: finished fixing conflicts in revision 1.18.

Fix conflicts for OpenSSH 2.9.

Fix double mention of ssh.

This file is already off the vendorbranch, nonetheless it needs to be
submitted back to the OpenSSH people.

PR: 25743
Submitted by: David Wolfskill <dhw@whistle.com>

Update to OpenSSH 2.3.0 with FreeBSD modifications. OpenSSH 2.3.0
new features description elided in favor of checking out their
website.

Important new FreeBSD-version stuff: PAM support has been worked
in, partially from the "Unix" OpenSSH version, and a lot due to the
work of Eivind Eklend, too.

This requires at least the following in pam.conf:

sshd auth sufficient pam_skey.so
sshd auth required pam_unix.so try_first_pass
sshd session required pam_permit.so

Parts by: Eivind Eklend <eivind@FreeBSD.org>

Resolve conflicts and update for OpenSSH 2.2.0

Reviewed by: gshapiro, peter, green

Fix a weird typo, is -> are.
The OpenSSH maintainer probably want to contribute this back to the
real OpenSSH guys.

Submitted by: Jon Perkin <sketchy@netcraft.com>

Fixed a minor typo in the header.

Pointed out by: asmodai

Committed, Thanks!!

PR: 20108
Submitted by: Doug Lee

Forced commit. This is to try and help folks that used the international
crypto repo and have slightly different files but with the same version.
cvsup in 'checkout mode' has no trouble with this, but cvs can get really
silly about it.

Bring vendor patches onto the main branch, and resolve conflicts.

Oops, rename S/Key to Opie in line with FreeBSD usage.

Resolve conflicts and update for FreeBSD.

Note that X11 Forwarding is off by default.

PR: docs/17566
Submitted by: Keith Stevenson <ktstev01@louisville.edu>

Resolve conflicts.

Fix a few spelling errors.

- typos
- Add double spaces following full stops to improve typeset output
- mdoc-ification. (Though I'm uncertain whether option values and
contents should be .Dq or something else).
- Fix a missed /etc/ssh change
- Expand wording on RandomSeed and behaviour when X11 isn't forwarded.
- Change examples to literal mode.
- Trim trailing whitespace

PR: docs/17292
Submitted by: Peter Jeremy <peter.jeremy@alcatel.com.au>

/etc -> /etc/ssh

Submitted by: Ben Smithurst <ben@scientia.demon.co.uk>

Turn off X11 forwarding in the client. X11 forwarding in the server by
default should probably also get turned on, now.

Requested by: kris
Obtained from: OpenBSD

This commit was generated by cvs2svn to compensate for changes in r57429,
which included commits to RCS files with non-trunk default branches.

Vendor import of OpenSSH.