From 6965e1b0aadce05c9efb1738eb5c0c6e26024786 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 23 Nov 2023 09:08:04 -0500 Subject: [PATCH] log_server_alert: use fmt_alert_message not fmt_reject_message Only affects intercepted commands. --- plugins/sudoers/log_client.c | 2 +- plugins/sudoers/log_client.h | 1 + plugins/sudoers/logging.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/sudoers/log_client.c b/plugins/sudoers/log_client.c index 39e4ab638..238e9d511 100644 --- a/plugins/sudoers/log_client.c +++ b/plugins/sudoers/log_client.c @@ -1057,7 +1057,7 @@ done: * Appends the wire format message to the closure's write queue. * Returns true on success, false on failure. */ -static bool +bool fmt_alert_message(struct client_closure *closure, struct eventlog *evlog) { ClientMessage client_msg = CLIENT_MESSAGE__INIT; diff --git a/plugins/sudoers/log_client.h b/plugins/sudoers/log_client.h index 78508ef87..8190becdc 100644 --- a/plugins/sudoers/log_client.h +++ b/plugins/sudoers/log_client.h @@ -112,6 +112,7 @@ bool log_server_close(struct client_closure *closure, int exit_status, int error bool fmt_client_message(struct client_closure *closure, ClientMessage *msg); bool fmt_accept_message(struct client_closure *closure, struct eventlog *evlog); bool fmt_reject_message(struct client_closure *closure, struct eventlog *evlog); +bool fmt_alert_message(struct client_closure *closure, struct eventlog *evlog); bool fmt_exit_message(struct client_closure *closure, int exit_status, int error); bool fmt_io_buf(struct client_closure *closure, int type, const char *buf, unsigned int len, struct timespec *delay); bool fmt_suspend(struct client_closure *closure, const char *signame, struct timespec *delay); diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c index c2635d066..7add7441e 100644 --- a/plugins/sudoers/logging.c +++ b/plugins/sudoers/logging.c @@ -200,7 +200,7 @@ log_server_alert(const struct sudoers_context *ctx, struct eventlog *evlog, } /* Use existing client closure. */ - if (fmt_reject_message(client_closure, evlog)) { + if (fmt_alert_message(client_closure, evlog)) { if (client_closure->write_ev->add(client_closure->write_ev, &client_closure->log_details->server_timeout) == -1) { sudo_warn("%s", U_("unable to add event to queue"));