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

Change audit close arguments to a type and value.

Browse Source 
That way we can distinguish between different error types.
This commit is contained in:
Todd C. Miller
2020-01-30 17:05:27 -07:00
parent bf85ea2bf7
commit 1b7dc82fee
3 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/audit_json/audit_json.c
View File

@@ -489,23 +489,6 @@ done:
debug_return_int(ret);
}
static void
audit_close(int exit_status, int error)
{
debug_decl(audit_close, SUDO_DEBUG_PLUGIN);
if (state.accepted) {
/* Write log entry for exit_status, or error. */
audit_write_exit_record(exit_status, error);
}
free(state.logfile);
if (state.log_fp != NULL)
fclose(state.log_fp);
debug_return;
}
static int
audit_write_record(const char *audit_str, const char *plugin_name,
unsigned int plugin_type, const char *reason, char * const command_info[],
@@ -547,6 +530,9 @@ audit_write_record(const char *audit_str, const char *plugin_name,
sudo_json_add_value(&json, "plugin_name", &json_value);
switch (plugin_type) {
case 0:
json_value.u.string = "front-end";
break;
case SUDO_POLICY_PLUGIN:
json_value.u.string = "policy";
break;
@@ -648,6 +634,31 @@ audit_error(const char *plugin_name, unsigned int plugin_type,
debug_return_int(ret);
}
static void
audit_close(int status_type, int status)
{
debug_decl(audit_close, SUDO_DEBUG_PLUGIN);
switch (status_type) {
case SUDO_PLUGIN_WAIT_STATUS:
audit_write_exit_record(status, 0);
break;
case SUDO_PLUGIN_EXEC_ERROR:
audit_write_exit_record(0, status);
break;
case SUDO_PLUGIN_SUDO_ERROR:
audit_write_record("error", "sudo", 0, strerror(status),
NULL, NULL, NULL);
break;
}
free(state.logfile);
if (state.log_fp != NULL)
fclose(state.log_fp);
debug_return;
}
static int
audit_show_version(int verbose)
{