From: Daniel Golle <daniel@makrotopia.org>
Date: Wed, 20 May 2020 13:57:21 +0000 (+0100)
Subject: jail: use sane termios settings for console pts
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b84a3294384cb9250f594be50ddfe22c80a003b6;p=oweals%2Fprocd.git

jail: use sane termios settings for console pts

The previously used expression (inpired by LXC) didn't actually make
a lot of sense. Replace it with something inspired by a more recent
version of LXC...

Reported-by: Oldřich Jedlička <oldium.pro@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---

diff --git a/jail/console.c b/jail/console.c
index 75ce9c5..d03edc5 100644
--- a/jail/console.c
+++ b/jail/console.c
@@ -38,11 +38,12 @@ static inline int setup_tios(int fd, struct termios *oldtios)
 
 	newtios = *oldtios;
 
-	/* Remove the echo characters and signal reception, the echo
-	 * will be done with master proxying */
-	newtios.c_iflag &= ~IGNBRK;
-	newtios.c_iflag &= BRKINT;
-	newtios.c_lflag &= ~(ECHO|ICANON|ISIG);
+	/* We use the same settings that ssh does. */
+	newtios.c_iflag |= IGNPAR;
+	newtios.c_iflag &= ~(ISTRIP | INLCR | IGNCR | ICRNL | IXON | IXANY | IXOFF);
+	newtios.c_lflag &= ~(TOSTOP | ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHONL);
+	newtios.c_oflag &= ~ONLCR;
+	newtios.c_oflag |= OPOST;
 	newtios.c_cc[VMIN] = 1;
 	newtios.c_cc[VTIME] = 0;