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 c4a6d7babe96db7b86d64ed57eabc1fa043107f2..2f1fdf95c480f1138b93c2ee0d4e70f950c6b66f 100644 (file)
--- 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;