From: Todd C. Miller <Todd.Miller@sudo.ws>
Date: Tue, 19 Feb 2019 15:31:08 +0000 (-0700)
Subject: Be sure to include sudo_queue.h where needed instead of relying on other headers.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0a12d9d956a72ac47e669c15d5e4db11c02d5fd;p=sudo

Be sure to include sudo_queue.h where needed instead of relying on other headers.
---

diff --git a/plugins/sudoers/cvtsudoers.c b/plugins/sudoers/cvtsudoers.c
index 0221314b9..034d5f8bc 100644
--- a/plugins/sudoers/cvtsudoers.c
+++ b/plugins/sudoers/cvtsudoers.c
@@ -42,7 +42,6 @@
 
 #include "sudoers.h"
 #include "sudoers_version.h"
-#include "sudo_conf.h"
 #include "sudo_lbuf.h"
 #include "redblack.h"
 #include "cvtsudoers.h"
diff --git a/plugins/sudoers/defaults.h b/plugins/sudoers/defaults.h
index 4b2db16c4..630c5d999 100644
--- a/plugins/sudoers/defaults.h
+++ b/plugins/sudoers/defaults.h
@@ -24,6 +24,7 @@
 
 #include <time.h>
 #include <def_data.h>
+#include "sudo_queue.h"
 
 struct list_member {
     SLIST_ENTRY(list_member) entries;
diff --git a/plugins/sudoers/parse.h b/plugins/sudoers/parse.h
index 1c9d47679..fd4462742 100644
--- a/plugins/sudoers/parse.h
+++ b/plugins/sudoers/parse.h
@@ -18,6 +18,8 @@
 #ifndef SUDOERS_PARSE_H
 #define SUDOERS_PARSE_H
 
+#include "sudo_queue.h"
+
 /* Characters that must be quoted in sudoers. */
 #define SUDOERS_QUOTED	":\\,=#\""
 
diff --git a/plugins/sudoers/strlist.c b/plugins/sudoers/strlist.c
index 1bb763016..e1f5516c0 100644
--- a/plugins/sudoers/strlist.c
+++ b/plugins/sudoers/strlist.c
@@ -32,8 +32,8 @@
 #endif /* HAVE_STRINGS_H */
 
 #include "sudo_compat.h"
-#include "sudo_util.h"
 #include "sudo_queue.h"
+#include "sudo_util.h"
 #include "sudoers_debug.h"
 #include "strlist.h"
 
diff --git a/src/sudo.h b/src/sudo.h
index 1d8e672dc..b575f04e3 100644
--- a/src/sudo.h
+++ b/src/sudo.h
@@ -36,6 +36,7 @@
 #include "sudo_fatal.h"
 #include "sudo_conf.h"
 #include "sudo_debug.h"
+#include "sudo_queue.h"
 #include "sudo_util.h"
 
 #ifdef HAVE_PRIV_SET