- dtucker@cvs.openbsd.org 2010/01/12 00:16:47

     [authfile.c]
     Fix bug introduced in r1.78 (incorrect brace location) that broke key auth.
     Patch from joachim joachimschipper nl.

diff --git a/ChangeLog b/ChangeLog
index a9ae9ea3e162c18d0c9d1186858bff42508185bc..688e8c109f819baec91a12c2f93cb12354de16f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
      [ssh-keygen.c]
      when converting keys, truncate key comments at 72 chars as per RFC4716;
      bz#1630 reported by tj AT castaglia.org; ok markus@
+   - dtucker@cvs.openbsd.org 2010/01/12 00:16:47
+     [authfile.c]
+     Fix bug introduced in r1.78 (incorrect brace location) that broke key auth.
+     Patch from joachim joachimschipper nl.
 
 20100110
  - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]

diff --git a/authfile.c b/authfile.c
index 23535fa07996f8b6d0b0ff6540c471b4c29f43e5..2c615709da7a4dd2eec1896fbfcb00dc8ca91e62 100644 (file)
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.78 2010/01/11 04:46:45 dtucker Exp $ */
+/* $OpenBSD: authfile.c,v 1.79 2010/01/12 00:16:47 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -564,8 +564,8 @@ key_load_private_type(int type, const char *filename, const char *passphrase,
                    strerror(errno));
                if (perm_ok != NULL)
                        *perm_ok = 0;
-       }
                return NULL;
+       }
        if (!key_perm_ok(fd, filename)) {
                if (perm_ok != NULL)
                        *perm_ok = 0;