diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-06-14 04:13:58 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-06-14 14:15:01 +1000 |
| commit | cb8f56570f70b00abae4267d4bcce2bfae7dfff6 (patch) | |
| tree | 3915a90582c2d0d84150f8f836f87ecf06f92e5b /ssh.c | |
| parent | 2317ce4b0ed7d8c4b0c684e2d47bff5006bd1178 (diff) | |
upstream: slightly more instructive error message when the user
specifies multiple -J options on the commandline. bz3015 ok dtucker@
OpenBSD-Commit-ID: 181c15a65cac3b575819bc8d9a56212c3c748179
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.503 2019/06/12 11:31:50 jmc Exp $ */ +/* $OpenBSD: ssh.c,v 1.504 2019/06/14 04:13:58 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -790,8 +790,11 @@ main(int ac, char **av) #endif break; case 'J': - if (options.jump_host != NULL) - fatal("Only a single -J option permitted"); + if (options.jump_host != NULL) { + fatal("Only a single -J option is permitted " + "(use commas to separate multiple " + "jump hops)"); + } if (options.proxy_command != NULL) fatal("Cannot specify -J with ProxyCommand"); if (parse_jump(optarg, &options, 1) == -1) |