1 files changed, 18 insertions, 4 deletions

diff --git a/sshpty.c b/sshpty.c
index e89efb74a..feb22b06b 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshpty.c,v 1.30 2015/07/30 23:09:15 djm Exp $ */
+/* $OpenBSD: sshpty.c,v 1.31 2016/11/29 03:54:50 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -155,11 +155,11 @@ pty_make_controlling_tty(int *ttyfd, const char *tty)
                 error("SETPGRP %s",strerror(errno));
 #endif /* NEED_SETPGRP */
         fd = open(tty, O_RDWR);
-        if (fd < 0) {
+        if (fd < 0)
                 error("%.100s: %.100s", tty, strerror(errno));
-        } else {
+        else
                 close(fd);
-        }
+
         /* Verify that we now have a controlling tty. */
         fd = open(_PATH_TTY, O_WRONLY);
         if (fd < 0)
@@ -238,3 +238,17 @@ pty_setowner(struct passwd *pw, const char *tty, const char *role)
                 }
         }
 }
+
+/* Disconnect from the controlling tty. */
+void
+disconnect_controlling_tty(void)
+{
+#ifdef TIOCNOTTY
+        int fd;
+
+        if ((fd = open(_PATH_TTY, O_RDWR | O_NOCTTY)) >= 0) {
+                (void) ioctl(fd, TIOCNOTTY, NULL);
+                close(fd);
+        }
+#endif /* TIOCNOTTY */
+}