summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2014-12-21 23:35:14 +0000
committerDamien Miller <djm@mindrot.org>2014-12-22 13:16:58 +1100
commita5375ccb970f49dddf7d0ef63c9b713ede9e7260 (patch)
treeadfd7c1edfe9b4188f708e6efa996b1c65d7de6b
parentb79efde5c3badf5ce4312fe608d8307eade533c5 (diff)
upstream commit
tweak previous;
-rw-r--r--ssh-agent.c6
-rw-r--r--sshd_config.53
2 files changed, 4 insertions, 5 deletions
diff --git a/ssh-agent.c b/ssh-agent.c
index c2dc1fa0..ae2bacca 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 <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, 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 69d3be2b..938ba2f1 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 ,