openssh unix dev - Jan 2010 - [patch] Make keys work again

This patch makes keys work again. This bug was introduced in r1.78:
http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/authfile.c.diff?r1=1.77;r2=1.78.

		Joachim

Index: authfile.c
==================================================================RCS file:
/usr/obsd-repos/src/usr.bin/ssh/authfile.c,v
retrieving revision 1.78
diff -u -N -p authfile.c
--- authfile.c	11 Jan 2010 04:46:45 -0000	1.78
+++ authfile.c	11 Jan 2010 22:35:04 -0000
@@ -552,8 +552,8 @@ key_load_private_type(int type, const char
*filename, 
 		    strerror(errno));
 		if (perm_ok != NULL)
 			*perm_ok = 0;
-	}
 		return NULL;
+	}
 	if (!key_perm_ok(fd, filename)) {
 		if (perm_ok != NULL)
 			*perm_ok = 0;

Joachim Schipper wrote:
> This patch makes keys work again. This bug was introduced in r1.78:
>
http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/authfile.c.diff?r1=1.77;r2=1.78.
Doh (*hangs head in shame*).  Patch applied, thanks.

-- 
Darren Tucker (dtucker at zip.com.au)
GPG key 8FF4FA69 / D9A3 86E9 7EEE AF4B B2D4  37C9 C982 80C7 8FF4 FA69
     Good judgement comes with experience. Unfortunately, the experience
usually comes from bad judgement.