isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix symbol name conflict with sudo_printf.

Browse Source
This commit is contained in:
Todd C. Miller
2010-06-02 11:10:04 -04:00
parent 41436a7869
commit 2b8fc46e2c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/conversation.c
View File

@@ -107,7 +107,7 @@ err:
} }
int int
sudo_printf(int msg_type, const char *fmt, ...) _sudo_printf(int msg_type, const char *fmt, ...)
{ {
va_list ap; va_list ap;
FILE *fp; FILE *fp;

6
src/sudo.c
View File

@@ -146,7 +146,7 @@ main(int argc, char *argv[], char *envp[])
/* Open policy plugin. */ /* Open policy plugin. */
ok = policy_plugin.u.policy->open(SUDO_API_VERSION, sudo_conversation, 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 != TRUE) {
if (ok == -2) if (ok == -2)
usage(1); usage(1);
@@ -160,7 +160,7 @@ main(int argc, char *argv[], char *envp[])
policy_plugin.u.policy->show_version(!user_details.uid); policy_plugin.u.policy->show_version(!user_details.uid);
tq_foreach_fwd(&io_plugins, plugin) { tq_foreach_fwd(&io_plugins, plugin) {
ok = plugin->u.io->open(SUDO_API_VERSION, sudo_conversation, 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) if (ok == TRUE)
plugin->u.io->show_version(user_details.uid == ROOT_UID); 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) { for (plugin = io_plugins.first; plugin != NULL; plugin = next) {
next = plugin->next; next = plugin->next;
ok = plugin->u.io->open(SUDO_API_VERSION, sudo_conversation, 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) { switch (ok) {
case TRUE: case TRUE:
break; break;

2
src/sudo_plugin_int.h
View File

@@ -31,7 +31,7 @@ extern struct plugin_container_list io_plugins;
int sudo_conversation(int num_msgs, const struct sudo_conv_message msgs[], int sudo_conversation(int num_msgs, const struct sudo_conv_message msgs[],
struct sudo_conv_reply replies[]); 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, void sudo_load_plugins(const char *conf_file,
struct plugin_container *policy_plugin, struct plugin_container *policy_plugin,