diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-16 00:27:53 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-16 00:27:53 +0000 |
commit | 6f583ee197c4bd398196266efaab111ece264f69 (patch) | |
tree | 19fef8ecfce451489905a9ffca40edc58ba4bf56 | |
parent | 730e12063b532f59292af38f584d84127a77ebdd (diff) |
Output a debug if we can't open an existing keyfile (LP: #505301).
-rw-r--r-- | auth.c | 6 | ||||
-rw-r--r-- | debian/changelog | 1 |
2 files changed, 6 insertions, 1 deletions
@@ -516,8 +516,12 @@ auth_openkeyfile(const char *file, struct passwd *pw, int strict_modes) | |||
516 | * Open the file containing the authorized keys | 516 | * Open the file containing the authorized keys |
517 | * Fail quietly if file does not exist | 517 | * Fail quietly if file does not exist |
518 | */ | 518 | */ |
519 | if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) | 519 | if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) { |
520 | if (errno != ENOENT) | ||
521 | debug("Could not open keyfile '%s': %s", file, | ||
522 | strerror(errno)); | ||
520 | return NULL; | 523 | return NULL; |
524 | } | ||
521 | 525 | ||
522 | if (fstat(fd, &st) < 0) { | 526 | if (fstat(fd, &st) < 0) { |
523 | close(fd); | 527 | 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 | |||
5 | - After sshd receives a SIGHUP, ignore subsequent HUPs while sshd | 5 | - After sshd receives a SIGHUP, ignore subsequent HUPs while sshd |
6 | re-execs itself. Prevents two HUPs in quick succession from resulting | 6 | re-execs itself. Prevents two HUPs in quick succession from resulting |
7 | in sshd dying (LP: #497781). | 7 | in sshd dying (LP: #497781). |
8 | - Output a debug if we can't open an existing keyfile (LP: #505301). | ||
8 | * Use host compiler for ssh-askpass-gnome when cross-compiling. | 9 | * Use host compiler for ssh-askpass-gnome when cross-compiling. |
9 | * Don't run tests when cross-compiling. | 10 | * Don't run tests when cross-compiling. |
10 | * Drop change from 1:3.6.1p2-5 to disable cmsg_type check for file | 11 | * Drop change from 1:3.6.1p2-5 to disable cmsg_type check for file |