From 1fbb1819e774ee097a90db6788b66276f4a14ef7 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Thu, 10 Jun 2010 14:24:06 -0400
Subject: [PATCH] Use sudo_printf for I/O log version Clarify policy plugin
 version string

---
 plugins/sudoers/iolog.c   | 15 ++-------------
 plugins/sudoers/sudoers.c |  2 +-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/plugins/sudoers/iolog.c b/plugins/sudoers/iolog.c
index 35d05cdd6..f4dac6333 100644
--- a/plugins/sudoers/iolog.c
+++ b/plugins/sudoers/iolog.c
@@ -317,19 +317,8 @@ sudoers_io_close(int exit_status, int error)
 static int
 sudoers_io_version(int verbose)
 {
-    struct sudo_conv_message msg;
-    struct sudo_conv_reply repl;
-    char *str;
-
-    easprintf(&str, "Sudoers I/O plugin version %s\n", PACKAGE_VERSION);
-
-    /* Call conversation function */
-    memset(&msg, 0, sizeof(msg));
-    msg.msg_type = SUDO_CONV_INFO_MSG;
-    msg.msg = str;
-    memset(&repl, 0, sizeof(repl));
-    sudo_conv(1, &msg, &repl);
-    free(str);
+    sudo_printf(SUDO_CONV_INFO_MSG, "Sudoers I/O plugin version %s\n",
+	PACKAGE_VERSION);
 
     return TRUE;
 }
diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index a21ab11cd..0d113e1dd 100644
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -1149,7 +1149,7 @@ cleanup(int gotsignal)
 static int
 sudoers_policy_version(int verbose)
 {
-    sudo_printf(SUDO_CONV_INFO_MSG, "Sudoers plugin version %s\n",
+    sudo_printf(SUDO_CONV_INFO_MSG, "Sudoers policy plugin version %s\n",
 	PACKAGE_VERSION);
 
     if (verbose) {