Attachment 3387 Details for Bug 3153 – identitiesOnly=explicit

[patch] identitiesOnly=explicit

identitiesonly-explicit.diff (text/plain), 1.37 KB, created by Damien Miller on 2020-04-24 14:58:28 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2020-04-24 14:58:28 AEST

Size: 1.37 KB

patch

obsolete

>diff --git a/readconf.c b/readconf.c
>index 0e1c440..09a1812 100644
>--- a/readconf.c
>+++ b/readconf.c
>@@ -786,6 +786,14 @@ static const struct multistate multistate_yesnoask[] = {
> 	{ "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 },
>@@ -1454,7 +1462,8 @@ parse_keytypes:
> 
> 	case oIdentitiesOnly:
> 		intptr = &options->identities_only;
>-		goto parse_flag;
>+		multistate_ptr = multistate_yesnoexplicit;
>+		goto parse_multistate;
> 
> 	case oServerAliveInterval:
> 		intptr = &options->server_alive_interval;
>diff --git a/sshconnect2.c b/sshconnect2.c
>index ad45598..11d2d8e 100644
>--- a/sshconnect2.c
>+++ b/sshconnect2.c
>@@ -1638,7 +1638,12 @@ pubkey_prepare(Authctxt *authctxt)
> 					break;
> 				}
> 			}
>-			if (!found && !options.identities_only) {
>+			/*
>+			 * If the agent key was not also listed in the config,
>+			 * and the user has not set IdentitiesOnly=explicit,
>+			 * then queue the agent key for implicit use.
>+			 */
>+			if (!found && options.identities_only != 1) {
> 				id = xcalloc(1, sizeof(*id));
> 				/* XXX "steals" key/comment from idlist */
> 				id->key = idlist->keys[j];

Actions: View | Diff

Attachments on bug 3153: 3385 | 3387