From 1ca52382a4cc85e1b9b67949e26f3ceca97ccd3f Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 23 Oct 2014 09:26:13 -0600 Subject: [PATCH] Fix compilation issues, fallout from the debug changes. --- plugins/sudoers/bsm_audit.c | 7 +------ plugins/sudoers/linux_audit.c | 8 +------- src/net_ifs.c | 4 ++-- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/plugins/sudoers/bsm_audit.c b/plugins/sudoers/bsm_audit.c index b8eed1ce3..03309bdda 100644 --- a/plugins/sudoers/bsm_audit.c +++ b/plugins/sudoers/bsm_audit.c @@ -30,12 +30,7 @@ #include #include -#define DEFAULT_TEXT_DOMAIN "sudoers" -#include "sudo_gettext.h" /* must be included before sudo_compat.h */ - -#include "sudo_compat.h" -#include "sudo_fatal.h" -#include "sudo_debug.h" +#include "sudoers.h" #include "bsm_audit.h" /* diff --git a/plugins/sudoers/linux_audit.c b/plugins/sudoers/linux_audit.c index 41c4594ac..55289a367 100644 --- a/plugins/sudoers/linux_audit.c +++ b/plugins/sudoers/linux_audit.c @@ -31,13 +31,7 @@ #include #include -#define DEFAULT_TEXT_DOMAIN "sudoers" -#include "sudo_gettext.h" /* must be included before sudo_compat.h */ - -#include "sudo_compat.h" -#include "sudo_fatal.h" -#include "sudo_alloc.h" -#include "sudo_debug.h" +#include "sudoers.h" #include "linux_audit.h" #define AUDIT_NOT_CONFIGURED -2 diff --git a/src/net_ifs.c b/src/net_ifs.c index bfd8f32d2..1cee550c9 100644 --- a/src/net_ifs.c +++ b/src/net_ifs.c @@ -224,7 +224,7 @@ get_net_ifs(char **addrinfo) #ifdef _ISC struct strioctl strioctl; #endif /* _ISC */ - debug_decl(get_net_ifs, SUDO_DEBUG_NETIF, sudo_debug_instance) + debug_decl(get_net_ifs, SUDO_DEBUG_NETIF, SUDO_DEBUG_INSTANCE_DEFAULT) if (!sudo_conf_probe_interfaces()) debug_return_int(0); @@ -345,7 +345,7 @@ done: int get_net_ifs(char **addrinfo) { - debug_decl(get_net_ifs, SUDO_DEBUG_NETIF, sudo_debug_instance) + debug_decl(get_net_ifs, SUDO_DEBUG_NETIF, SUDO_DEBUG_INSTANCE_DEFAULT) debug_return_int(0); } -- 2.49.0