From: Ben Gras <ben@minix3.org>
Date: Mon, 10 Dec 2012 14:22:12 +0000 (+0100)
Subject: libutil: add O_NOCTTY back to old pty open code
X-Git-Tag: v3.2.1~160
X-Git-Url: http://zhaoyanbai.com/repos/named-checkzone.html?a=commitdiff_plain;h=59ba14bb1d74fb1702e8a2b1041a44254004099d;p=minix.git

libutil: add O_NOCTTY back to old pty open code

restores fix 4f78dfcabc1500bef891039d3bcb73253468339a

	. fixes e.g. ssh sessions not getting their own
	  controlling tty
---

diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 6a0e0c304..dc1bee630 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -105,7 +105,7 @@ openpty(int *amaster, int *aslave, char *name, struct termios *term,
 		for (cp = cp2 = TTY_OLD_SUFFIX TTY_NEW_SUFFIX; *cp2; cp2++) {
 			line[5] = 'p';
 			line[9] = *cp2;
-			if ((master = open(line, O_RDWR, 0)) == -1) {
+			if ((master = open(line, O_RDWR | O_NOCTTY, 0)) == -1) {
 				if (errno != ENOENT)
 					continue;	/* busy */
 				if ((size_t)(cp2 - cp + 1) < sizeof(TTY_OLD_SUFFIX))
@@ -120,7 +120,7 @@ openpty(int *amaster, int *aslave, char *name, struct termios *term,
 #ifndef __minix
 			    revoke(line) == 0 &&
 #endif
-			    (slave = open(line, O_RDWR, 0)) != -1) {
+			    (slave = open(line, O_RDWR | O_NOCTTY, 0)) != -1) {
 #ifndef __minix
 gotit:
 #endif