Attachment #303 for bug #534

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




	oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
	oAddressFamily,
	oDeprecated, oUnsupported
} OpCodes;


	{ "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
	{ "rekeylimit", oRekeyLimit },
	{ "connecttimeout", oConnectTimeout },
	{ "addressfamily", oAddressFamily },
	{ NULL, oBadOption }
};


	size_t len;
	u_short fwd_port, fwd_host_port;
	char sfwd_host_port[6];
	extern int IPv4or6;

	/* Strip trailing whitespace */
	for(len = strlen(line) - 1; len > 0; len--) {

		}
		if (*activep && *intptr == -1)
			*intptr = value;
		break;

	case oAddressFamily:
		arg = strdelim(&s);
		if (strcasecmp(arg, "inet") == 0)
			IPv4or6 = AF_INET;
		else if (strcasecmp(arg, "inet6") == 0)
			IPv4or6 = AF_INET6;
		else if (strcasecmp(arg, "any") == 0)
			IPv4or6 = AF_UNSPEC;
		else
			fatal("Unsupported AddressFamily \"%s\"", arg);
		break;

	case oEnableSSHKeysign:

Lines 42-48 Link Here

(-)ssh-keysign.c (-1 / +3 lines)
42	#include "pathnames.h"	42	#include "pathnames.h"
43	#include "readconf.h"	43	#include "readconf.h"
44		44
45	uid_t original_real_uid; /* XXX readconf.c needs this */	45	/* XXX readconf.c needs these */
		46	uid_t original_real_uid;
		47	int IPv4or6;
46		48
47	static int	49	static int
48	valid_request(struct passwd pw, char host, Key *ret, u_char data,	50	valid_request(struct passwd pw, char host, Key *ret, u_char data,

Lines 25-30 Link Here

(-)ssh_config (+1 lines)
25	# HostbasedAuthentication no	25	# HostbasedAuthentication no
26	# BatchMode no	26	# BatchMode no
27	# CheckHostIP yes	27	# CheckHostIP yes
		28	# AddressFamily any
28	# ConnectTimeout 0	29	# ConnectTimeout 0
29	# StrictHostKeyChecking ask	30	# StrictHostKeyChecking ask
30	# IdentityFile ~/.ssh/identity	31	# IdentityFile ~/.ssh/identity

Lines 115-120 Link Here

(-)ssh_config.5 (+7 lines)
115	.Ar hostname	115	.Ar hostname
116	argument given on the command line (i.e., the name is not converted to	116	argument given on the command line (i.e., the name is not converted to
117	a canonicalized host name before matching).	117	a canonicalized host name before matching).
		118	.It Cm AddressFamily
		119	Specifies which address family to use when connecting. Valid arguments are
		120	.Dq any ,
		121	.Dq inet
		122	(Use IPv4 only) or
		123	.Dq inet6
		124	(Use IPv6 only.)
118	.It Cm AFSTokenPassing	125	.It Cm AFSTokenPassing
119	Specifies whether to pass AFS tokens to remote host.	126	Specifies whether to pass AFS tokens to remote host.
120	The argument to this keyword must be	127	The argument to this keyword must be

Return to bug 534

Lines 107-112 Link Here

(-)readconf.c (+15 lines)
107	oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,	107	oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
108	oClearAllForwardings, oNoHostAuthenticationForLocalhost,	108	oClearAllForwardings, oNoHostAuthenticationForLocalhost,
109	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,	109	oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
		110	oAddressFamily,
110	oDeprecated, oUnsupported	111	oDeprecated, oUnsupported
111	} OpCodes;	112	} OpCodes;
112		113
Lines 194-199 Link Here
194	{ "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },	195	{ "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost },
195	{ "rekeylimit", oRekeyLimit },	196	{ "rekeylimit", oRekeyLimit },
196	{ "connecttimeout", oConnectTimeout },	197	{ "connecttimeout", oConnectTimeout },
		198	{ "addressfamily", oAddressFamily },
197	{ NULL, oBadOption }	199	{ NULL, oBadOption }
198	};	200	};
199		201
Lines 284-289 Link Here
284	size_t len;	286	size_t len;
285	u_short fwd_port, fwd_host_port;	287	u_short fwd_port, fwd_host_port;
286	char sfwd_host_port[6];	288	char sfwd_host_port[6];
		289	extern int IPv4or6;
287		290
288	/* Strip trailing whitespace */	291	/* Strip trailing whitespace */
289	for(len = strlen(line) - 1; len > 0; len--) {	292	for(len = strlen(line) - 1; len > 0; len--) {
Lines 716-721 Link Here
716	}	719	}
717	if (activep && intptr == -1)	720	if (activep && intptr == -1)
718	*intptr = value;	721	*intptr = value;
		722	break;
		723
		724	case oAddressFamily:
		725	arg = strdelim(&s);
		726	if (strcasecmp(arg, "inet") == 0)
		727	IPv4or6 = AF_INET;
		728	else if (strcasecmp(arg, "inet6") == 0)
		729	IPv4or6 = AF_INET6;
		730	else if (strcasecmp(arg, "any") == 0)
		731	IPv4or6 = AF_UNSPEC;
		732	else
		733	fatal("Unsupported AddressFamily \"%s\"", arg);
719	break;	734	break;
720		735
721	case oEnableSSHKeysign:	736	case oEnableSSHKeysign: