uucp dies if it cannot repeatedly set the same controlling tty

SCCS-vsn: sys/kern/tty.c 8.11

diff --git a/usr/src/sys/kern/tty.c b/usr/src/sys/kern/tty.c
index 81e6964..e4264b9 100644 (file)
--- a/usr/src/sys/kern/tty.c
+++ b/usr/src/sys/kern/tty.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tty.c       8.10 (Berkeley) %G%
+ *     @(#)tty.c       8.11 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -701,8 +701,8 @@ ttioctl(tp, cmd, data, flag)
        case TIOCSCTTY:                 /* become controlling tty */
                /* Session ctty vnode pointer set in vnode layer. */
                if (!SESS_LEADER(p) ||
        case TIOCSCTTY:                 /* become controlling tty */
                /* Session ctty vnode pointer set in vnode layer. */
                if (!SESS_LEADER(p) ||

-                   p->p_session->s_ttyvp ||
-                   (tp->t_session && tp->t_session != p->p_session))
+                   (p->p_session->s_ttyvp || tp->t_session) &&
+                   (tp->t_session != p->p_session))

                        return (EPERM);
                tp->t_session = p->p_session;
                tp->t_pgrp = p->p_pgrp;
                        return (EPERM);
                tp->t_session = p->p_session;
                tp->t_pgrp = p->p_pgrp;