diff options
author | Darren Tucker <dtucker@zip.com.au> | 2010-01-12 19:42:29 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2010-01-12 19:42:29 +1100 |
commit | 69c01b1c4a9068478174b9cc39eb9957e78416a6 (patch) | |
tree | d1a14791528dd6c6fe2e2349c7a52bdd1ae1426b | |
parent | d04758dc4c001104933ce3e2088ac46d461ec1f1 (diff) |
- 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.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | authfile.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -15,6 +15,10 @@ | |||
15 | [ssh-keygen.c] | 15 | [ssh-keygen.c] |
16 | when converting keys, truncate key comments at 72 chars as per RFC4716; | 16 | when converting keys, truncate key comments at 72 chars as per RFC4716; |
17 | bz#1630 reported by tj AT castaglia.org; ok markus@ | 17 | bz#1630 reported by tj AT castaglia.org; ok markus@ |
18 | - dtucker@cvs.openbsd.org 2010/01/12 00:16:47 | ||
19 | [authfile.c] | ||
20 | Fix bug introduced in r1.78 (incorrect brace location) that broke key auth. | ||
21 | Patch from joachim joachimschipper nl. | ||
18 | 22 | ||
19 | 20100110 | 23 | 20100110 |
20 | - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c] | 24 | - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c] |
diff --git a/authfile.c b/authfile.c index 23535fa07..2c615709d 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfile.c,v 1.78 2010/01/11 04:46:45 dtucker Exp $ */ | 1 | /* $OpenBSD: authfile.c,v 1.79 2010/01/12 00:16:47 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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, | |||
564 | strerror(errno)); | 564 | strerror(errno)); |
565 | if (perm_ok != NULL) | 565 | if (perm_ok != NULL) |
566 | *perm_ok = 0; | 566 | *perm_ok = 0; |
567 | } | ||
568 | return NULL; | 567 | return NULL; |
568 | } | ||
569 | if (!key_perm_ok(fd, filename)) { | 569 | if (!key_perm_ok(fd, filename)) { |
570 | if (perm_ok != NULL) | 570 | if (perm_ok != NULL) |
571 | *perm_ok = 0; | 571 | *perm_ok = 0; |