Attachment 1848 Details for Bug 1765 – delay-options-parse.diff

[patch] delay-options-parse.diff

delay-options-parse.diff (text/plain), 1.27 KB, created by Damien Miller on 2010-05-12 16:23:22 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2010-05-12 16:23:22 AEST

Size: 1.27 KB

patch

obsolete

>Index: auth2-pubkey.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/auth2-pubkey.c,v
>retrieving revision 1.24
>diff -u -p -r1.24 auth2-pubkey.c
>--- auth2-pubkey.c	7 May 2010 11:30:29 -0000	1.24
>+++ auth2-pubkey.c	10 May 2010 01:35:51 -0000
>@@ -290,13 +290,14 @@ user_key_allowed2(struct passwd *pw, Key
> 				continue;
> 			}
> 		}
>-		if (auth_parse_options(pw, key_options, file, linenum) != 1)
>-			continue;
> 		if (key_is_cert(key)) {
>-			if (!key_is_cert_authority)
>-				continue;
> 			if (!key_equal(found, key->cert->signature_key))
> 				continue;
>+			if (auth_parse_options(pw, key_options, file,
>+			    linenum) != 1)
>+				continue;
>+			if (!key_is_cert_authority)
>+				continue;
> 			fp = key_fingerprint(found, SSH_FP_MD5,
> 			    SSH_FP_HEX);
> 			debug("matching CA found: file %s, line %lu, %s %s",
>@@ -331,7 +332,12 @@ user_key_allowed2(struct passwd *pw, Key
> 			xfree(fp);
> 			found_key = 1;
> 			break;
>-		} else if (!key_is_cert_authority && key_equal(found, key)) {
>+		} else if (key_equal(found, key)) {
>+			if (auth_parse_options(pw, key_options, file,
>+			    linenum) != 1)
>+				continue;
>+			if (key_is_cert_authority)
>+				continue;
> 			found_key = 1;
> 			debug("matching key found: file %s, line %lu",
> 			    file, linenum);

Actions: View | Diff

Attachments on bug 1765: 1848 | 1959