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

Collapse All | Expand All

(-)a/ssh.c (-3 / +2 lines)
Lines 1154-1161 main(int ac, char **av) Link Here
1154
		options.use_privileged_port = 0;
1154
		options.use_privileged_port = 0;
1155
#endif
1155
#endif
1156
1156
1157
	if (buffer_len(&command) != 0 && options.remote_command != NULL)
1157
	if (buffer_len(&command) != 0) options.remote_command = NULL;
1158
		fatal("Cannot execute command-line and remote command.");
1159
1158
1160
	/* Cannot fork to background if no command. */
1159
	/* Cannot fork to background if no command. */
1161
	if (fork_after_authentication_flag && buffer_len(&command) == 0 &&
1160
	if (fork_after_authentication_flag && buffer_len(&command) == 0 &&
Lines 1171-1177 main(int ac, char **av) Link Here
1171
		tty_flag = 1;
1156
		tty_flag = 1;
1172
1157
1173
	/* Allocate a tty by default if no command specified. */
1158
	/* Allocate a tty by default if no command specified. */
1174
	if (buffer_len(&command) == 0 && options.remote_command == NULL)
1159
	if (buffer_len(&command) == 0 || options.remote_command != NULL)
1175
		tty_flag = options.request_tty != REQUEST_TTY_NO;
1160
		tty_flag = options.request_tty != REQUEST_TTY_NO;
1176
1161
1177
	/* Force no tty */
1162
	/* Force no tty */

Return to bug 2103