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

Log the process id in the debug file output. Since we don't want

Browse Source 
to keep calling getpid(), stash the value at init time and when we
fork().
This commit is contained in:
Todd C. Miller
2012-04-06 15:20:16 -04:00
parent bb898cd5df
commit c8ce3a0a85
6 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
common/sudo_debug.c
View File

@@ -114,6 +114,8 @@ const char *const sudo_debug_subsystems[] = {
static int sudo_debug_settings[NUM_SUBSYSTEMS];
static int sudo_debug_fd = -1;
static int sudo_debug_mode;
static char sudo_debug_pidstr[(((sizeof(int) * 8) + 2) / 3) + 3];
static size_t sudo_debug_pidlen;
extern sudo_conv_t sudo_conv;
@@ -174,9 +176,27 @@ int sudo_debug_init(const char *debugfile, const char *settings)
}
efree(buf);
(void)snprintf(sudo_debug_pidstr, sizeof(sudo_debug_pidstr), "[%d] ",
(int)getpid());
sudo_debug_pidlen = strlen(sudo_debug_pidstr);
return 1;
}
pid_t
sudo_debug_fork(void)
{
pid_t pid;
if ((pid = fork()) == 0) {
(void)snprintf(sudo_debug_pidstr, sizeof(sudo_debug_pidstr), "[%d] ",
(int)getpid());
sudo_debug_pidlen = strlen(sudo_debug_pidstr);
}
return pid;
}
void
sudo_debug_enter(const char *func, const char *file, int line,
int subsys)
@@ -298,11 +318,11 @@ sudo_debug_write_file(const char *func, const char *file, int lineno,
int iovcnt = 4;
bool need_newline = false;
/* Prepend program name with trailing space. */
/* Prepend program name and pid with a trailing space. */
iov[1].iov_base = (char *)getprogname();
iov[1].iov_len = strlen(iov[1].iov_base);
iov[2].iov_base = " ";
iov[2].iov_len = 1;
iov[2].iov_base = sudo_debug_pidstr;
iov[2].iov_len = sudo_debug_pidlen;
/* Add string along with newline if it doesn't have one. */
iov[3].iov_base = (char *)str;