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

Standardize protobuf "unable to unpack" warning messages.

Browse Source
This commit is contained in:
Todd C. Miller
2022-05-26 09:35:18 -06:00
parent 9ac42292d1
commit 38c6e1bffb
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logsrvd/logsrvd.c
View File

@@ -743,7 +743,7 @@ handle_client_message(uint8_t *buf, size_t len,
/* TODO: can we extract type_case without unpacking for relay case? */ /* TODO: can we extract type_case without unpacking for relay case? */
msg = client_message__unpack(NULL, len, buf); msg = client_message__unpack(NULL, len, buf);
if (msg == NULL) { if (msg == NULL) {
sudo_warnx("unable to unpack %s size %zu", "ClientMessage", len); sudo_warnx(U_("unable to unpack %s size %zu"), "ClientMessage", len);
debug_return_bool(false); debug_return_bool(false);
} }

2
logsrvd/logsrvd_journal.c
View File

@@ -280,7 +280,7 @@ journal_seek(struct timespec *target, struct connection_closure *closure)
client_message__free_unpacked(msg, NULL); client_message__free_unpacked(msg, NULL);
msg = client_message__unpack(NULL, msg_len, buf); msg = client_message__unpack(NULL, msg_len, buf);
if (msg == NULL) { if (msg == NULL) {
sudo_warnx("unable to unpack %s size %zu", "ClientMessage", sudo_warnx(U_("unable to unpack %s size %zu"), "ClientMessage",
(size_t)msg_len); (size_t)msg_len);
closure->errstr = _("invalid journal file, unable to restart"); closure->errstr = _("invalid journal file, unable to restart");
break; break;

2
logsrvd/logsrvd_relay.c
View File

@@ -644,7 +644,7 @@ handle_server_message(uint8_t *buf, size_t len, struct connection_closure *closu
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: unpacking ServerMessage", __func__); sudo_debug_printf(SUDO_DEBUG_INFO, "%s: unpacking ServerMessage", __func__);
msg = server_message__unpack(NULL, len, buf); msg = server_message__unpack(NULL, len, buf);
if (msg == NULL) { if (msg == NULL) {
sudo_warnx("unable to unpack %s size %zu", "ServerMessage", len); sudo_warnx(U_("unable to unpack %s size %zu"), "ServerMessage", len);
debug_return_bool(false); debug_return_bool(false);
} }

2
logsrvd/sendlog.c
View File

@@ -1214,7 +1214,7 @@ handle_server_message(uint8_t *buf, size_t len,
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: unpacking ServerMessage", __func__); sudo_debug_printf(SUDO_DEBUG_INFO, "%s: unpacking ServerMessage", __func__);
msg = server_message__unpack(NULL, len, buf); msg = server_message__unpack(NULL, len, buf);
if (msg == NULL) { if (msg == NULL) {
sudo_warnx("unable to unpack %s size %zu", "ServerMessage", len); sudo_warnx(U_("unable to unpack %s size %zu"), "ServerMessage", len);
debug_return_bool(false); debug_return_bool(false);
} }

2
plugins/sudoers/log_client.c
View File

@@ -1615,7 +1615,7 @@ handle_server_message(uint8_t *buf, size_t len,
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: unpacking ServerMessage", __func__); sudo_debug_printf(SUDO_DEBUG_INFO, "%s: unpacking ServerMessage", __func__);
msg = server_message__unpack(NULL, len, buf); msg = server_message__unpack(NULL, len, buf);
if (msg == NULL) { if (msg == NULL) {
sudo_warnx("%s", U_("unable to unpack ServerMessage")); sudo_warnx(U_("unable to unpack %s size %zu"), "ServerMessage", len);
debug_return_bool(false); debug_return_bool(false);
} }

2
src/exec_intercept.c
View File

@@ -619,7 +619,7 @@ intercept_read(int fd, struct intercept_closure *closure)
unpack: unpack:
req = intercept_request__unpack(NULL, closure->len, closure->buf); req = intercept_request__unpack(NULL, closure->len, closure->buf);
if (req == NULL) { if (req == NULL) {
sudo_warnx("unable to unpack %s size %zu", "InterceptRequest", sudo_warnx(U_("unable to unpack %s size %zu"), "InterceptRequest",
(size_t)closure->len); (size_t)closure->len);
goto done; goto done;
} }