isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions 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

10
plugins/sudoers/sudoers.c
View File

@@ -1198,7 +1198,7 @@ deserialize_info(char * const settings[], char * const user_info[])
{
char * const *cur;
const char *p, *groups = NULL;
const char *debug_file = NULL, *debug_flags = NULL;
const char *debug_flags = NULL;
int flags = 0;
debug_decl(deserialize_info, SUDO_DEBUG_PLUGIN)
@@ -1211,10 +1211,6 @@ deserialize_info(char * const settings[], char * const user_info[])
user_closefrom = atoi(*cur + sizeof("closefrom=") - 1);
continue;
}
if (MATCHES(*cur, "debug_file=")) {
debug_file = *cur + sizeof("debug_file=") - 1;
continue;
}
if (MATCHES(*cur, "debug_flags=")) {
debug_flags = *cur + sizeof("debug_flags=") - 1;
continue;
@@ -1409,8 +1405,8 @@ deserialize_info(char * const settings[], char * const user_info[])
}
/* Setup debugging if indicated. */
if (debug_file != NULL && debug_flags != NULL) {
sudo_debug_init(debug_file, debug_flags);
if (debug_flags != NULL) {
sudo_debug_init(NULL, debug_flags);
for (cur = settings; *cur != NULL; cur++)
sudo_debug_printf(SUDO_DEBUG_INFO, "settings: %s", *cur);
for (cur = user_info; *cur != NULL; cur++)