Fix symbol name conflict with sudo_printf.

diff --git a/src/conversation.c b/src/conversation.c
index 0183ceb6a8377eb80fdc6ffb21ef393e265a48cf..a89618291f43c4e5f25381df874897c68c6e7b38 100644 (file)
--- 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 13df141179c7c169d90a372ab018136081d1c0b5..d500d84eb965eead8e3bdcd02725b82445c295ef 100644 (file)
--- 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 7d3c2c73afc7579d93340dd1a255267667163e47..86c3489c35de035345d0b7edb66d300d6953104f 100644 (file)
--- 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,