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 d42ea815b5194728978dcd7f40dbb33cfc39df91..55908ddd34ddddea5692401b812636a429bf9ec2 100644 (file)
--- 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 1d9fb81f3655c0d29b8763efe136a94bb10cd0d5..b2e881c3d33f571e137d28fae34249ee34a42593 100644 (file)
--- 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 f54a2a736d6a461501d75d411100e3e6fc45dd35..9fbdb54f7b32dfa959c8232802b2485e082ebcba 100644 (file)
--- 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.