summaryrefslogtreecommitdiff
path: root/authfile.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-12 19:42:29 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-12 19:42:29 +1100
commit69c01b1c4a9068478174b9cc39eb9957e78416a6 (patch)
treed1a14791528dd6c6fe2e2349c7a52bdd1ae1426b /authfile.c
parentd04758dc4c001104933ce3e2088ac46d461ec1f1 (diff)
downloadopenssh-git-69c01b1c4a9068478174b9cc39eb9957e78416a6.tar.gz
- 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.
Diffstat (limited to 'authfile.c')
-rw-r--r--authfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/authfile.c b/authfile.c
index 23535fa0..2c615709 100644
--- 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;