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

When parsing debug entries, don't make a lower value override a

Browse Source 
higher one.  For example, for "pcomm@debug,all@warn" the "all@warn"
should not set pcomm to "warn" when it is already at "debug".
This commit is contained in:
Todd C. Miller
2016-01-21 07:43:25 -07:00
parent 7ed519125e
commit 5016fa23df
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/util/sudo_debug.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011-2015 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 2011-2016 Todd C. Miller <Todd.Miller@courtesan.com>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@@ -141,7 +141,8 @@ sudo_debug_new_output(struct sudo_debug_instance *instance,
{ {
char *buf, *cp, *last, *subsys, *pri; char *buf, *cp, *last, *subsys, *pri;
struct sudo_debug_output *output; struct sudo_debug_output *output;
unsigned int i, j; unsigned int j;
int i;
/* Create new output for the instance. */ /* Create new output for the instance. */
/* XXX - reuse fd for existing filename? */ /* XXX - reuse fd for existing filename? */
@@ -159,8 +160,8 @@ sudo_debug_new_output(struct sudo_debug_instance *instance,
output->fd = -1; output->fd = -1;
/* Init per-subsystems settings to -1 since 0 is a valid priority. */ /* Init per-subsystems settings to -1 since 0 is a valid priority. */
for (i = 0; i <= instance->max_subsystem; i++) for (j = 0; j <= instance->max_subsystem; j++)
output->settings[i] = -1; output->settings[j] = -1;
/* Open debug file. */ /* Open debug file. */
output->fd = open(output->filename, O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR); output->fd = open(output->filename, O_WRONLY|O_APPEND, S_IRUSR|S_IWUSR);
@@ -210,12 +211,14 @@ sudo_debug_new_output(struct sudo_debug_instance *instance,
if (strcasecmp(subsys, "all") == 0) { if (strcasecmp(subsys, "all") == 0) {
const unsigned int idx = instance->subsystem_ids ? const unsigned int idx = instance->subsystem_ids ?
SUDO_DEBUG_SUBSYS(instance->subsystem_ids[j]) : j; SUDO_DEBUG_SUBSYS(instance->subsystem_ids[j]) : j;
if (i > output->settings[idx])
output->settings[idx] = i; output->settings[idx] = i;
continue; continue;
} }
if (strcasecmp(subsys, instance->subsystems[j]) == 0) { if (strcasecmp(subsys, instance->subsystems[j]) == 0) {
const unsigned int idx = instance->subsystem_ids ? const unsigned int idx = instance->subsystem_ids ?
SUDO_DEBUG_SUBSYS(instance->subsystem_ids[j]) : j; SUDO_DEBUG_SUBSYS(instance->subsystem_ids[j]) : j;
if (i > output->settings[idx])
output->settings[idx] = i; output->settings[idx] = i;
break; break;
} }