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

Set active debug instance to sudo_debug_instance() during the

Browse Source 
conversation function.
This commit is contained in:
Todd C. Miller
2015-09-28 12:28:18 -06:00
parent 52ec12f52f
commit 04457ecee9
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/conversation.c
View File

@@ -49,6 +49,9 @@ sudo_conversation(int num_msgs, const struct sudo_conv_message msgs[],
const struct sudo_conv_message *msg; const struct sudo_conv_message *msg;
char *pass; char *pass;
int n, flags = tgetpass_flags; int n, flags = tgetpass_flags;
const int conv_debug_instance = sudo_debug_get_active_instance();
sudo_debug_set_active_instance(sudo_debug_instance);
for (n = 0; n < num_msgs; n++) { for (n = 0; n < num_msgs; n++) {
msg = &msgs[n]; msg = &msgs[n];
@@ -87,6 +90,7 @@ sudo_conversation(int num_msgs, const struct sudo_conv_message msgs[],
} }
} }
sudo_debug_set_active_instance(conv_debug_instance);
return 0; return 0;
err: err:
@@ -100,6 +104,7 @@ err:
} }
} while (n--); } while (n--);
sudo_debug_set_active_instance(conv_debug_instance);
return -1; return -1;
} }
@@ -115,6 +120,9 @@ sudo_conversation_printf(int msg_type, const char *fmt, ...)
{ {
va_list ap; va_list ap;
int len; int len;
const int conv_debug_instance = sudo_debug_get_active_instance();
sudo_debug_set_active_instance(sudo_debug_instance);
switch (msg_type) { switch (msg_type) {
case SUDO_CONV_INFO_MSG: case SUDO_CONV_INFO_MSG:
@@ -133,5 +141,6 @@ sudo_conversation_printf(int msg_type, const char *fmt, ...)
break; break;
} }
sudo_debug_set_active_instance(conv_debug_instance);
return len; return len;
} }