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

Make struct sudoers_context private to sudoers.c.

Browse Source 
We now pass a pointer to the context where necessary.  There are a
few cases where we need to request the context from sudoers via
sudoers_get_context() for the plugin API functions.  If the plugin
API was able to pass around a closure pointer this would not be
necessary.
This commit is contained in:
Todd C. Miller
2023-08-21 09:21:49 -06:00
parent 2d2529a15e
commit 2440174954
68 changed files with 2293 additions and 2104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/sudoers/solaris_audit.c
View File

@@ -44,35 +44,36 @@ static char cwd[PATH_MAX];
static char cmdpath[PATH_MAX];
static int
adt_sudo_common(char *const argv[])
adt_sudo_common(const struct sudoers_context *ctx, char *const argv[])
{
int argc;
if (adt_start_session(&ah, NULL, ADT_USE_PROC_DATA) != 0) {
log_warning(SLOG_NO_STDERR, "adt_start_session");
log_warning(ctx, SLOG_NO_STDERR, "adt_start_session");
return -1;
}
if ((event = adt_alloc_event(ah, ADT_sudo)) == NULL) {
log_warning(SLOG_NO_STDERR, "alloc_event");
log_warning(ctx, SLOG_NO_STDERR, "alloc_event");
(void) adt_end_session(ah);
return -1;
}
if ((event->adt_sudo.cwdpath = getcwd(cwd, sizeof(cwd))) == NULL) {
log_warning(SLOG_NO_STDERR, _("unable to get current working directory"));
log_warning(ctx, SLOG_NO_STDERR,
_("unable to get current working directory"));
}
/* get the real executable name */
if (ctx.user.cmnd != NULL) {
if (strlcpy(cmdpath, (const char *)ctx.user.cmnd,
if (ctx->user.cmnd != NULL) {
if (strlcpy(cmdpath, ctx->user.cmnd,
sizeof(cmdpath)) >= sizeof(cmdpath)) {
log_warningx(SLOG_NO_STDERR,
_("truncated audit path ctx.user.cmnd: %s"),
ctx.user.cmnd);
log_warningx(ctx, SLOG_NO_STDERR,
_("truncated audit path ctx->user.cmnd: %s"),
ctx->user.cmnd);
}
} else {
if (strlcpy(cmdpath, argv[0],
sizeof(cmdpath)) >= sizeof(cmdpath)) {
log_warningx(SLOG_NO_STDERR,
log_warningx(ctx, SLOG_NO_STDERR,
_("truncated audit path argv[0]: %s"),
argv[0]);
}
@@ -94,15 +95,15 @@ adt_sudo_common(char *const argv[])
* Returns 0 on success or -1 on error.
*/
int
solaris_audit_success(char *const argv[])
solaris_audit_success(const struct sudoers_context *ctx, char *const argv[])
{
int rc = -1;
if (adt_sudo_common(argv) != 0) {
if (adt_sudo_common(ctx, argv) != 0) {
return -1;
}
if (adt_put_event(event, ADT_SUCCESS, ADT_SUCCESS) != 0) {
log_warning(SLOG_NO_STDERR, "adt_put_event(ADT_SUCCESS)");
log_warning(ctx, SLOG_NO_STDERR, "adt_put_event(ADT_SUCCESS)");
} else {
rc = 0;
}
@@ -116,17 +117,18 @@ solaris_audit_success(char *const argv[])
* Returns 0 on success or -1 on error.
*/
int
solaris_audit_failure(char *const argv[], const char *errmsg)
solaris_audit_failure(const struct sudoers_context *ctx, char *const argv[],
const char *errmsg)
{
int rc = -1;
if (adt_sudo_common(argv) != 0) {
if (adt_sudo_common(ctx, argv) != 0) {
return -1;
}
event->adt_sudo.errmsg = (char *)errmsg;
if (adt_put_event(event, ADT_FAILURE, ADT_FAIL_VALUE_PROGRAM) != 0) {
log_warning(SLOG_NO_STDERR, "adt_put_event(ADT_FAILURE)");
log_warning(ctx, SLOG_NO_STDERR, "adt_put_event(ADT_FAILURE)");
} else {
rc = 0;
}