View | Details | Raw Unified | Return to bug 3057 | Differences between
and this patch

Collapse All | Expand All

(-)ssh.c (-1 / +9 lines)
Lines 1-4 Link Here
1
/* $OpenBSD: ssh.c,v 1.519 2020/02/07 03:54:44 dtucker Exp $ */
1
/* $OpenBSD: ssh.c,v 1.520 2020/02/18 08:49:49 dtucker 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
Lines 1187-1192 main(int ac, char **av) Link Here
1187
	if (options.jump_host != NULL) {
1187
	if (options.jump_host != NULL) {
1188
		char port_s[8];
1188
		char port_s[8];
1189
		const char *sshbin = argv0;
1189
		const char *sshbin = argv0;
1190
		int port = options.port, jumpport = options.jump_port;
1191
1192
		if (port <= 0)
1193
			port = default_ssh_port();
1194
		if (jumpport <= 0)
1195
			jumpport = default_ssh_port();
1196
		if (strcmp(options.jump_host, host) == 0 && port == jumpport)
1197
			fatal("jumphost loop via %s", options.jump_host);
1190
1198
1191
		/*
1199
		/*
1192
		 * Try to use SSH indicated by argv[0], but fall back to
1200
		 * Try to use SSH indicated by argv[0], but fall back to

Return to bug 3057