tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: slightly more instructive error message when the user 

specifies multiple -J options on the commandline. bz3015 ok dtucker@

OpenBSD-Commit-ID: 181c15a65cac3b575819bc8d9a56212c3c748179
This commit is contained in:
djm@openbsd.org 2019-06-14 04:13:58 +00:00 committed by Damien Miller
parent 2317ce4b0e
commit cb8f56570f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssh.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -790,8 +790,11 @@ main(int ac, char **av)
#endif #endif
break; break;
case 'J': case 'J':
if (options.jump_host != NULL) if (options.jump_host != NULL) {
fatal("Only a single -J option permitted"); fatal("Only a single -J option is permitted "
"(use commas to separate multiple "
"jump hops)");
}
if (options.proxy_command != NULL) if (options.proxy_command != NULL)
fatal("Cannot specify -J with ProxyCommand"); fatal("Cannot specify -J with ProxyCommand");
if (parse_jump(optarg, &options, 1) == -1) if (parse_jump(optarg, &options, 1) == -1)