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:
@@ -458,10 +458,8 @@ sudoers_policy_open(unsigned int version, sudo_conv_t conversation,
|
||||
debug_decl(sudoers_policy_open, SUDO_DEBUG_PLUGIN)
|
||||
|
||||
sudo_version = version;
|
||||
if (!sudo_conv)
|
||||
sudo_conv = conversation;
|
||||
if (!sudo_printf)
|
||||
sudo_printf = plugin_printf;
|
||||
sudo_conv = conversation;
|
||||
sudo_printf = plugin_printf;
|
||||
|
||||
/* Plugin args are only specified for API version 1.2 and higher. */
|
||||
if (sudo_version < SUDO_API_MKVERSION(1, 2))
|
||||
|
Reference in New Issue
Block a user