Some of the line disciplines want to check for suser. Better to pass them

a process instead of using curproc.  ok deraadt

7 files changed, 21 insertions, 21 deletions

diff --git a/sys/arch/vax/qbus/dhu.c b/sys/arch/vax/qbus/dhu.c
index 378c1a7f757..c95d6c3acbc 100644
--- a/sys/arch/vax/qbus/dhu.c
+++ b/sys/arch/vax/qbus/dhu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhu.c,v 1.15 2009/11/09 17:53:39 nicm Exp $	*/
+/*	$OpenBSD: dhu.c,v 1.16 2010/04/12 12:57:52 tedu Exp $	*/
 /*	$NetBSD: dhu.c,v 1.19 2000/06/04 06:17:01 matt Exp $	*/
 /*
  * Copyright (c) 2003, Hugh Graham.
@@ -455,7 +455,7 @@ dhuopen(dev, flag, mode, p)
 	splx(s);
 	if (error)
 		return (error);
-	return ((*linesw[tp->t_line].l_open)(dev, tp));
+	return ((*linesw[tp->t_line].l_open)(dev, tp, p));
 }
 
 /*ARGSUSED*/
@@ -476,7 +476,7 @@ dhuclose(dev, flag, mode, p)
 
 	tp = sc->sc_dhu[line].dhu_tty;
 
-	(*linesw[tp->t_line].l_close)(tp, flag);
+	(*linesw[tp->t_line].l_close)(tp, flag, p);
 
 	/* Make sure a BREAK state is not left enabled. */
 
diff --git a/sys/arch/vax/qbus/dl.c b/sys/arch/vax/qbus/dl.c
index 7a863891222..b0e07c19fe3 100644
--- a/sys/arch/vax/qbus/dl.c
+++ b/sys/arch/vax/qbus/dl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl.c,v 1.9 2009/11/09 17:53:39 nicm Exp $	*/
+/*	$OpenBSD: dl.c,v 1.10 2010/04/12 12:57:52 tedu Exp $	*/
 /*	$NetBSD: dl.c,v 1.11 2000/01/24 02:40:29 matt Exp $	*/
 
 /*-
@@ -312,7 +312,7 @@ dlopen(dev, flag, mode, p)
 	} else if ((tp->t_state & TS_XCLUDE) && suser(p, 0) != 0)
 		return EBUSY;
 
-	return ((*linesw[tp->t_line].l_open)(dev, tp));
+	return ((*linesw[tp->t_line].l_open)(dev, tp, p));
 }
 
 /*ARGSUSED*/
@@ -330,7 +330,7 @@ dlclose(dev, flag, mode, p)
 	sc = dl_cd.cd_devs[unit];
       	tp = sc->sc_tty;
 
-	(*linesw[tp->t_line].l_close)(tp, flag);
+	(*linesw[tp->t_line].l_close)(tp, flag, p);
 
 	/* Make sure a BREAK state is not left enabled. */
 	dlbrk(sc, 0);
diff --git a/sys/arch/vax/qbus/dz.c b/sys/arch/vax/qbus/dz.c
index ff604e6d7f3..6d08ed1b5b5 100644
--- a/sys/arch/vax/qbus/dz.c
+++ b/sys/arch/vax/qbus/dz.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dz.c,v 1.20 2009/11/09 17:53:39 nicm Exp $	*/
+/*	$OpenBSD: dz.c,v 1.21 2010/04/12 12:57:52 tedu Exp $	*/
 /*	$NetBSD: dz.c,v 1.23 2000/06/04 02:14:12 matt Exp $	*/
 /*
  * Copyright (c) 1996  Ken C. Wellsch.  All rights reserved.
@@ -316,7 +316,7 @@ dzopen(dev_t dev, int flag, int mode, struct proc *p)
 	splx(s);
 	if (error)
 		return (error);
-	return ((*linesw[tp->t_line].l_open)(dev, tp));
+	return ((*linesw[tp->t_line].l_open)(dev, tp, p));
 }
 
 /*ARGSUSED*/
@@ -334,7 +334,7 @@ dzclose(dev_t dev, int flag, int mode, struct proc *p)
 
 	tp = sc->sc_dz[line].dz_tty;
 
-	(*linesw[tp->t_line].l_close)(tp, flag);
+	(*linesw[tp->t_line].l_close)(tp, flag, p);
 
 	/* Make sure a BREAK state is not left enabled. */
 	(void) dzmctl(sc, line, DML_BRK, DMBIC);
diff --git a/sys/arch/vax/qbus/qd.c b/sys/arch/vax/qbus/qd.c
index 77f05952695..ea77385df4b 100644
--- a/sys/arch/vax/qbus/qd.c
+++ b/sys/arch/vax/qbus/qd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qd.c,v 1.16 2009/11/09 17:53:39 nicm Exp $	*/
+/*	$OpenBSD: qd.c,v 1.17 2010/04/12 12:57:52 tedu Exp $	*/
 /*	$NetBSD: qd.c,v 1.17 2000/01/24 02:40:29 matt Exp $	*/
 
 /*-
@@ -857,7 +857,7 @@ qdopen(dev, flag, mode, p)
 		* enable intrpts, open line discipline 
 		*/
 		dga->csr |= GLOBAL_IE;	/* turn on the interrupts */
-		return ((*linesw[tp->t_line].l_open)(dev, tp));
+		return ((*linesw[tp->t_line].l_open)(dev, tp, p));
 	}
 	dga->csr |= GLOBAL_IE;	/* turn on the interrupts */
 	return(0);
@@ -1046,7 +1046,7 @@ qdclose(dev, flag, mode, p)
 		* this is the console 
 		*/
 		tp = qd_tty[minor_dev];
-		(*linesw[tp->t_line].l_close)(tp, flag);
+		(*linesw[tp->t_line].l_close)(tp, flag, p);
 		ttyclose(tp);
 		tp->t_state = 0;
 		qdflags[unit].inuse &= ~CONS_DEV;
diff --git a/sys/arch/vax/uba/qv.c b/sys/arch/vax/uba/qv.c
index 4ae41721a87..a70bc1345e1 100644
--- a/sys/arch/vax/uba/qv.c
+++ b/sys/arch/vax/uba/qv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qv.c,v 1.13 2007/09/15 14:28:17 krw Exp $	*/
+/*	$OpenBSD: qv.c,v 1.14 2010/04/12 12:57:52 tedu Exp $	*/
 /*	$NetBSD: qv.c,v 1.2 1996/09/02 06:44:28 mycroft Exp $	*/
 
 /*-
@@ -406,7 +406,7 @@ qvopen(dev, flag)
 	 * mouse channel. For the mouse we init the ring ptr's.
 	 */
 	if( QVCHAN(unit) != QVMOUSECHAN )
-		return ((*linesw[tp->t_line].l_open)(dev, tp));
+		return ((*linesw[tp->t_line].l_open)(dev, tp, p));
 	else {
 		mouseon = 1;
 		/* set up event queue for later */
@@ -447,7 +447,7 @@ qvclose(dev, flag, mode, p)
 	 * otherwise clear the state flag, and put the keyboard into down/up.
 	 */
 	if (QVCHAN(unit) != QVMOUSECHAN) {
-		(*linesw[tp->t_line].l_close)(tp, flag);
+		(*linesw[tp->t_line].l_close)(tp, flag, p);
 		error = ttyclose(tp);
 	} else {
 		mouseon = 0;
diff --git a/sys/arch/vax/vax/gencons.c b/sys/arch/vax/vax/gencons.c
index d60fbd6f45e..ae085b62f87 100644
--- a/sys/arch/vax/vax/gencons.c
+++ b/sys/arch/vax/vax/gencons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gencons.c,v 1.21 2009/11/09 17:53:39 nicm Exp $	*/
+/*	$OpenBSD: gencons.c,v 1.22 2010/04/12 12:57:52 tedu Exp $	*/
 /*	$NetBSD: gencons.c,v 1.22 2000/01/24 02:40:33 matt Exp $	*/
 
 /*
@@ -110,7 +110,7 @@ gencnopen(dev, flag, mode, p)
 	mtpr(GC_RIE, pr_rxcs[unit]); /* Turn on interrupts */
 	mtpr(GC_TIE, pr_txcs[unit]);
 
-        return ((*linesw[tp->t_line].l_open)(dev, tp));
+        return ((*linesw[tp->t_line].l_open)(dev, tp, p));
 }
 
 int
@@ -123,7 +123,7 @@ gencnclose(dev, flag, mode, p)
 
 	if (minor(dev) == 0)
 		consopened = 0;
-	(*linesw[tp->t_line].l_close)(tp, flag);
+	(*linesw[tp->t_line].l_close)(tp, flag, p);
 	ttyclose(tp);
 	return (0);
 }
diff --git a/sys/arch/vax/vxt/qsc.c b/sys/arch/vax/vxt/qsc.c
index 491eb43fc17..274a4c57375 100644
--- a/sys/arch/vax/vxt/qsc.c
+++ b/sys/arch/vax/vxt/qsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qsc.c,v 1.5 2009/11/09 17:53:39 nicm Exp $	*/
+/*	$OpenBSD: qsc.c,v 1.6 2010/04/12 12:57:52 tedu Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -613,7 +613,7 @@ qscopen(dev_t dev, int flag, int mode, struct proc *p)
 	 */
 	tp->t_dev = dev;
 	splx(s);
-	return ((*linesw[tp->t_line].l_open)(dev, tp));
+	return ((*linesw[tp->t_line].l_open)(dev, tp, p));
 }
 
 int
@@ -627,7 +627,7 @@ qscclose(dev_t dev, int flag, int mode, struct proc *p)
 	sc = (struct qscsoftc *)qsc_cd.cd_devs[0];
 
 	tp = sc->sc_tty[line];
-	(*linesw[tp->t_line].l_close)(tp, flag);
+	(*linesw[tp->t_line].l_close)(tp, flag, p);
 	ttyclose(tp);
 
 	return (0);