Move sudo_printf extern to sudo_util.h

diff --git a/include/sudo_fatal.h b/include/sudo_fatal.h
index 3250a6142581153ab852f5cfa1ad51d1816b4106..157b78e6f8eb9063afadd64cdbe02061ca8a85d0 100644 (file)
--- a/include/sudo_fatal.h
+++ b/include/sudo_fatal.h
@@ -112,9 +112,6 @@
 } while (0)
 #endif /* SUDO_ERROR_WRAP */
 
-/* XXX - move to sudo_util.h */
-extern int (*sudo_printf)(int msg_type, const char *fmt, ...);
-
 typedef void (*sudo_fatal_callback_t)(void);
 
 __dso_public int  sudo_fatal_callback_deregister_v1(sudo_fatal_callback_t func);

diff --git a/include/sudo_util.h b/include/sudo_util.h
index b31cd36c88f131e47cd53efd172112fc07f176f5..124407819e4ea2fbbfc4b6929536dee8c5aca85e 100644 (file)
--- a/include/sudo_util.h
+++ b/include/sudo_util.h
@@ -195,6 +195,9 @@ __dso_public id_t sudo_strtoid_v1(const char *str, const char *sep, char **endp,
 __dso_public int sudo_strtomode_v1(const char *cp, const char **errstr);
 #define sudo_strtomode(_a, _b) sudo_strtomode_v1((_a), (_b))
 
+/* sudo_printf.c */
+extern int (*sudo_printf)(int msg_type, const char *fmt, ...);
+
 /* term.c */
 __dso_public bool sudo_term_cbreak_v1(int fd);
 #define sudo_term_cbreak(_a) sudo_term_cbreak_v1((_a))

diff --git a/lib/util/fatal.c b/lib/util/fatal.c
index c4a7603cc57abcd43ccaada4b04c02e073bd193a..f337c002ca96bdc1fdf3a9348c6ace71b7c02998 100644 (file)
--- a/lib/util/fatal.c
+++ b/lib/util/fatal.c
@@ -35,6 +35,7 @@
 #include "sudo_alloc.h"
 #include "sudo_fatal.h"
 #include "sudo_queue.h"
+#include "sudo_util.h"
 #include "sudo_plugin.h"
 
 struct sudo_fatal_callback {