diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2010-01-12 00:16:48 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2010-01-12 00:16:48 +0000 |
| commit | 4557f210f6c9ffc7004d9441874ac4fd0e2ae9e1 (patch) | |
| tree | 11b1be35f7ec01fcdb3d641a54a07ce11edca44c /usr.bin/ssh | |
| parent | 26a1d420680d7c7483ea66090b72208f2bfabb52 (diff) | |
Fix bug introduced in r1.78 (incorrect brace location) that broke key auth.
Patch from joachim joachimschipper nl.
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/authfile.c | 4 |
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; |