From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sat, 29 May 2010 14:43:34 +0000 (-0400)
Subject: Make sudoers_io functions static to iolog.c
X-Git-Tag: SUDO_1_8_0~559
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6f02f38c07e73e24c8c1ff769cf0f3e1c430e6d;p=sudo

Make sudoers_io functions static to iolog.c
---

diff --git a/plugins/sudoers/iolog.c b/plugins/sudoers/iolog.c
index ae994e6a8..dacc950d9 100644
--- a/plugins/sudoers/iolog.c
+++ b/plugins/sudoers/iolog.c
@@ -176,7 +176,7 @@ build_idpath(char *pathbuf, size_t pathsize)
 }
 
 int
-sudoers_io_open(unsigned int version, sudo_conv_t conversation,
+static sudoers_io_open(unsigned int version, sudo_conv_t conversation,
     sudo_printf_t plugin_printf, char * const settings[],
     char * const user_info[], int argc, char * const argv[],
     char * const user_env[])
@@ -269,7 +269,7 @@ sudoers_io_open(unsigned int version, sudo_conv_t conversation,
 }
 
 void
-sudoers_io_close(int exit_status, int error)
+static sudoers_io_close(int exit_status, int error)
 {
 #ifdef HAVE_ZLIB
     if (def_compress_transcript) {
@@ -284,7 +284,7 @@ sudoers_io_close(int exit_status, int error)
 }
 
 int
-sudoers_io_version(int verbose)
+static sudoers_io_version(int verbose)
 {
     struct sudo_conv_message msg;
     struct sudo_conv_reply repl;
@@ -304,7 +304,7 @@ sudoers_io_version(int verbose)
 }
 
 int
-sudoers_io_log_output(const char *buf, unsigned int len)
+static sudoers_io_log_output(const char *buf, unsigned int len)
 {
     struct timeval now, tv;
     sigset_t omask;
@@ -335,3 +335,17 @@ sudoers_io_log_output(const char *buf, unsigned int len)
 
     return TRUE;
 }
+
+
+struct io_plugin sudoers_io = {
+    SUDO_IO_PLUGIN,
+    SUDO_API_VERSION,
+    sudoers_io_open,
+    sudoers_io_close,
+    sudoers_io_version,
+    NULL,			/* log_ttyin */
+    sudoers_io_log_output,	/* log_ttyout */
+    NULL,			/* log_stdin */
+    sudoers_io_log_output,	/* log_stdout */
+    sudoers_io_log_output	/* log_stderr */
+};
diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c
index c235b0d53..9cfd81da9 100644
--- a/plugins/sudoers/sudoers.c
+++ b/plugins/sudoers/sudoers.c
@@ -1428,16 +1428,3 @@ struct policy_plugin sudoers_policy = {
     sudoers_policy_invalidate,
     sudoers_policy_init_session
 };
-
-struct io_plugin sudoers_io = {
-    SUDO_IO_PLUGIN,
-    SUDO_API_VERSION,
-    sudoers_io_open,
-    sudoers_io_close,
-    sudoers_io_version,
-    NULL,			/* log_ttyin */
-    sudoers_io_log_output,	/* log_ttyout */
-    NULL,			/* log_stdin */
-    sudoers_io_log_output,	/* log_stdout */
-    sudoers_io_log_output	/* log_stderr */
-};
diff --git a/plugins/sudoers/sudoers.h b/plugins/sudoers/sudoers.h
index 9b738581b..0aa4b2816 100644
--- a/plugins/sudoers/sudoers.h
+++ b/plugins/sudoers/sudoers.h
@@ -291,13 +291,6 @@ int atobool(const char *str);
 int get_boottime(struct timeval *);
 
 /* iolog.c */
-int sudoers_io_open(unsigned int version, sudo_conv_t conversation,
-    sudo_printf_t sudo_printf, char * const settings[],
-    char * const user_info[], int argc, char * const argv[],
-    char * const user_env[]);
-void sudoers_io_close(int exit_status, int error);
-int sudoers_io_version(int verbose);
-int sudoers_io_log_output(const char *buf, unsigned int len);
 void io_nextid(void);
 
 /* env.c */