diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2022-02-14 14:19:40 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2022-02-14 14:19:40 +1100 |
| commit | df93529dd727fdf2fb290700cd4f1adb0c3c084b (patch) | |
| tree | 977bfeb9190a2e6c0e7427aa54c9e3473cf40f2f | |
| parent | 766176cfdbfd7ec38bb6118dde6e4daa0df34888 (diff) | |
Test if sshd accidentally acquires controlling tty
When SSHD_ACQUIRES_CTTY is defined, test for the problematic behaviour
in the STREAMS code before activating the workaround. ok djm@
| -rw-r--r-- | openbsd-compat/bsd-openpty.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c index 078d666c..f5507000 100644 --- a/openbsd-compat/bsd-openpty.c +++ b/openbsd-compat/bsd-openpty.c @@ -66,6 +66,7 @@ #include <unistd.h> #include "misc.h" +#include "log.h" #ifndef O_NOCTTY #define O_NOCTTY 0 @@ -73,8 +74,7 @@ #if defined(HAVE_DEV_PTMX) && !defined(HAVE__GETPTY) static int -openpty_streams(int *amaster, int *aslave, char *name, struct termios *termp, - struct winsize *winp) +openpty_streams(int *amaster, int *aslave) { /* * This code is used e.g. on Solaris 2.x. (Note that Solaris 2.3 @@ -162,14 +162,21 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp, * different session and is available to become controlling terminal * for the client's subprocess. See bugzilla #245 for details. */ + int r, fd; static int junk_ptyfd = -1, junk_ttyfd; - if (junk_ptyfd == -1) - (void)openpty_streams(&junk_ptyfd, &junk_ttyfd, NULL, NULL, - NULL); + r = openpty_streams(amaster, aslave); + if (junk_ptyfd == -1 && (fd = open(_PATH_TTY, O_RDWR|O_NOCTTY)) >= 0) { + close(fd); + junk_ptyfd = *amaster; + junk_ttyfd = *aslave; + debug("STREAMS bug workaround pty %d tty %d name %s", + junk_ptyfd, junk_ttyfd, ttyname(junk_ttyfd)); + } else + return r; #endif - return openpty_streams(amaster, aslave, name, termp, winp); + return openpty_streams(amaster, aslave); #elif defined(HAVE_DEV_PTS_AND_PTC) /* AIX-style pty code. */ |