diff options
-rw-r--r-- | ssh-agent.c | 6 | ||||
-rw-r--r-- | 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 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.192 2014/12/21 22:27:56 djm Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.193 2014/12/21 23:35:14 jmc Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1027,8 +1027,8 @@ static void | |||
1027 | usage(void) | 1027 | usage(void) |
1028 | { | 1028 | { |
1029 | fprintf(stderr, | 1029 | fprintf(stderr, |
1030 | "usage: ssh-agent [-c | -s] [-d] [-a bind_address] [-t life]\n" | 1030 | "usage: ssh-agent [-c | -s] [-d] [-a bind_address] [-E fingerprint_hash]\n" |
1031 | " [-E fingerprint_hash] [command [arg ...]]\n" | 1031 | " [-t life] [command [arg ...]]\n" |
1032 | " ssh-agent [-c | -s] -k\n"); | 1032 | " ssh-agent [-c | -s] -k\n"); |
1033 | exit(1); | 1033 | exit(1); |
1034 | } | 1034 | } |
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 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.183 2014/12/21 22:27:55 djm Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.184 2014/12/21 23:35:14 jmc Exp $ |
37 | .Dd $Mdocdate: December 21 2014 $ | 37 | .Dd $Mdocdate: December 21 2014 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
@@ -493,7 +493,6 @@ and | |||
493 | .Dq sha256 . | 493 | .Dq sha256 . |
494 | The default is | 494 | The default is |
495 | .Dq sha256 . | 495 | .Dq sha256 . |
496 | .Pp | ||
497 | .It Cm ForceCommand | 496 | .It Cm ForceCommand |
498 | Forces the execution of the command specified by | 497 | Forces the execution of the command specified by |
499 | .Cm ForceCommand , | 498 | .Cm ForceCommand , |