Attachment #995 for bug #1103

View | Details | Raw Unified | Return to bug 1103
Collapse All | Expand All

Lines 107-113 Link Here

(-)readconf.c (-1 / +9 lines)
107	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,	107	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
108	oAddressFamily, oGssAuthentication, oGssDelegateCreds,	108	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
109	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,	109	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
110	oVersionAddendum,	110	oVersionAddendum, oRemoteForwardIsRequired,
111	oDeprecated, oUnsupported	111	oDeprecated, oUnsupported
112	} OpCodes;	112	} OpCodes;
113		113
Lines 196-201 Link Here
196	{ "serveraliveinterval", oServerAliveInterval },	196	{ "serveraliveinterval", oServerAliveInterval },
197	{ "serveralivecountmax", oServerAliveCountMax },	197	{ "serveralivecountmax", oServerAliveCountMax },
198	{ "versionaddendum", oVersionAddendum },	198	{ "versionaddendum", oVersionAddendum },
		199	{ "remoteforwardisrequired", oRemoteForwardIsRequired },
199	{ NULL, oBadOption }	200	{ NULL, oBadOption }
200	};	201	};
201		202
Lines 759-764 Link Here
759	} while (arg != NULL && *arg != '\0');	760	} while (arg != NULL && *arg != '\0');
760	break;	761	break;
761		762
		763	case oRemoteForwardIsRequired:
		764	intptr = &options->remote_forward_is_required;
		765	goto parse_flag;
		766
762	case oDeprecated:	767	case oDeprecated:
763	debug("%s line %d: Deprecated option \"%s\"",	768	debug("%s line %d: Deprecated option \"%s\"",
764	filename, linenum, keyword);	769	filename, linenum, keyword);
Lines 889-894 Link Here
889	options->verify_host_key_dns = -1;	894	options->verify_host_key_dns = -1;
890	options->server_alive_interval = -1;	895	options->server_alive_interval = -1;
891	options->server_alive_count_max = -1;	896	options->server_alive_count_max = -1;
		897	options->remote_forward_is_required = -1;
892	}	898	}
893		899
894	/*	900	/*
Lines 1009-1014 Link Here
1009	options->server_alive_interval = 0;	1015	options->server_alive_interval = 0;
1010	if (options->server_alive_count_max == -1)	1016	if (options->server_alive_count_max == -1)
1011	options->server_alive_count_max = 3;	1017	options->server_alive_count_max = 3;
		1018	if (options->remote_forward_is_required == -1)
		1019	options->remote_forward_is_required = 0;
1012	/* options->proxy_command should not be set by default */	1020	/* options->proxy_command should not be set by default */
1013	/* options->user will be set in the main program if appropriate */	1021	/* options->user will be set in the main program if appropriate */
1014	/* options->hostname will be set in the main program if appropriate */	1022	/* options->hostname will be set in the main program if appropriate */

Lines 103-108 Link Here

(-)readconf.h (+1 lines)
103	int identities_only;	103	int identities_only;
104	int server_alive_interval;	104	int server_alive_interval;
105	int server_alive_count_max;	105	int server_alive_count_max;
		106	int remote_forward_is_required;
106	} Options;	107	} Options;
107		108
108		109

Lines 649-654 Link Here

(-)ssh.1 (+1 lines)
649	.It ProxyCommand	649	.It ProxyCommand
650	.It PubkeyAuthentication	650	.It PubkeyAuthentication
651	.It RemoteForward	651	.It RemoteForward
		652	.It RemoteForwardIsRequired
652	.It RhostsRSAAuthentication	653	.It RhostsRSAAuthentication
653	.It RSAAuthentication	654	.It RSAAuthentication
654	.It ServerAliveInterval	655	.It ServerAliveInterval

Lines 1019-1026 Link Here

(-)ssh.c (-2 / +7 lines)
1019	options.remote_forwards[i].host,	1019	options.remote_forwards[i].host,
1020	options.remote_forwards[i].host_port);	1020	options.remote_forwards[i].host_port);
1021	if (type == SSH2_MSG_REQUEST_FAILURE)	1021	if (type == SSH2_MSG_REQUEST_FAILURE)
1022	logit("Warning: remote port forwarding failed for listen port %d",	1022	if (options.remote_forward_is_required == 0) {
1023	options.remote_forwards[i].port);	1023	logit("Warning: remote port forwarding failed for listen port %d",
		1024	options.remote_forwards[i].port);
		1025	} else {
		1026	fatal("Remote port forwarding failed for listen port %d",
		1027	options.remote_forwards[i].port);
		1028	}
1024	}	1029	}
1025		1030
1026	/* request pty/x11/agent/tcpfwd/shell for channel */	1031	/* request pty/x11/agent/tcpfwd/shell for channel */




Multiple forwardings may be specified, and additional
forwardings can be given on the command line.
Only the superuser can forward privileged ports.
.It Cm RemoteForwardIsRequired
If this flag is set to
.Dq yes ,
the client will exit with error code if attempt to establish at least
one of remote port forwardings fails for some reason.
The argument to this keyword must be
.Dq yes
or
.Dq no .
The default is
.Dq no .
.It Cm RhostsRSAAuthentication
Specifies whether to try rhosts based authentication with RSA host
authentication.

Return to bug 1103

Lines 547-552 Link Here

(-)ssh_config.5 (+11 lines)
547	Multiple forwardings may be specified, and additional	547	Multiple forwardings may be specified, and additional
548	forwardings can be given on the command line.	548	forwardings can be given on the command line.
549	Only the superuser can forward privileged ports.	549	Only the superuser can forward privileged ports.
		550	.It Cm RemoteForwardIsRequired
		551	If this flag is set to
		552	.Dq yes ,
		553	the client will exit with error code if attempt to establish at least
		554	one of remote port forwardings fails for some reason.
		555	The argument to this keyword must be
		556	.Dq yes
		557	or
		558	.Dq no .
		559	The default is
		560	.Dq no .
550	.It Cm RhostsRSAAuthentication	561	.It Cm RhostsRSAAuthentication
551	Specifies whether to try rhosts based authentication with RSA host	562	Specifies whether to try rhosts based authentication with RSA host
552	authentication.	563	authentication.