From 6f583ee197c4bd398196266efaab111ece264f69 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sat, 16 Jan 2010 00:27:53 +0000 Subject: Output a debug if we can't open an existing keyfile (LP: #505301). --- auth.c | 6 +++++- debian/changelog | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/auth.c b/auth.c index ae2cdec57..68370ca94 100644 --- a/auth.c +++ b/auth.c @@ -516,8 +516,12 @@ auth_openkeyfile(const char *file, struct passwd *pw, int strict_modes) * Open the file containing the authorized keys * 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; + } if (fstat(fd, &st) < 0) { close(fd); diff --git a/debian/changelog b/debian/changelog index 2793110f0..4c4d65ae8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ openssh (1:5.2p1-2) UNRELEASED; urgency=low - After sshd receives a SIGHUP, ignore subsequent HUPs while sshd re-execs itself. Prevents two HUPs in quick succession from resulting in sshd dying (LP: #497781). + - Output a debug if we can't open an existing keyfile (LP: #505301). * Use host compiler for ssh-askpass-gnome when cross-compiling. * Don't run tests when cross-compiling. * Drop change from 1:3.6.1p2-5 to disable cmsg_type check for file -- cgit v1.2.3