isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log_server_alert: use fmt_alert_message not fmt_reject_message

Browse Source 
Only affects intercepted commands.
This commit is contained in:
Todd C. Miller
2023-11-23 09:08:04 -05:00
parent 13dec64f3d
commit 6965e1b0aa
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sudoers/log_client.c
View File

@@ -1057,7 +1057,7 @@ done:
* Appends the wire format message to the closure's write queue. * Appends the wire format message to the closure's write queue.
* Returns true on success, false on failure. * Returns true on success, false on failure.
*/ */
static bool bool
fmt_alert_message(struct client_closure *closure, struct eventlog *evlog) fmt_alert_message(struct client_closure *closure, struct eventlog *evlog)
{ {
ClientMessage client_msg = CLIENT_MESSAGE__INIT; ClientMessage client_msg = CLIENT_MESSAGE__INIT;

1
plugins/sudoers/log_client.h
View File

@@ -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_client_message(struct client_closure *closure, ClientMessage *msg);
bool fmt_accept_message(struct client_closure *closure, struct eventlog *evlog); bool fmt_accept_message(struct client_closure *closure, struct eventlog *evlog);
bool fmt_reject_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_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_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); bool fmt_suspend(struct client_closure *closure, const char *signame, struct timespec *delay);

2
plugins/sudoers/logging.c
View File

@@ -200,7 +200,7 @@ log_server_alert(const struct sudoers_context *ctx, struct eventlog *evlog,
} }
/* Use existing client closure. */ /* 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, if (client_closure->write_ev->add(client_closure->write_ev,
&client_closure->log_details->server_timeout) == -1) { &client_closure->log_details->server_timeout) == -1) {
sudo_warn("%s", U_("unable to add event to queue")); sudo_warn("%s", U_("unable to add event to queue"));