From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 20 Dec 2010 21:27:46 +0000 (-0500)
Subject: Add use_pty command_info flag for policies to indicate that a
X-Git-Tag: SUDO_1_8_0~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c833ff02b627c13b3b92d1cb5dbff71fcc62b75f;p=sudo

Add use_pty command_info flag for policies to indicate that a
pty should be allocated even if no I/O logging is performed.
---

diff --git a/src/exec.c b/src/exec.c
index ced5e09ef..5969ed7d3 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -156,7 +156,7 @@ int
 sudo_execve(struct command_details *details, char *argv[], char *envp[],
     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;
     sigaction_t sa;
     pid_t child;
@@ -177,10 +177,17 @@ sudo_execve(struct command_details *details, char *argv[], char *envp[],
 	}
     }
 
-    log_io = !tq_empty(&io_plugins);
-    if (log_io && !ISSET(details->flags, CD_BACKGROUND)) {
-	sudo_debug(8, "allocate pty for I/O logging");
-	pty_setup(details->euid);
+    /*
+     * 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");
+	    pty_setup(details->euid);
+	}
     }
 
     /*
diff --git a/src/sudo.h b/src/sudo.h
index 866104aa7..aba9fe34d 100644
--- a/src/sudo.h
+++ b/src/sudo.h
@@ -119,6 +119,7 @@ struct user_details {
 #define CD_SUDOEDIT		0x0200
 #define CD_BACKGROUND		0x0400
 #define CD_RBAC_ENABLED		0x0800
+#define CD_USE_PTY		0x1000
 
 struct command_details {
     uid_t uid;