From c8b21175177c60dcc637fae522f42e44631702cb Mon Sep 17 00:00:00 2001 From: djm Date: Fri, 1 Jul 2022 03:52:57 +0000 Subject: [PATCH] bump up loglevel from debug to info when unable to open authorized keys/principals file for errno != ENOENT; bz2042 ok dtucker --- usr.bin/ssh/auth2-pubkeyfile.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/usr.bin/ssh/auth2-pubkeyfile.c b/usr.bin/ssh/auth2-pubkeyfile.c index 7a41fc6c965..7d4a7706736 100644 --- a/usr.bin/ssh/auth2-pubkeyfile.c +++ b/usr.bin/ssh/auth2-pubkeyfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth2-pubkeyfile.c,v 1.2 2022/06/03 04:47:21 djm Exp $ */ +/* $OpenBSD: auth2-pubkeyfile.c,v 1.3 2022/07/01 03:52:57 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2010 Damien Miller. All rights reserved. @@ -448,9 +448,13 @@ auth_openfile(const char *file, struct passwd *pw, int strict_modes, FILE *f; if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) { - if (log_missing || errno != ENOENT) - debug("Could not open %s '%s': %s", file_type, file, - strerror(errno)); + if (errno != ENOENT) { + logit("Could not open user '%s' %s '%s': %s", + pw->pw_name, file_type, file, strerror(errno)); + } else if (log_missing) { + debug("Could not open user '%s' %s '%s': %s", + pw->pw_name, file_type, file, strerror(errno)); + } return NULL; } @@ -459,7 +463,7 @@ auth_openfile(const char *file, struct passwd *pw, int strict_modes, return NULL; } if (!S_ISREG(st.st_mode)) { - logit("User %s %s %s is not a regular file", + logit("User '%s' %s '%s' is not a regular file", pw->pw_name, file_type, file); close(fd); return NULL; -- 2.20.1