RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2010/01/10 07:15:56 

[auth.c]
     Output a debug if we can't open an existing keyfile.  bz#1694, ok djm@
This commit is contained in:
Darren Tucker 2010-01-10 19:27:17 +11:00
parent d3300454d8
commit 43551527dc
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -18,6 +18,9 @@
- dtucker@cvs.openbsd.org 2010/01/10 03:51:17 - dtucker@cvs.openbsd.org 2010/01/10 03:51:17
[servconf.c] [servconf.c]
Add ChrootDirectory to sshd.c test-mode output Add ChrootDirectory to sshd.c test-mode output
- dtucker@cvs.openbsd.org 2010/01/10 07:15:56
[auth.c]
Output a debug if we can't open an existing keyfile. bz#1694, ok djm@
20091209 20091209
- (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't

8
auth.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth.c,v 1.80 2008/11/04 07:58:09 djm Exp $ */ /* $OpenBSD: auth.c,v 1.81 2010/01/10 07:15:56 dtucker Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
@ -483,8 +483,12 @@ auth_openkeyfile(const char *file, struct passwd *pw, int strict_modes)
* Open the file containing the authorized keys * Open the file containing the authorized keys
* Fail quietly if file does not exist * Fail quietly if file does not exist
*/ */
if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) {
if (errno != ENOENT)
debug("Could not open keyfile '%s': %s", file,
strerror(errno));
return NULL; return NULL;
}
if (fstat(fd, &st) < 0) { if (fstat(fd, &st) < 0) {
close(fd); close(fd);