Attachment #3188 for bug #2670

Lines 147-153 Link Here

(-)openssh-7.7p1/readconf.c (-1 / +9 lines)
147	oPasswordAuthentication, oRSAAuthentication,	147	oPasswordAuthentication, oRSAAuthentication,
148	oChallengeResponseAuthentication, oXAuthLocation,	148	oChallengeResponseAuthentication, oXAuthLocation,
149	oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,	149	oIdentityFile, oHostName, oPort, oCipher, oRemoteForward, oLocalForward,
150	oCertificateFile, oAddKeysToAgent, oIdentityAgent,	150	oCertificateFile, oAddKeysToAgent, oAddKeysToAgentTimeout, oIdentityAgent,
151	oUser, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,	151	oUser, oEscapeChar, oRhostsRSAAuthentication, oProxyCommand,
152	oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,	152	oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
153	oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,	153	oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
Lines 237-242 Link Here
237	{ "identitiesonly", oIdentitiesOnly },	237	{ "identitiesonly", oIdentitiesOnly },
238	{ "certificatefile", oCertificateFile },	238	{ "certificatefile", oCertificateFile },
239	{ "addkeystoagent", oAddKeysToAgent },	239	{ "addkeystoagent", oAddKeysToAgent },
		240	{ "addkeystoagenttimeout", oAddKeysToAgentTimeout },
240	{ "identityagent", oIdentityAgent },	241	{ "identityagent", oIdentityAgent },
241	{ "hostname", oHostName },	242	{ "hostname", oHostName },
242	{ "hostkeyalias", oHostKeyAlias },	243	{ "hostkeyalias", oHostKeyAlias },
Lines 1640-1645 Link Here
1640	multistate_ptr = multistate_yesnoaskconfirm;	1641	multistate_ptr = multistate_yesnoaskconfirm;
1641	goto parse_multistate;	1642	goto parse_multistate;
1642		1643
		1644	case oAddKeysToAgentTimeout:
		1645	intptr = &options->add_keys_to_agent_timeout;
		1646	goto parse_time;
		1647
1643	case oIdentityAgent:	1648	case oIdentityAgent:
1644	charptr = &options->identity_agent;	1649	charptr = &options->identity_agent;
1645	goto parse_string;	1650	goto parse_string;
Lines 1828-1833 Link Here
1828	options->permit_local_command = -1;	1833	options->permit_local_command = -1;
1829	options->remote_command = NULL;	1834	options->remote_command = NULL;
1830	options->add_keys_to_agent = -1;	1835	options->add_keys_to_agent = -1;
		1836	options->add_keys_to_agent_timeout = -1;
1831	options->identity_agent = NULL;	1837	options->identity_agent = NULL;
1832	options->visual_host_key = -1;	1838	options->visual_host_key = -1;
1833	options->ip_qos_interactive = -1;	1839	options->ip_qos_interactive = -1;
Lines 1935-1940 Link Here
1935	/* options->hostkeyalgorithms, default set in myproposals.h */	1941	/* options->hostkeyalgorithms, default set in myproposals.h */
1936	if (options->add_keys_to_agent == -1)	1942	if (options->add_keys_to_agent == -1)
1937	options->add_keys_to_agent = 0;	1943	options->add_keys_to_agent = 0;
		1944	if (options->add_keys_to_agent_timeout == -1)
		1945	options->add_keys_to_agent_timeout = 0;
1938	if (options->num_identity_files == 0) {	1946	if (options->num_identity_files == 0) {
1939	add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA, 0);	1947	add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_RSA, 0);
1940	add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_DSA, 0);	1948	add_identity_file(options, "~/", _PATH_SSH_CLIENT_ID_DSA, 0);

Lines 96-101 Link Here

(-)openssh-7.7p1/readconf.h (+1 lines)
96	struct sshkey *certificates[SSH_MAX_CERTIFICATE_FILES];	96	struct sshkey *certificates[SSH_MAX_CERTIFICATE_FILES];
97		97
98	int add_keys_to_agent;	98	int add_keys_to_agent;
		99	int add_keys_to_agent_timeout;
99	char identity_agent; / Optional path to ssh-agent socket */	100	char identity_agent; / Optional path to ssh-agent socket */
100		101
101	/* Local TCP/IP forward requests. */	102	/* Local TCP/IP forward requests. */

Lines 228-233 Link Here

(-)openssh-7.7p1/ssh.0 (+1 lines)
228	ssh_config(5).	228	ssh_config(5).
229		229
230	AddKeysToAgent	230	AddKeysToAgent
		231	AddKeysToAgentTimeout
231	AddressFamily	232	AddressFamily
232	BatchMode	233	BatchMode
233	BindAddress	234	BindAddress

Lines 458-463 Link Here

(-)openssh-7.7p1/ssh.1 (+1 lines)
458	.Pp	458	.Pp
459	.Bl -tag -width Ds -offset indent -compact	459	.Bl -tag -width Ds -offset indent -compact
460	.It AddKeysToAgent	460	.It AddKeysToAgent
		461	.It AddKeysToAgentTimeout
461	.It AddressFamily	462	.It AddressFamily
462	.It BatchMode	463	.It BatchMode
463	.It BindAddress	464	.It BindAddress

Lines 95-100 Link Here

(-)openssh-7.7p1/ssh_config.0 (+5 lines)
95	the agent. The argument must be yes, confirm, ask, or no (the	95	the agent. The argument must be yes, confirm, ask, or no (the
96	default).	96	default).
97		97
		98	AddKeysToAgentTimeout
		99	Specifies a timeout for keys added to the agent automatically
		100	with AddKeysToAgent. The format used is described in the TIME
		101	FORMATS section of sshd_config(5).
		102
98	AddressFamily	103	AddressFamily
99	Specifies which address family to use when connecting. Valid	104	Specifies which address family to use when connecting. Valid
100	arguments are any (the default), inet (use IPv4 only), or inet6	105	arguments are any (the default), inet (use IPv4 only), or inet6

Lines 234-239 Link Here

(-)openssh-7.7p1/ssh_config.5 (+8 lines)
234	or	234	or
235	.Cm no	235	.Cm no
236	(the default).	236	(the default).
		237	.It Cm AddKeysToAgentTimeout
		238	Specifies a timeout for keys added to the agent automatically
		239	with
		240	.Cm AddKeysToAgent .
		241	The format used is described in the
		242	.Sx TIME FORMATS
		243	section of
		244	.Xr sshd_config 5 .
237	.It Cm AddressFamily	245	.It Cm AddressFamily
238	Specifies which address family to use when connecting.	246	Specifies which address family to use when connecting.
239	Valid arguments are	247	Valid arguments are

Lines 1592-1598 Link Here

(-)openssh-7.7p1/sshconnect.c (-1 / +2 lines)
1592	return;	1592	return;
1593	}	1593	}
1594		1594
1595	if ((r = ssh_add_identity_constrained(auth_sock, private, comment, 0,	1595	if ((r = ssh_add_identity_constrained(auth_sock, private, comment,
		1596	options.add_keys_to_agent_timeout,
1596	(options.add_keys_to_agent == 3), 0)) == 0)	1597	(options.add_keys_to_agent == 3), 0)) == 0)
1597	debug("identity added to agent: %s", authfile);	1598	debug("identity added to agent: %s", authfile);
1598	else	1599	else

Return to bug 2670