Attachment #2647 for bug #1585




	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
	oSendEnv, oControlPath, oControlMaster, oControlPersist,
	oHashKnownHosts, oInclude,
	oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
	oVisualHostKey, oUseRoaming,
	oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,

	{ "controlmaster", oControlMaster },
	{ "controlpersist", oControlPersist },
	{ "hashknownhosts", oHashKnownHosts },
	{ "include", oInclude },
	{ "tunnel", oTunnel },
	{ "tunneldevice", oTunnelDevice },
	{ "localcommand", oLocalCommand },

		intptr = &options->visual_host_key;
		goto parse_flag;

	case oInclude:
		arg = strdelim(&s);
		if (!arg || *arg == '\0')
			fatal("%.200s line %d: Missing argument.", filename, linenum);
		char *readfile = NULL;
		int ret = 0, r, i;
		glob_t gbuf;
		readfile = tilde_expand_filename(arg, getuid());
		glob(readfile, 0, NULL, &gbuf);
		for (i = 0; i < gbuf.gl_pathc; i++) {
			debug3("%.200s line %s: Including configuration file %s",
				filename, linenum, gbuf.gl_pathv[i]);
			r = read_config_file(gbuf.gl_pathv[i], pw, host,
				original_host, options, 1);
			// non-existing files are not returned from glob
			ret = ret || (r != 1);
		}
		globfree(&gbuf);
		free(readfile);
		if (ret)
			return ret;
		break;

	case oIPQoS:
		arg = strdelim(&s);
		if ((value = parse_ipqos(arg)) == -1)

Lines 451-456 For full details of the options listed below, and their possible values, see Link Here

(-)a/ssh.1 (+1 lines)
451	.It HostName	451	.It HostName
452	.It IdentityFile	452	.It IdentityFile
453	.It IdentitiesOnly	453	.It IdentitiesOnly
		454	.It Include
454	.It IPQoS	455	.It IPQoS
455	.It KbdInteractiveAuthentication	456	.It KbdInteractiveAuthentication
456	.It KbdInteractiveDevices	457	.It KbdInteractiveDevices




.Cm IgnoreUnknown
be listed early in the configuration file as it will not be applied
to unknown options that appear before it.
.It Cm Include
Read the specified files as if their contents were pasted here.
Files of the form
.Dq ~/path/to/config
will expand to
.Dq $HOME/path/to/config
where
.Dq $HOME
is the user's home directoy.
Files of the form
.Dq ~username/path/to/config
will expand to
.Dq $HOME/path/to/config
where
.Dq $HOME
is
.Dq username
\'s home directory.
A single
.Dq ~
will not expand at all.
Bad error counts are unique to each configuration file.
Additionally you can specify wildcard character to include all matching
files, for exanple "~/.ssh/conf.d/*.conf".
.It Cm IPQoS
Specifies the IPv4 type-of-service or DSCP class for connections.
Accepted values are

Return to bug 1585

Lines 149-155 typedef enum { Link Here

(-)a/readconf.c (-1 / +25 lines)
149	oAddressFamily, oGssAuthentication, oGssDelegateCreds,	149	oAddressFamily, oGssAuthentication, oGssDelegateCreds,
150	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,	150	oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
151	oSendEnv, oControlPath, oControlMaster, oControlPersist,	151	oSendEnv, oControlPath, oControlMaster, oControlPersist,
152	oHashKnownHosts,	152	oHashKnownHosts, oInclude,
153	oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,	153	oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
154	oVisualHostKey, oUseRoaming,	154	oVisualHostKey, oUseRoaming,
155	oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,	155	oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass,
Lines 254-259 static struct { Link Here
254	{ "controlmaster", oControlMaster },	254	{ "controlmaster", oControlMaster },
255	{ "controlpersist", oControlPersist },	255	{ "controlpersist", oControlPersist },
256	{ "hashknownhosts", oHashKnownHosts },	256	{ "hashknownhosts", oHashKnownHosts },
		257	{ "include", oInclude },
257	{ "tunnel", oTunnel },	258	{ "tunnel", oTunnel },
258	{ "tunneldevice", oTunnelDevice },	259	{ "tunneldevice", oTunnelDevice },
259	{ "localcommand", oLocalCommand },	260	{ "localcommand", oLocalCommand },
Lines 1356-1361 parse_int: Link Here
1356	intptr = &options->visual_host_key;	1357	intptr = &options->visual_host_key;
1357	goto parse_flag;	1358	goto parse_flag;
1358		1359
		1360	case oInclude:
		1361	arg = strdelim(&s);
		1362	if (!arg \|\| *arg == '\0')
		1363	fatal("%.200s line %d: Missing argument.", filename, linenum);
		1364	char *readfile = NULL;
		1365	int ret = 0, r, i;
		1366	glob_t gbuf;
		1367	readfile = tilde_expand_filename(arg, getuid());
		1368	glob(readfile, 0, NULL, &gbuf);
		1369	for (i = 0; i < gbuf.gl_pathc; i++) {
		1370	debug3("%.200s line %s: Including configuration file %s",
		1371	filename, linenum, gbuf.gl_pathv[i]);
		1372	r = read_config_file(gbuf.gl_pathv[i], pw, host,
		1373	original_host, options, 1);
		1374	// non-existing files are not returned from glob
		1375	ret = ret \|\| (r != 1);
		1376	}
		1377	globfree(&gbuf);
		1378	free(readfile);
		1379	if (ret)
		1380	return ret;
		1381	break;
		1382
1359	case oIPQoS:	1383	case oIPQoS:
1360	arg = strdelim(&s);	1384	arg = strdelim(&s);
1361	if ((value = parse_ipqos(arg)) == -1)	1385	if ((value = parse_ipqos(arg)) == -1)

Lines 915-920 It is recommended that Link Here

(-)a/ssh_config.5 (+24 lines)
915	.Cm IgnoreUnknown	915	.Cm IgnoreUnknown
916	be listed early in the configuration file as it will not be applied	916	be listed early in the configuration file as it will not be applied
917	to unknown options that appear before it.	917	to unknown options that appear before it.
		918	.It Cm Include
		919	Read the specified files as if their contents were pasted here.
		920	Files of the form
		921	.Dq ~/path/to/config
		922	will expand to
		923	.Dq $HOME/path/to/config
		924	where
		925	.Dq $HOME
		926	is the user's home directoy.
		927	Files of the form
		928	.Dq ~username/path/to/config
		929	will expand to
		930	.Dq $HOME/path/to/config
		931	where
		932	.Dq $HOME
		933	is
		934	.Dq username
		935	\'s home directory.
		936	A single
		937	.Dq ~
		938	will not expand at all.
		939	Bad error counts are unique to each configuration file.
		940	Additionally you can specify wildcard character to include all matching
		941	files, for exanple "~/.ssh/conf.d/*.conf".
918	.It Cm IPQoS	942	.It Cm IPQoS
919	Specifies the IPv4 type-of-service or DSCP class for connections.	943	Specifies the IPv4 type-of-service or DSCP class for connections.
920	Accepted values are	944	Accepted values are