RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

make "--" before the hostname terminate command-line
option processing completely; previous behaviour would not prevent further
options appearing after the hostname (ssh has a supported options after the
hostname for >20 years, so that's too late to change).

ok deraadt@

Upstream-ID: ef5ee50571b98ad94dcdf8282204e877ec88ad89
This commit is contained in:
djm@openbsd.org 2017-08-12 06:46:01 +00:00 committed by Damien Miller
parent 0f3455356b
commit 643c2ad829
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ssh.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh.c,v 1.461 2017/05/30 18:58:37 bluhm Exp $ */ /* $OpenBSD: ssh.c,v 1.462 2017/08/12 06:46:01 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
@ -509,13 +509,13 @@ int
main(int ac, char **av) main(int ac, char **av)
{ {
struct ssh *ssh = NULL; struct ssh *ssh = NULL;
int i, r, opt, exit_status, use_syslog, direct, config_test = 0; int i, r, opt, exit_status, use_syslog, direct, timeout_ms;
int config_test = 0, opt_terminated = 0;
char *p, *cp, *line, *argv0, buf[PATH_MAX], *host_arg, *logfile; char *p, *cp, *line, *argv0, buf[PATH_MAX], *host_arg, *logfile;
char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV]; char thishost[NI_MAXHOST], shorthost[NI_MAXHOST], portstr[NI_MAXSERV];
char cname[NI_MAXHOST], uidstr[32], *conn_hash_hex; char cname[NI_MAXHOST], uidstr[32], *conn_hash_hex;
struct stat st; struct stat st;
struct passwd *pw; struct passwd *pw;
int timeout_ms;
extern int optind, optreset; extern int optind, optreset;
extern char *optarg; extern char *optarg;
struct Forward fwd; struct Forward fwd;
@ -917,6 +917,9 @@ main(int ac, char **av)
} }
} }
if (optind > 1 && strcmp(av[optind - 1], "--") == 0)
opt_terminated = 1;
ac -= optind; ac -= optind;
av += optind; av += optind;
@ -931,7 +934,7 @@ main(int ac, char **av)
host = xstrdup(++cp); host = xstrdup(++cp);
} else } else
host = xstrdup(*av); host = xstrdup(*av);
if (ac > 1) { if (ac > 1 && !opt_terminated) {
optind = optreset = 1; optind = optreset = 1;
goto again; goto again;
} }