Move _sudo_printf from src/conversation.c to common/sudo_printf.c.
Add sudo_printf function pointer that is initialized to _sudo_printf() instead of requiring a sudo_conv function pointer everywhere. The plugin will reset sudo_printf to point to the version passed in via the plugin open function. Now plugin_error.c can just call sudo_printf in all cases. The sudoers binaries no longer need their own version of sudo_printf.
This commit is contained in:
@@ -56,8 +56,6 @@ __dso_public int main(int argc, char *argv[]);
|
||||
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)
|
||||
{
|
||||
@@ -156,7 +154,7 @@ main(int argc, char *argv[])
|
||||
|
||||
/* STUB */
|
||||
void
|
||||
cleanup(int gotsig)
|
||||
sudoers_cleanup(int gotsig)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
@@ -42,6 +42,7 @@
|
||||
|
||||
#define SUDO_ERROR_WRAP 0
|
||||
|
||||
#include "missing.h"
|
||||
#include "list.h"
|
||||
#include "parse.h"
|
||||
#include "toke.h"
|
||||
@@ -54,8 +55,6 @@ __dso_public int main(int argc, char *argv[]);
|
||||
* TODO: test realloc
|
||||
*/
|
||||
|
||||
sudo_conv_t sudo_conv; /* NULL in non-plugin */
|
||||
|
||||
YYSTYPE sudoerslval;
|
||||
|
||||
struct fill_test {
|
||||
@@ -186,7 +185,7 @@ main(int argc, char *argv[])
|
||||
|
||||
/* STUB */
|
||||
void
|
||||
cleanup(int gotsig)
|
||||
sudoers_cleanup(int gotsig)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user