Attachment #2202 for bug #2053

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

Lines 132-138 Link Here

(-)ssh/readconf.c (-1 / +10 lines)
132	oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,	132	oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
133	oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,	133	oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication,
134	oKexAlgorithms, oIPQoS, oRequestTTY,	134	oKexAlgorithms, oIPQoS, oRequestTTY,
135	oDeprecated, oUnsupported	135	oDeprecated, oUnsupported,
		136	oSkipBanner
136	} OpCodes;	137	} OpCodes;
137		138
138	/* Textual representations of the tokens. */	139	/* Textual representations of the tokens. */
Lines 243-248 Link Here
243	{ "kexalgorithms", oKexAlgorithms },	244	{ "kexalgorithms", oKexAlgorithms },
244	{ "ipqos", oIPQoS },	245	{ "ipqos", oIPQoS },
245	{ "requesttty", oRequestTTY },	246	{ "requesttty", oRequestTTY },
		247	{ "skipbanner", oSkipBanner },
246		248
247	{ NULL, oBadOption }	249	{ NULL, oBadOption }
248	};	250	};
Lines 1040-1045 Link Here
1040	*intptr = value;	1042	*intptr = value;
1041	break;	1043	break;
1042		1044
		1045	case oSkipBanner:
		1046	intptr = &options->skip_banner;
		1047	goto parse_flag;
		1048
1043	case oDeprecated:	1049	case oDeprecated:
1044	debug("%s line %d: Deprecated option \"%s\"",	1050	debug("%s line %d: Deprecated option \"%s\"",
1045	filename, linenum, keyword);	1051	filename, linenum, keyword);
Lines 1199-1204 Link Here
1199	options->ip_qos_interactive = -1;	1205	options->ip_qos_interactive = -1;
1200	options->ip_qos_bulk = -1;	1206	options->ip_qos_bulk = -1;
1201	options->request_tty = -1;	1207	options->request_tty = -1;
		1208	options->skip_banner = -1;
1202	}	1209	}
1203		1210
1204	/*	1211	/*
Lines 1368-1373 Link Here
1368	/* options->hostname will be set in the main program if appropriate */	1375	/* options->hostname will be set in the main program if appropriate */
1369	/* options->host_key_alias should not be set by default */	1376	/* options->host_key_alias should not be set by default */
1370	/* options->preferred_authentications will be set in ssh */	1377	/* options->preferred_authentications will be set in ssh */
		1378	if (options->skip_banner == -1)
		1379	options->skip_banner = 0;
1371	}	1380	}
1372		1381
1373	/*	1382	/*

Lines 135-140 Link Here

(-)ssh/readconf.h (+1 lines)
135	int use_roaming;	135	int use_roaming;
136		136
137	int request_tty;	137	int request_tty;
		138	int skip_banner;
138	} Options;	139	} Options;
139		140
140	#define SSHCTL_MASTER_NO 0	141	#define SSHCTL_MASTER_NO 0

Lines 1066-1071 Link Here

(-)ssh/ssh_config.5 (+2 lines)
1066	The default	1066	The default
1067	is 0, indicating that these messages will not be sent to the server.	1067	is 0, indicating that these messages will not be sent to the server.
1068	This option applies to protocol version 2 only.	1068	This option applies to protocol version 2 only.
		1069	.It Cm SkipBanner
		1070	Setting this option will hide the banner displayed during authentication.
1069	.It Cm StrictHostKeyChecking	1071	.It Cm StrictHostKeyChecking
1070	If this flag is set to	1072	If this flag is set to
1071	.Dq yes ,	1073	.Dq yes ,

Lines 473-479 Link Here

(-)ssh/sshconnect2.c (-1 / +1 lines)
473	debug3("input_userauth_banner");	473	debug3("input_userauth_banner");
474	raw = packet_get_string(&len);	474	raw = packet_get_string(&len);
475	lang = packet_get_string(NULL);	475	lang = packet_get_string(NULL);
476	if (len > 0 && options.log_level >= SYSLOG_LEVEL_INFO) {	476	if (len > 0 && options.log_level >= SYSLOG_LEVEL_INFO && !options.skip_banner) {
477	if (len > 65536)	477	if (len > 65536)
478	len = 65536;	478	len = 65536;
479	msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */	479	msg = xmalloc(len * 4 + 1); /* max expansion from strnvis() */

Return to bug 2053