mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-02 15:25:58 +00:00
Code Issues Releases Wiki Activity

Make sudoers_io functions static to iolog.c

Browse Source
This commit is contained in:
Todd C. Miller
2010-05-29 10:43:34 -04:00
parent 73b630fa97
commit b6f02f38c0
3 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/sudoers/iolog.c
View File

@@ -176,7 +176,7 @@ build_idpath(char *pathbuf, size_t pathsize)
} }
int 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[], sudo_printf_t plugin_printf, char * const settings[],
char * const user_info[], int argc, char * const argv[], char * const user_info[], int argc, char * const argv[],
char * const user_env[]) char * const user_env[])
@@ -269,7 +269,7 @@ sudoers_io_open(unsigned int version, sudo_conv_t conversation,
} }
void void
sudoers_io_close(int exit_status, int error) static sudoers_io_close(int exit_status, int error)
{ {
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
if (def_compress_transcript) { if (def_compress_transcript) {
@@ -284,7 +284,7 @@ sudoers_io_close(int exit_status, int error)
} }
int int
sudoers_io_version(int verbose) static sudoers_io_version(int verbose)
{ {
struct sudo_conv_message msg; struct sudo_conv_message msg;
struct sudo_conv_reply repl; struct sudo_conv_reply repl;
@@ -304,7 +304,7 @@ sudoers_io_version(int verbose)
} }
int 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; struct timeval now, tv;
sigset_t omask; sigset_t omask;
@@ -335,3 +335,17 @@ sudoers_io_log_output(const char *buf, unsigned int len)
return TRUE; 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 */
};

13
plugins/sudoers/sudoers.c
View File

@@ -1428,16 +1428,3 @@ struct policy_plugin sudoers_policy = {
sudoers_policy_invalidate, sudoers_policy_invalidate,
sudoers_policy_init_session 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 */
};

7
plugins/sudoers/sudoers.h
View File

@@ -291,13 +291,6 @@ int atobool(const char *str);
int get_boottime(struct timeval *); int get_boottime(struct timeval *);
/* iolog.c */ /* 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); void io_nextid(void);
/* env.c */ /* env.c */