From efad7275170c877e5ccb442b6eb99c7d3675622a Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 22 Sep 2011 21:33:53 +1000 Subject: [PATCH] - djm@cvs.openbsd.org 2011/08/26 01:45:15 [ssh.1] Add some missing ssh_config(5) options that can be used in ssh(1)'s -o argument. Patch from duclare AT guu.fi --- ChangeLog | 4 ++++ ssh.1 | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c94171c5..c1ef474f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,10 @@ fix GLOB_KEEPSTAT without GLOB_NOSORT; the implicit sort was being applied only to the gl_pathv vector and not the corresponding gl_statv array. reported in OpenSSH bz#1935; feedback and okay matthew@ + - djm@cvs.openbsd.org 2011/08/26 01:45:15 + [ssh.1] + Add some missing ssh_config(5) options that can be used in ssh(1)'s + -o argument. Patch from duclare AT guu.fi 20110909 - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From diff --git a/ssh.1 b/ssh.1 index 9c1ca4b16..fbdddc7d1 100644 --- a/ssh.1 +++ b/ssh.1 @@ -33,8 +33,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.1,v 1.320 2011/08/02 01:22:11 djm Exp $ -.Dd $Mdocdate: August 2 2011 $ +.\" $OpenBSD: ssh.1,v 1.321 2011/08/26 01:45:15 djm Exp $ +.Dd $Mdocdate: August 26 2011 $ .Dt SSH 1 .Os .Sh NAME @@ -419,11 +419,13 @@ For full details of the options listed below, and their possible values, see .It ConnectTimeout .It ControlMaster .It ControlPath +.It ControlPersist .It DynamicForward .It EscapeChar .It ExitOnForwardFailure .It ForwardAgent .It ForwardX11 +.It ForwardX11Timeout .It ForwardX11Trusted .It GatewayPorts .It GlobalKnownHostsFile @@ -438,6 +440,7 @@ For full details of the options listed below, and their possible values, see .It IdentityFile .It IdentitiesOnly .It IPQoS +.It KbdInteractiveAuthentication .It KbdInteractiveDevices .It KexAlgorithms .It LocalCommand