From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 30 Apr 2010 17:40:57 +0000 (-0400)
Subject: fmt_string is used by the sudoers plugin too so do not include sudo.h
X-Git-Tag: SUDO_1_8_0~679
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23f9bb59ec9135dc8bb74eda07970164c9bb4fb0;p=sudo

fmt_string is used by the sudoers plugin too so do not include sudo.h
(which is not really needed here anyway)
---

diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index d42ea815b..55908ddd3 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -210,7 +210,7 @@ plugin_error.lo: $(srcdir)/plugin_error.c $(incdir)/error.h $(incdir)/compat.h $
 alloc.lo: $(top_srcdir)/src/alloc.c $(SUDODEP)
 atobool.lo: $(top_srcdir)/src/atobool.c $(SUDODEP)
 fileops.lo: $(top_srcdir)/src/fileops.c $(SUDODEP)
-fmt_string.lo: $(top_srcdir)/src/fmt_string.c $(SUDODEP)
+fmt_string.lo: $(top_srcdir)/src/fmt_string.c $(incdir)/compat.h $(top_builddir)/config.h
 list.lo: $(top_srcdir)/src/list.c $(SUDODEP)
 lbuf.lo: $(top_srcdir)/src/lbuf.c $(SUDODEP)
 zero_bytes.lo: $(top_srcdir)/src/zero_bytes.c $(incdir)/compat.h $(top_builddir)/config.h
diff --git a/src/Makefile.in b/src/Makefile.in
index 1d9fb81f3..b2e881c3d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -114,7 +114,7 @@ atobool.o: $(srcdir)/atobool.c $(SUDODEP)
 conversation.o: $(srcdir)/conversation.c $(SUDODEP)
 error.o: $(srcdir)/error.c $(incdir)/compat.h $(incdir)/error.h $(top_builddir)/config.h
 fileops.o: $(srcdir)/fileops.c $(SUDODEP)
-fmt_string.o: $(srcdir)/fmt_string.c $(SUDODEP)
+fmt_string.o: $(srcdir)/fmt_string.c $(incdir)/compat.h $(top_builddir)/config.h
 lbuf.o: $(srcdir)/lbuf.c $(SUDODEP)
 list.o: $(srcdir)/list.c $(SUDODEP)
 load_plugins.o: $(srcdir)/load_plugins.c $(SUDODEP)
diff --git a/src/fmt_string.c b/src/fmt_string.c
index f54a2a736..9fbdb54f7 100644
--- a/src/fmt_string.c
+++ b/src/fmt_string.c
@@ -39,7 +39,7 @@
 # endif
 #endif /* HAVE_STRING_H */
 
-#include "sudo.h"
+#include <compat.h>
 
 /*
  * Allocate storage for a name=value string and return it.