From c8f7ae16bfb95052dbb07726f863b09798ca2967 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Wed, 27 Mar 1996 20:03:32 +0000
Subject: Fixed ownerships of callout devices.

---
 sys/i386/isa/cy.c  | 27 +++++++++++++--------------
 sys/i386/isa/sio.c | 22 +++++++++++++---------
 2 files changed, 26 insertions(+), 23 deletions(-)

(limited to 'sys/i386/isa')

diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index c9e44ce..0c89ca4 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.29 1995/12/22 15:02:22 bde Exp $
+ *	$Id: cy.c,v 1.30 1996/01/25 07:21:29 phk Exp $
  */
 
 #include "cy.h"
@@ -518,7 +518,6 @@ sioattach(isdp)
 	cy_addr		cy_iobase;
 	dev_t		dev;
 	cy_addr		iobase;
-	char		name [32];
 	int		ncyu;
 	int		unit;
 
@@ -598,24 +597,24 @@ sioattach(isdp)
 	dev = makedev(CDEV_MAJOR, 0);
 	cdevsw_add(&dev, &sio_cdevsw, NULL);
 #ifdef DEVFS
-		/* path, name, devsw, minor, type, uid, gid, perm */
 	com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
-		unit, DV_CHR, 0, 0, 0600, "ttyc%n", unit);
+		unit, DV_CHR,
+		UID_ROOT, GID_WHEEL, 0600, "ttyc%n", unit);
 	com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
-		unit | CONTROL_INIT_STATE, DV_CHR, 0, 0, 0600,
-		"ttyic%n", unit);
+		unit | CONTROL_INIT_STATE, DV_CHR,
+		UID_ROOT, GID_WHEEL, 0600, "ttyic%n", unit);
 	com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
-		unit | CONTROL_LOCK_STATE, DV_CHR, 0, 0, 0600,
-		"ttylc%n", unit);
+		unit | CONTROL_LOCK_STATE, DV_CHR,
+		UID_ROOT, GID_WHEEL, 0600, "ttylc%n", unit);
 	com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
-		unit | CALLOUT_MASK, DV_CHR, 0, 0, 0660,
-		"cuac%n", unit);
+		unit | CALLOUT_MASK, DV_CHR,
+		UID_UUCP, GID_DIALER, 0660, "cuac%n", unit);
 	com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
-		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR, 0, 0, 0660,
-		"cuaic%n", unit);
+		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
+		UID_UUCP, GID_DIALER, 0660, "cuaic%n", unit);
 	com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
-		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR, 0, 0, 0660,
-		"cualc%n", unit);
+		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
+		UID_UUCP, GID_DIALER, 0660, "cualc%n", unit);
 #endif
 		}
 	}
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index f6bf0c5..35b6715 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.134 1996/01/25 07:21:36 phk Exp $
+ *	$Id: sio.c,v 1.135 1996/02/25 21:10:54 bde Exp $
  */
 
 #include "sio.h"
@@ -1055,19 +1055,23 @@ determined_type: ;
 #ifdef DEVFS
 		/* devsw, minor, type, uid, gid, perm, fmt, ... */
 	com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
-		unit, DV_CHR, 0, 0, 0600, "ttyd%n", unit);
+		unit, DV_CHR,
+		UID_ROOT, GID_WHEEL, 0600, "ttyd%n", unit);
 	com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw,
-		unit | CONTROL_INIT_STATE, DV_CHR, 0, 0, 0600, "ttyid%n", unit);
+		unit | CONTROL_INIT_STATE, DV_CHR,
+		UID_ROOT, GID_WHEEL, 0600, "ttyid%n", unit);
 	com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw,
-		unit | CONTROL_LOCK_STATE, DV_CHR, 0, 0, 0600, "ttyld%n", unit);
+		unit | CONTROL_LOCK_STATE, DV_CHR,
+		UID_ROOT, GID_WHEEL, 0600, "ttyld%n", unit);
 	com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw,
-		unit | CALLOUT_MASK, DV_CHR, 0, 0, 0660, "cuaa%n", unit);
+		unit | CALLOUT_MASK, DV_CHR,
+		UID_UUCP, GID_DIALER, 0660, "cuaa%n", unit);
 	com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw,
-		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR, 0, 0, 0660,
-		"cuaia%n", unit);
+		unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR,
+		UID_UUCP, GID_DIALER, 0660, "cuaia%n", unit);
 	com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw,
-		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR, 0, 0, 0660,
-		"cuala%n", unit);
+		unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR,
+		UID_UUCP, GID_DIALER, 0660, "cuala%n", unit);
 #endif
 	return (1);
 }
-- 
cgit v1.1