From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 10 Mar 2021 20:08:24 +0000 (+0200)
Subject: auth: userdb_parse_[ug]id() - Fix error logging to use events properly
X-Git-Tag: 2.3.15~233
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0f498b692130a1fc57810e5315b45fa7a77d960;p=thirdparty%2Fdovecot%2Fcore.git

auth: userdb_parse_[ug]id() - Fix error logging to use events properly

If request is missing, use the global auth_event instead of hiding the
error.
---

diff --git a/src/auth/userdb.c b/src/auth/userdb.c
index c4a6d7babe..2f1fdf95c4 100644
--- a/src/auth/userdb.c
+++ b/src/auth/userdb.c
@@ -69,16 +69,12 @@ uid_t userdb_parse_uid(struct auth_request *request, const char *str)
 
 	switch (i_getpwnam(str, &pw)) {
 	case -1:
-		if (request == NULL)
-			i_error("getpwnam() failed: %m");
-		else
-			e_error(authdb_event(request), "getpwnam() failed: %m");
+		e_error(request == NULL ? auth_event : authdb_event(request),
+			"getpwnam() failed: %m");
 		return (uid_t)-1;
 	case 0:
-		if (request != NULL) {
-			e_error(authdb_event(request),
-				"Invalid UID value '%s'", str);
-		}
+		e_error(request == NULL ? auth_event : authdb_event(request),
+			"Invalid UID value '%s'", str);
 		return (uid_t)-1;
 	default:
 		return pw.pw_uid;
@@ -98,13 +94,12 @@ gid_t userdb_parse_gid(struct auth_request *request, const char *str)
 
 	switch (i_getgrnam(str, &gr)) {
 	case -1:
-		i_error("getgrnam() failed: %m");
+		e_error(request == NULL ? auth_event : authdb_event(request),
+			"getgrnam() failed: %m");
 		return (gid_t)-1;
 	case 0:
-		if (request != NULL) {
-			e_error(authdb_event(request),
-				"Invalid GID value '%s'", str);
-		}
+		e_error(request == NULL ? auth_event : authdb_event(request),
+			"Invalid GID value '%s'", str);
 		return (gid_t)-1;
 	default:
 		return gr.gr_gid;