summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <Todd.Miller@sudo.ws>2023-03-29 14:49:41 -0600
committerTodd C. Miller <Todd.Miller@sudo.ws>2023-03-29 14:49:41 -0600
commitbfc317e7251f2529997a51bc23fc1369986cf3dc (patch)
tree4fc6e4931c635a7d7f54e81d7db084847b77248d
parentc23d6f3c46ff8db3e3b3bcd7a867a4d53e87b89d (diff)
downloadsudo-bfc317e7251f2529997a51bc23fc1369986cf3dc.tar.gz
Warn with "unknown user" not "unknown uid" if user cannot be resolved.
Prior to sudo 1.8 this was after a getpwuid() but now we use getpwnam().
-rw-r--r--plugins/sudoers/sudoers.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index 4a12060a8..bd82812bc 100644
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -917,7 +917,7 @@ init_vars(char * const envp[])
* YP/NIS/NIS+/LDAP/etc daemon has died.
*/
if (sudo_mode == MODE_KILL || sudo_mode == MODE_INVALIDATE) {
- sudo_warnx(U_("unknown uid %u"), (unsigned int) user_uid);
+ sudo_warnx(U_("unknown user %s"), user_name);
debug_return_bool(false);
}
@@ -938,8 +938,7 @@ init_vars(char * const envp[])
/* It is now safe to use log_warningx() and set_perms() */
if (unknown_user) {
- log_warningx(SLOG_SEND_MAIL, N_("unknown uid %u"),
- (unsigned int) user_uid);
+ log_warningx(SLOG_SEND_MAIL, N_("unknown user %s"), user_name);
debug_return_bool(false);
}