From 2b8fc46e2cdab8336225c10ca709400fe8df160c Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Wed, 2 Jun 2010 11:10:04 -0400 Subject: [PATCH] Fix symbol name conflict with sudo_printf. --- src/conversation.c | 2 +- src/sudo.c | 6 +++--- src/sudo_plugin_int.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conversation.c b/src/conversation.c index 0183ceb6a..a89618291 100644 --- a/src/conversation.c +++ b/src/conversation.c @@ -107,7 +107,7 @@ err: } int -sudo_printf(int msg_type, const char *fmt, ...) +_sudo_printf(int msg_type, const char *fmt, ...) { va_list ap; FILE *fp; diff --git a/src/sudo.c b/src/sudo.c index 13df14117..d500d84eb 100644 --- a/src/sudo.c +++ b/src/sudo.c @@ -146,7 +146,7 @@ main(int argc, char *argv[], char *envp[]) /* Open policy plugin. */ ok = policy_plugin.u.policy->open(SUDO_API_VERSION, sudo_conversation, - sudo_printf, settings, user_info, envp); + _sudo_printf, settings, user_info, envp); if (ok != TRUE) { if (ok == -2) usage(1); @@ -160,7 +160,7 @@ main(int argc, char *argv[], char *envp[]) policy_plugin.u.policy->show_version(!user_details.uid); tq_foreach_fwd(&io_plugins, plugin) { ok = plugin->u.io->open(SUDO_API_VERSION, sudo_conversation, - sudo_printf, settings, user_info, nargc, nargv, envp); + _sudo_printf, settings, user_info, nargc, nargv, envp); if (ok == TRUE) plugin->u.io->show_version(user_details.uid == ROOT_UID); } @@ -212,7 +212,7 @@ main(int argc, char *argv[], char *envp[]) for (plugin = io_plugins.first; plugin != NULL; plugin = next) { next = plugin->next; ok = plugin->u.io->open(SUDO_API_VERSION, sudo_conversation, - sudo_printf, settings, user_info, nargc, nargv, envp); + _sudo_printf, settings, user_info, nargc, nargv, envp); switch (ok) { case TRUE: break; diff --git a/src/sudo_plugin_int.h b/src/sudo_plugin_int.h index 7d3c2c73a..86c3489c3 100644 --- a/src/sudo_plugin_int.h +++ b/src/sudo_plugin_int.h @@ -31,7 +31,7 @@ extern struct plugin_container_list io_plugins; int sudo_conversation(int num_msgs, const struct sudo_conv_message msgs[], struct sudo_conv_reply replies[]); -int sudo_printf(int msg_type, const char *fmt, ...); +int _sudo_printf(int msg_type, const char *fmt, ...); void sudo_load_plugins(const char *conf_file, struct plugin_container *policy_plugin, -- 2.40.0