BSD 4_4_Lite1 release

[unix-history] / usr / src / sys / kern / tty_tty.c

diff --git a/usr/src/sys/kern/tty_tty.c b/usr/src/sys/kern/tty_tty.c
index df4b7b3..964fc6f 100644 (file)
--- a/usr/src/sys/kern/tty_tty.c
+++ b/usr/src/sys/kern/tty_tty.c
@@ -1,10 +1,36 @@
 /*-
 /*-

- * Copyright (c) 1982, 1986, 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)tty_tty.c   7.21 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)tty_tty.c   8.2 (Berkeley) 9/23/93

  */
 
 /*
  */
 
 /*


@@ -19,7 +45,7 @@
 #include <sys/vnode.h>
 #include <sys/file.h>
 
 #include <sys/vnode.h>
 #include <sys/file.h>
 

-#define cttyvp(p) ((p)->p_flag&SCTTY ? (p)->p_session->s_ttyvp : NULL)
+#define cttyvp(p) ((p)->p_flag & P_CONTROLT ? (p)->p_session->s_ttyvp : NULL)

 
 /*ARGSUSED*/
 cttyopen(dev, flag, mode, p)
 
 /*ARGSUSED*/
 cttyopen(dev, flag, mode, p)


@@ -35,12 +61,12 @@ cttyopen(dev, flag, mode, p)
        VOP_LOCK(ttyvp);
 #ifdef PARANOID
        /*
        VOP_LOCK(ttyvp);
 #ifdef PARANOID
        /*

-        * Since group is tty and mode is 620 on all terminal lines
+        * Since group is tty and mode is 620 on most terminal lines

         * and since sessions protect terminals from processes outside
         * your session, this check is probably no longer necessary.
         * Since it inhibits setuid root programs that later switch 
         * to another user from accessing /dev/tty, we have decided
         * and since sessions protect terminals from processes outside
         * your session, this check is probably no longer necessary.
         * Since it inhibits setuid root programs that later switch 
         * to another user from accessing /dev/tty, we have decided

-        * to delete this test for now.
+        * to delete this test. (mckusick 5/93)

         */
        error = VOP_ACCESS(ttyvp,
          (flag&FREAD ? VREAD : 0) | (flag&FWRITE ? VWRITE : 0), p->p_ucred, p);
         */
        error = VOP_ACCESS(ttyvp,
          (flag&FREAD ? VREAD : 0) | (flag&FWRITE ? VWRITE : 0), p->p_ucred, p);


@@ -99,7 +125,7 @@ cttyioctl(dev, cmd, addr, flag, p)
                return (EIO);
        if (cmd == TIOCNOTTY) {
                if (!SESS_LEADER(p)) {
                return (EIO);
        if (cmd == TIOCNOTTY) {
                if (!SESS_LEADER(p)) {

-                       p->p_flag &= ~SCTTY;
+                       p->p_flag &= ~P_CONTROLT;

                        return (0);
                } else
                        return (EINVAL);
                        return (0);
                } else
                        return (EINVAL);