Attachment #3387 for bug #3153




	{ "ask",			2 },
	{ NULL, -1 }
};
static const struct multistate multistate_yesnoexplicit[] = {
	{ "true",			1 },
	{ "false",			0 },
	{ "yes",			1 },
	{ "no",				0 },
	{ "explicit",			2 },
	{ NULL, -1 }
};
static const struct multistate multistate_strict_hostkey[] = {
	{ "true",			SSH_STRICT_HOSTKEY_YES },
	{ "false",			SSH_STRICT_HOSTKEY_OFF },


	case oIdentitiesOnly:
		intptr = &options->identities_only;
		multistate_ptr = multistate_yesnoexplicit;
		goto parse_multistate;

	case oServerAliveInterval:
		intptr = &options->server_alive_interval;

Lines 1638-1644 pubkey_prepare(Authctxt *authctxt) Link Here

(-)a/sshconnect2.c (-1 / +6 lines)
1638	break;	1638	break;
1639	}	1639	}
1640	}	1640	}
1641	if (!found && !options.identities_only) {	1641	/*
		1642	* If the agent key was not also listed in the config,
		1643	* and the user has not set IdentitiesOnly=explicit,
		1644	* then queue the agent key for implicit use.
		1645	*/
		1646	if (!found && options.identities_only != 1) {
1642	id = xcalloc(1, sizeof(*id));	1647	id = xcalloc(1, sizeof(*id));
1643	/* XXX "steals" key/comment from idlist */	1648	/* XXX "steals" key/comment from idlist */
1644	id->key = idlist->keys[j];	1649	id->key = idlist->keys[j];

Return to bug 3153

Lines 786-791 static const struct multistate multistate_yesnoask[] = { Link Here

(-)a/readconf.c (-1 / +10 lines)
786	{ "ask", 2 },	786	{ "ask", 2 },
787	{ NULL, -1 }	787	{ NULL, -1 }
788	};	788	};
		789	static const struct multistate multistate_yesnoexplicit[] = {
		790	{ "true", 1 },
		791	{ "false", 0 },
		792	{ "yes", 1 },
		793	{ "no", 0 },
		794	{ "explicit", 2 },
		795	{ NULL, -1 }
		796	};
789	static const struct multistate multistate_strict_hostkey[] = {	797	static const struct multistate multistate_strict_hostkey[] = {
790	{ "true", SSH_STRICT_HOSTKEY_YES },	798	{ "true", SSH_STRICT_HOSTKEY_YES },
791	{ "false", SSH_STRICT_HOSTKEY_OFF },	799	{ "false", SSH_STRICT_HOSTKEY_OFF },
Lines 1454-1460 parse_keytypes: Link Here
1454		1462
1455	case oIdentitiesOnly:	1463	case oIdentitiesOnly:
1456	intptr = &options->identities_only;	1464	intptr = &options->identities_only;
1457	goto parse_flag;	1465	multistate_ptr = multistate_yesnoexplicit;
		1466	goto parse_multistate;
1458		1467
1459	case oServerAliveInterval:	1468	case oServerAliveInterval:
1460	intptr = &options->server_alive_interval;	1469	intptr = &options->server_alive_interval;