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

No longer pass debug_file to plugin, plugins must now use CONV_DEBUG_MSG

Browse Source
This commit is contained in:
Todd C. Miller
2011-11-30 14:56:41 -05:00
parent 13514ec03e
commit ab887a6fb0
4 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/sudo_debug.c
View File

@@ -250,6 +250,9 @@ sudo_debug_write(const char *str, int len)
if (sudo_debug_fd == -1) {
/* Use conversation function if no debug fd. */
if (sudo_conv == NULL)
return;
struct sudo_conv_message msg;
struct sudo_conv_reply repl;
@@ -297,7 +300,7 @@ sudo_debug_printf2(int level, const char *fmt, ...)
va_list ap;
char *buf;
if (sudo_debug_fd == -1)
if (sudo_debug_fd == -1 && sudo_conv == NULL)
return;
/* Extract pri and subsystem from level. */
@@ -325,11 +328,7 @@ sudo_debug_execve2(int level, const char *path, char *const argv[], char *const
int buflen, pri, subsys, log_envp = 0;
size_t plen;
if (sudo_debug_fd == -1)
return;
#define EXEC_PREFIX "exec "
if (sudo_debug_fd == -1)
if (sudo_debug_fd == -1 && sudo_conv == NULL)
return;
/* Extract pri and subsystem from level. */
@@ -344,6 +343,8 @@ sudo_debug_execve2(int level, const char *path, char *const argv[], char *const
if (sudo_debug_settings[subsys] >= SUDO_DEBUG_DEBUG - 1 && envp[0] != NULL)
log_envp = 1;
#define EXEC_PREFIX "exec "
/* Alloc and build up buffer. */
plen = strlen(path);
buflen = sizeof(EXEC_PREFIX) -1 + plen;