Attachment 1959 Details for Bug 1765 – Diff of manually applied patch

Diff of manually applied patch

diff.txt (text/plain), 1.05 KB, created by Anders Liljegren on 2010-11-22 20:24:02 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Anders Liljegren

Created: 2010-11-22 20:24:02 AEDT

Size: 1.05 KB

patch

obsolete

>--- auth2-pubkey.c.orig	2010-03-21 19:51:21.000000000 +0100
>+++ auth2-pubkey.c	2010-05-20 14:07:30.000000000 +0200
>@@ -233,13 +233,14 @@
> 				continue;
> 			}
> 		}
>-		if (auth_parse_options(pw, key_options, file, linenum) != 1)
>-			continue;
> 		if (key->type == KEY_RSA_CERT || key->type == KEY_DSA_CERT) {
>-			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",
>@@ -262,7 +263,12 @@
> 			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

Attachments on bug 1765: 1848 | 1959