From 738ff8df41ebea81eade4af5f185ec58697e3d97 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Thu, 19 Dec 1996 22:19:51 +0000
Subject: [PATCH] setgid games, not setuid games. closes a neat set of holes

---
 src/etc/master.passwd     |  1 -
 src/etc/mtree/4.4BSD.dist | 16 ++++++++--------
 src/etc/mtree/special     |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 4bc03f74..ee0de908 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -3,6 +3,5 @@ daemon:*:1:31::0:0:The devil himself:/root:/sbin/nologin
 operator:*:2:20::0:0:System &:/usr/guest/operator:/sbin/nologin
 bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/sbin/nologin
 uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/var/spool/uucppublic:/usr/libexec/uucp/uucico
-games:*:7:13::0:0:Games pseudo-user:/usr/games:/sbin/nologin
 nobody:*:32767:32767::0:0:Unprivileged user:/nonexistent:/sbin/nologin
 ingres:*:267:74::0:0:& Group:/usr/ingres:/sbin/nologin
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index c651a478..d6ffebf7 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.27 1996/12/19 02:31:17 millert Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.28 1996/12/19 22:19:50 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -113,7 +113,7 @@ bin
 games
 
 # ./usr/games/hide
-hide            gname=games uname=games mode=0700
+hide            gname=games uname=root mode=0550
 # ./usr/games/hide
 ..
 
@@ -1457,13 +1457,13 @@ ns
 ..
 
 # ./var/games
-games            uname=games gname=games mode=0775
+games            uname=root gname=games mode=0755
 
 # ./var/games/hackdir
-hackdir          uname=games gname=games mode=0775
+hackdir          uname=root gname=games mode=0775
 
 # ./var/games/hackdir/save
-save		 uname=games gname=games mode=0770
+save		 uname=root gname=games mode=0770
 # ./var/games/hackdir/save
 ..
 
@@ -1471,17 +1471,17 @@ save		 uname=games gname=games mode=0770
 ..
 
 # ./var/games/hackdir/save		XXX
-save		uname=games gname=games mode=0775
+save		uname=root gname=games mode=0775
 # ./var/games/hackdir/save		XXX
 ..
 
 # ./var/games/larn
-larn             uname=games gname=games mode=0775
+larn             uname=root gname=games mode=0775
 # ./var/games/larn
 ..
 
 # ./var/games/phantasia
-phantasia        uname=games gname=games mode=0775
+phantasia        uname=root gname=games mode=0775
 # ./var/games/phantasia
 ..
 
diff --git a/src/etc/mtree/special b/src/etc/mtree/special
index dbfefd6c..b020da1d 100644
--- a/src/etc/mtree/special
+++ b/src/etc/mtree/special
@@ -1,4 +1,4 @@
-#	$OpenBSD: special,v 1.8 1996/12/15 20:21:56 millert Exp $
+#	$OpenBSD: special,v 1.9 1996/12/19 22:19:51 deraadt Exp $
 #	$NetBSD: special,v 1.4 1996/05/08 21:30:18 pk Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
@@ -76,7 +76,7 @@ usr		type=dir mode=0755 uname=root gname=wheel
 bin		type=dir mode=0755 uname=root gname=wheel ignore
 ..	#usr/bin
 games		type=dir mode=0755 uname=root gname=wheel optional
-hide		type=dir mode=0700 uname=games gname=games optional ignore
+hide		type=dir mode=0700 uname=root gname=wheel optional ignore
 ..	#usr/games/hide
 ..	#usr/games
 include		type=dir mode=0755 uname=root gname=bin ignore