From a5375ccb970f49dddf7d0ef63c9b713ede9e7260 Mon Sep 17 00:00:00 2001 From: "jmc@openbsd.org" Date: Sun, 21 Dec 2014 23:35:14 +0000 Subject: upstream commit tweak previous; --- ssh-agent.c | 6 +++--- sshd_config.5 | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ssh-agent.c b/ssh-agent.c index c2dc1fa0c..ae2bacca5 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.192 2014/12/21 22:27:56 djm Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.193 2014/12/21 23:35:14 jmc Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1027,8 +1027,8 @@ static void usage(void) { fprintf(stderr, - "usage: ssh-agent [-c | -s] [-d] [-a bind_address] [-t life]\n" - " [-E fingerprint_hash] [command [arg ...]]\n" + "usage: ssh-agent [-c | -s] [-d] [-a bind_address] [-E fingerprint_hash]\n" + " [-t life] [command [arg ...]]\n" " ssh-agent [-c | -s] -k\n"); exit(1); } diff --git a/sshd_config.5 b/sshd_config.5 index 69d3be2b8..938ba2f1a 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -33,7 +33,7 @@ .\" (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: sshd_config.5,v 1.183 2014/12/21 22:27:55 djm Exp $ +.\" $OpenBSD: sshd_config.5,v 1.184 2014/12/21 23:35:14 jmc Exp $ .Dd $Mdocdate: December 21 2014 $ .Dt SSHD_CONFIG 5 .Os @@ -493,7 +493,6 @@ and .Dq sha256 . The default is .Dq sha256 . -.Pp .It Cm ForceCommand Forces the execution of the command specified by .Cm ForceCommand , -- cgit v1.2.3