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

Collapse All | Expand All

(-)a/sshconnect2.c (-2 / +4 lines)
Lines 379-385 ssh_userauth2(const char *local_user, const char *server_user, char *host, Link Here
379
379
380
	/* setup authentication context */
380
	/* setup authentication context */
381
	memset(&authctxt, 0, sizeof(authctxt));
381
	memset(&authctxt, 0, sizeof(authctxt));
382
	pubkey_prepare(&authctxt);
383
	authctxt.server_user = server_user;
382
	authctxt.server_user = server_user;
384
	authctxt.local_user = local_user;
383
	authctxt.local_user = local_user;
385
	authctxt.host = host;
384
	authctxt.host = host;
Lines 392-397 ssh_userauth2(const char *local_user, const char *server_user, char *host, Link Here
392
	authctxt.active_ktype = authctxt.oktypes = authctxt.ktypes = NULL;
391
	authctxt.active_ktype = authctxt.oktypes = authctxt.ktypes = NULL;
393
	authctxt.info_req_seen = 0;
392
	authctxt.info_req_seen = 0;
394
	authctxt.agent_fd = -1;
393
	authctxt.agent_fd = -1;
394
	pubkey_prepare(&authctxt);
395
	if (authctxt.method == NULL)
395
	if (authctxt.method == NULL)
396
		fatal("ssh_userauth2: internal error: cannot send userauth none request");
396
		fatal("ssh_userauth2: internal error: cannot send userauth none request");
397
397
Lines 1619-1626 pubkey_cleanup(Authctxt *authctxt) Link Here
1619
{
1619
{
1620
	Identity *id;
1620
	Identity *id;
1621
1621
1622
	if (authctxt->agent_fd != -1)
1622
	if (authctxt->agent_fd != -1) {
1623
		ssh_close_authentication_socket(authctxt->agent_fd);
1623
		ssh_close_authentication_socket(authctxt->agent_fd);
1624
		authctxt->agent_fd = -1;
1625
	}
1624
	for (id = TAILQ_FIRST(&authctxt->keys); id;
1626
	for (id = TAILQ_FIRST(&authctxt->keys); id;
1625
	    id = TAILQ_FIRST(&authctxt->keys)) {
1627
	    id = TAILQ_FIRST(&authctxt->keys)) {
1626
		TAILQ_REMOVE(&authctxt->keys, id, next);
1628
		TAILQ_REMOVE(&authctxt->keys, id, next);

Return to bug 2913