From b58c1ff6ecf0b3b90ae7cbc21f74d5b49f2eabdd Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Fri, 2 Dec 2011 11:35:22 -0500
Subject: [PATCH] Fix "make check" fallout from the sudo_conv changes in
sudo_debug.
---
plugins/sudoers/regress/iolog_path/check_iolog_path.c | 1 +
plugins/sudoers/regress/logging/check_wrap.c | 3 +++
plugins/sudoers/regress/parser/check_addr.c | 2 ++
plugins/sudoers/regress/parser/check_fill.c | 8 ++++++++
4 files changed, 14 insertions(+)
diff --git a/plugins/sudoers/regress/iolog_path/check_iolog_path.c b/plugins/sudoers/regress/iolog_path/check_iolog_path.c
index ee094d926..f8079adb1 100644
--- a/plugins/sudoers/regress/iolog_path/check_iolog_path.c
+++ b/plugins/sudoers/regress/iolog_path/check_iolog_path.c
@@ -50,6 +50,7 @@
struct sudo_user sudo_user;
struct passwd *list_pw;
+sudo_conv_t sudo_conv; /* NULL in non-plugin */
static char sessid[7];
diff --git a/plugins/sudoers/regress/logging/check_wrap.c b/plugins/sudoers/regress/logging/check_wrap.c
index 6144b1074..2b9b8a22c 100644
--- a/plugins/sudoers/regress/logging/check_wrap.c
+++ b/plugins/sudoers/regress/logging/check_wrap.c
@@ -40,6 +40,9 @@
#include "missing.h"
#include "error.h"
+#include "sudo_plugin.h"
+
+sudo_conv_t sudo_conv; /* NULL in non-plugin */
extern void writeln_wrap(FILE *fp, char *line, size_t len, size_t maxlen);
diff --git a/plugins/sudoers/regress/parser/check_addr.c b/plugins/sudoers/regress/parser/check_addr.c
index 3cc52694d..a73de59c7 100644
--- a/plugins/sudoers/regress/parser/check_addr.c
+++ b/plugins/sudoers/regress/parser/check_addr.c
@@ -55,6 +55,8 @@ static int check_addr_printf(int msg_type, const char *fmt, ...);
struct interface *interfaces;
sudo_printf_t sudo_printf = check_addr_printf;
+sudo_conv_t sudo_conv; /* NULL in non-plugin */
+
static int
check_addr(char *input)
{
diff --git a/plugins/sudoers/regress/parser/check_fill.c b/plugins/sudoers/regress/parser/check_fill.c
index 39efad819..e0f39214f 100644
--- a/plugins/sudoers/regress/parser/check_fill.c
+++ b/plugins/sudoers/regress/parser/check_fill.c
@@ -26,6 +26,11 @@
# include <stdlib.h>
# endif
#endif /* STDC_HEADERS */
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
+# include "compat/stdbool.h"
+#endif /* HAVE_STDBOOL_H */
#ifdef HAVE_STRING_H
# include <string.h>
#endif /* HAVE_STRING_H */
@@ -40,12 +45,15 @@
#include "list.h"
#include "parse.h"
#include "toke.h"
+#include "sudo_plugin.h"
#include <gram.h>
/*
* TODO: test realloc
*/
+sudo_conv_t sudo_conv; /* NULL in non-plugin */
+
YYSTYPE yylval;
struct fill_test {
--
2.40.0