summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/authfile.c
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2010-01-12 00:16:47 +0000
committerdtucker <dtucker@openbsd.org>2010-01-12 00:16:47 +0000
commit3eaf22e3e209599b490b1a647e1720d0464170b2 (patch)
tree4c39065fc3dae328814e1e8537c06b424625fc1d /usr.bin/ssh/authfile.c
parentkey should be an int not a char. (diff)
downloadwireguard-openbsd-3eaf22e3e209599b490b1a647e1720d0464170b2.tar.xz
wireguard-openbsd-3eaf22e3e209599b490b1a647e1720d0464170b2.zip
Fix bug introduced in r1.78 (incorrect brace location) that broke key auth.
Patch from joachim joachimschipper nl.
Diffstat (limited to 'usr.bin/ssh/authfile.c')
-rw-r--r--usr.bin/ssh/authfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c
index 5bed1730393..17ca4e809d8 100644
--- a/usr.bin/ssh/authfile.c
+++ b/usr.bin/ssh/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
@@ -552,8 +552,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;