The sudoers plugin now defines its own list of debugging subsystem names
and defines.
This commit is contained in:
@@ -124,7 +124,7 @@ main(int argc, char *argv[])
|
||||
const char *errstr;
|
||||
int match, host_match, runas_match, cmnd_match;
|
||||
int ch, dflag, exitcode = 0;
|
||||
debug_decl(main, SUDO_DEBUG_MAIN, sudoers_debug_instance)
|
||||
debug_decl(main, SUDOERS_DEBUG_MAIN, sudoers_debug_instance)
|
||||
|
||||
#if defined(SUDO_DEVEL) && defined(__OpenBSD__)
|
||||
malloc_options = "AFGJPR";
|
||||
@@ -349,7 +349,7 @@ static void
|
||||
set_runaspw(const char *user)
|
||||
{
|
||||
struct passwd *pw = NULL;
|
||||
debug_decl(set_runaspw, SUDO_DEBUG_UTIL, sudoers_debug_instance)
|
||||
debug_decl(set_runaspw, SUDOERS_DEBUG_UTIL, sudoers_debug_instance)
|
||||
|
||||
if (*user == '#') {
|
||||
const char *errstr;
|
||||
@@ -373,7 +373,7 @@ static void
|
||||
set_runasgr(const char *group)
|
||||
{
|
||||
struct group *gr = NULL;
|
||||
debug_decl(set_runasgr, SUDO_DEBUG_UTIL, sudoers_debug_instance)
|
||||
debug_decl(set_runasgr, SUDOERS_DEBUG_UTIL, sudoers_debug_instance)
|
||||
|
||||
if (*group == '#') {
|
||||
const char *errstr;
|
||||
@@ -423,7 +423,7 @@ open_sudoers(const char *sudoers, bool doedit, bool *keepopen)
|
||||
struct stat sb;
|
||||
FILE *fp = NULL;
|
||||
char *sudoers_base;
|
||||
debug_decl(open_sudoers, SUDO_DEBUG_UTIL, sudoers_debug_instance)
|
||||
debug_decl(open_sudoers, SUDOERS_DEBUG_UTIL, sudoers_debug_instance)
|
||||
|
||||
sudoers_base = strrchr(sudoers, '/');
|
||||
if (sudoers_base != NULL)
|
||||
@@ -480,7 +480,7 @@ void
|
||||
print_member(struct member *m)
|
||||
{
|
||||
struct sudo_command *c;
|
||||
debug_decl(print_member, SUDO_DEBUG_UTIL, sudoers_debug_instance)
|
||||
debug_decl(print_member, SUDOERS_DEBUG_UTIL, sudoers_debug_instance)
|
||||
|
||||
if (m->negated)
|
||||
putchar('!');
|
||||
@@ -502,7 +502,7 @@ print_defaults(void)
|
||||
{
|
||||
struct defaults *d;
|
||||
struct member *m;
|
||||
debug_decl(print_defaults, SUDO_DEBUG_UTIL, sudoers_debug_instance)
|
||||
debug_decl(print_defaults, SUDOERS_DEBUG_UTIL, sudoers_debug_instance)
|
||||
|
||||
TAILQ_FOREACH(d, &defaults, entries) {
|
||||
(void) fputs("Defaults", stdout);
|
||||
@@ -541,7 +541,7 @@ print_alias(void *v1, void *v2)
|
||||
struct alias *a = (struct alias *)v1;
|
||||
struct member *m;
|
||||
struct sudo_command *c;
|
||||
debug_decl(print_alias, SUDO_DEBUG_UTIL, sudoers_debug_instance)
|
||||
debug_decl(print_alias, SUDOERS_DEBUG_UTIL, sudoers_debug_instance)
|
||||
|
||||
switch (a->type) {
|
||||
case HOSTALIAS:
|
||||
@@ -580,7 +580,7 @@ print_privilege(struct privilege *priv)
|
||||
struct cmndspec *cs;
|
||||
struct member *m;
|
||||
struct cmndtag tags;
|
||||
debug_decl(print_privilege, SUDO_DEBUG_UTIL, sudoers_debug_instance)
|
||||
debug_decl(print_privilege, SUDOERS_DEBUG_UTIL, sudoers_debug_instance)
|
||||
|
||||
TAILQ_FOREACH(m, &priv->hostlist, entries) {
|
||||
if (m != TAILQ_FIRST(&priv->hostlist))
|
||||
@@ -644,7 +644,7 @@ print_userspecs(void)
|
||||
struct member *m;
|
||||
struct userspec *us;
|
||||
struct privilege *priv;
|
||||
debug_decl(print_userspecs, SUDO_DEBUG_UTIL, sudoers_debug_instance)
|
||||
debug_decl(print_userspecs, SUDOERS_DEBUG_UTIL, sudoers_debug_instance)
|
||||
|
||||
TAILQ_FOREACH(us, &userspecs, entries) {
|
||||
TAILQ_FOREACH(m, &us->users, entries) {
|
||||
@@ -666,7 +666,7 @@ print_userspecs(void)
|
||||
void
|
||||
dump_sudoers(void)
|
||||
{
|
||||
debug_decl(dump_sudoers, SUDO_DEBUG_UTIL, sudoers_debug_instance)
|
||||
debug_decl(dump_sudoers, SUDOERS_DEBUG_UTIL, sudoers_debug_instance)
|
||||
|
||||
print_defaults();
|
||||
|
||||
|
Reference in New Issue
Block a user