Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :func:`os.openpty` on Solaris and illumos: it no longer leaves the
pseudo-terminal as the controlling terminal of the calling process.
19 changes: 19 additions & 0 deletions Modules/posixmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -8863,11 +8863,30 @@ os_openpty_impl(PyObject *module)
goto posix_error;

#if !defined(__CYGWIN__) && !defined(__ANDROID__) && !defined(HAVE_DEV_PTC)
// Pushing "ptem" makes the slave a terminal, which a session leader
// without a controlling terminal then acquires as one despite O_NOCTTY.
// Note whether we already had one, so a new one can be disowned below.
int had_ctty = 0;
#ifdef TIOCNOTTY
int tty_fd = open("/dev/tty", O_RDONLY | O_NOCTTY);
if (tty_fd >= 0) {
had_ctty = 1;
close(tty_fd);
}
#endif
ioctl(slave_fd, I_PUSH, "ptem"); /* push ptem */
ioctl(slave_fd, I_PUSH, "ldterm"); /* push ldterm */
#ifndef __hpux
ioctl(slave_fd, I_PUSH, "ttcompat"); /* push ttcompat */
#endif /* __hpux */
#ifdef TIOCNOTTY
if (!had_ctty && getsid(0) == getpid()) {
// Disown it; TIOCNOTTY sends SIGHUP to the session leader.
PyOS_sighandler_t sig_saved = PyOS_setsig(SIGHUP, SIG_IGN);
ioctl(slave_fd, TIOCNOTTY);
PyOS_setsig(SIGHUP, sig_saved);
}
#endif
#endif /* HAVE_CYGWIN */
#endif /* HAVE_OPENPTY */

Expand Down