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

Add SLOG_AUDIT flag for log_warningx() to also audit the message.

Browse Source 
This lets us combine audit_failure() and log_warningx() calls with
the same message.
This commit is contained in:
Todd C. Miller
2020-09-23 08:18:55 -06:00
parent 6ee731caff
commit f1d19f1d6e
4 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/sudoers/audit.c
View File

@@ -93,20 +93,17 @@ audit_failure_int(char *const argv[], const char *message)
}
int
audit_failure(char *const argv[], char const *const fmt, ...)
vaudit_failure(char *const argv[], char const *const fmt, va_list ap)
{
int oldlocale, ret;
char *message;
va_list ap;
debug_decl(audit_failure, SUDOERS_DEBUG_AUDIT);
debug_decl(vaudit_failure, SUDOERS_DEBUG_AUDIT);
/* Audit messages should be in the sudoers locale. */
sudoers_setlocale(SUDOERS_LOCALE_SUDOERS, &oldlocale);
va_start(ap, fmt);
if ((ret = vasprintf(&message, _(fmt), ap)) == -1)
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
va_end(ap);
if (ret != -1) {
/* Set audit_msg for audit plugins. */
@@ -121,6 +118,20 @@ audit_failure(char *const argv[], char const *const fmt, ...)
debug_return_int(ret);
}
int
audit_failure(char *const argv[], char const *const fmt, ...)
{
va_list ap;
int ret;
debug_decl(audit_failure, SUDOERS_DEBUG_AUDIT);
va_start(ap, fmt);
ret = vaudit_failure(argv, fmt, ap);
va_end(ap);
debug_return_int(ret);
}
static int
sudoers_audit_open(unsigned int version, sudo_conv_t conversation,
sudo_printf_t plugin_printf, char * const settings[],