diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | auth.c | 8 |
2 files changed, 9 insertions, 2 deletions
@@ -18,6 +18,9 @@ | |||
18 | - dtucker@cvs.openbsd.org 2010/01/10 03:51:17 | 18 | - dtucker@cvs.openbsd.org 2010/01/10 03:51:17 |
19 | [servconf.c] | 19 | [servconf.c] |
20 | Add ChrootDirectory to sshd.c test-mode output | 20 | Add ChrootDirectory to sshd.c test-mode output |
21 | - dtucker@cvs.openbsd.org 2010/01/10 07:15:56 | ||
22 | [auth.c] | ||
23 | Output a debug if we can't open an existing keyfile. bz#1694, ok djm@ | ||
21 | 24 | ||
22 | 20091209 | 25 | 20091209 |
23 | - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't | 26 | - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.c,v 1.80 2008/11/04 07:58:09 djm Exp $ */ | 1 | /* $OpenBSD: auth.c,v 1.81 2010/01/10 07:15:56 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -483,8 +483,12 @@ auth_openkeyfile(const char *file, struct passwd *pw, int strict_modes) | |||
483 | * Open the file containing the authorized keys | 483 | * Open the file containing the authorized keys |
484 | * Fail quietly if file does not exist | 484 | * Fail quietly if file does not exist |
485 | */ | 485 | */ |
486 | if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) | 486 | if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) { |
487 | if (errno != ENOENT) | ||
488 | debug("Could not open keyfile '%s': %s", file, | ||
489 | strerror(errno)); | ||
487 | return NULL; | 490 | return NULL; |
491 | } | ||
488 | 492 | ||
489 | if (fstat(fd, &st) < 0) { | 493 | if (fstat(fd, &st) < 0) { |
490 | close(fd); | 494 | close(fd); |