From owner-p4-projects@FreeBSD.ORG  Mon Jul  4 11:03:36 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1800A16A421; Mon,  4 Jul 2005 11:03:36 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BBDC316A447
	for <perforce@freebsd.org>; Mon,  4 Jul 2005 11:03:35 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A7E0743D53
	for <perforce@freebsd.org>; Mon,  4 Jul 2005 11:03:34 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j64B3YHg093721
	for <perforce@freebsd.org>; Mon, 4 Jul 2005 11:03:34 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j64B3Yf0093714
	for perforce@freebsd.org; Mon, 4 Jul 2005 11:03:34 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 4 Jul 2005 11:03:34 GMT
Message-Id: <200507041103.j64B3Yf0093714@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79531 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 11:03:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=79531

Change 79531 by rwatson@rwatson_paprika on 2005/07/04 11:03:25

	Convert remaining suser() calls in tty.c into cap_check() calls.
	Not a perfect semantic match, but not too bad either.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/tty.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/tty.c#11 (text+ko) ====

@@ -1028,7 +1028,7 @@
 		break;
 	case TIOCMSDTRWAIT:
 		/* must be root since the wait applies to following logins */
-		error = suser(td);
+		error = cap_check(td, CAP_SYS_TTY_CONFIG);
 		if (error)
 			return (error);
 		tp->t_dtr_wait = *(int *)data * hz / 100;
@@ -3124,7 +3124,8 @@
 				goto out;
 			goto open_top;
 		}
-		if (tp->t_state & TS_XCLUDE && suser(td))
+		if (tp->t_state & TS_XCLUDE && cap_check(td,
+		    CAP_SYS_TTY_CONFIG))
 			return (EBUSY);
 	} else {
 		/*
@@ -3353,7 +3354,7 @@
 	ct = dev->si_drv2;
 	switch (cmd) {
 	case TIOCSETA:
-		error = suser(td);
+		error = cap_check(td, CAP_SYS_TTY_CONFIG);
 		if (error != 0)
 			return (error);
 		*ct = *(struct termios *)data;