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

Add use_pty command_info flag for policies to indicate that a

Browse Source 
pty should be allocated even if no I/O logging is performed.
This commit is contained in:
Todd C. Miller
2010-12-20 16:27:46 -05:00
parent c1a22ff152
commit c833ff02b6
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/exec.c
View File

@@ -156,7 +156,7 @@ int
sudo_execve(struct command_details *details, char *argv[], char *envp[], sudo_execve(struct command_details *details, char *argv[], char *envp[],
struct command_status *cstat) struct command_status *cstat)
{ {
int log_io, maxfd, n, nready, sv[2]; int maxfd, n, nready, sv[2], log_io = FALSE;
fd_set *fdsr, *fdsw; fd_set *fdsr, *fdsw;
sigaction_t sa; sigaction_t sa;
pid_t child; pid_t child;
@@ -177,11 +177,18 @@ sudo_execve(struct command_details *details, char *argv[], char *envp[],
} }
} }
log_io = !tq_empty(&io_plugins); /*
if (log_io && !ISSET(details->flags, CD_BACKGROUND)) { * If we have an I/O plugin or the policy plugin has requested one, we
* need to allocate a pty. It is OK to set log_io in the pty-only case
* as the tailqueue plugin will be empty and no I/O logging will occur.
*/
if (!tq_empty(&io_plugins) || ISSET(details->flags, CD_USE_PTY)) {
log_io = TRUE;
if (!ISSET(details->flags, CD_BACKGROUND)) {
sudo_debug(8, "allocate pty for I/O logging"); sudo_debug(8, "allocate pty for I/O logging");
pty_setup(details->euid); pty_setup(details->euid);
} }
}
/* /*
* We communicate with the child over a bi-directional pair of sockets. * We communicate with the child over a bi-directional pair of sockets.

1
src/sudo.h
View File

@@ -119,6 +119,7 @@ struct user_details {
#define CD_SUDOEDIT 0x0200 #define CD_SUDOEDIT 0x0200
#define CD_BACKGROUND 0x0400 #define CD_BACKGROUND 0x0400
#define CD_RBAC_ENABLED 0x0800 #define CD_RBAC_ENABLED 0x0800
#define CD_USE_PTY 0x1000
struct command_details { struct command_details {
uid_t uid; uid_t uid;