Attachment 3601 Details for Bug 2042 – increase loglevel for errno != ENOENT

[patch] increase loglevel for errno != ENOENT

bz2042.diff (text/plain), 1013 bytes, created by Damien Miller on 2022-07-01 10:57:37 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2022-07-01 10:57:37 AEST

Size: 1013 bytes

patch

obsolete

>diff --git a/auth2-pubkeyfile.c b/auth2-pubkeyfile.c
>index 7a41fc6..f561ba0 100644
>--- a/auth2-pubkeyfile.c
>+++ b/auth2-pubkeyfile.c
>@@ -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;

Flags:

dtucker: ok+

Actions: View | Diff

Attachments on bug 2042: 3601