Fix merge conflicts

[bsdgames-darwin.git] / dm / dm.8

diff --git a/dm/dm.8 b/dm/dm.8
index 69ac9621d85d53884db468bbb9ff871c2767330d..a30ec11de8af2e805323b32f77b4d4fbb6df16a2 100644 (file)
--- a/dm/dm.8
+++ b/dm/dm.8
@@ -1,4 +1,4 @@
-.\"    $NetBSD: dm.8,v 1.3 1995/03/21 15:09:04 cgd Exp $
+.\"    $NetBSD: dm.8,v 1.9 2003/08/07 09:37:11 agc Exp $
 .\"
 .\" Copyright (c) 1987, 1991, 1993
 .\"    The Regents of the University of California.  All rights reserved.
@@ -11,11 +11,7 @@
 .\" 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
+.\" 3. 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.
 .\"
@@ -43,12 +39,12 @@
 .Nm ln
 .Fl s Cm dm Ar game
 .Sh DESCRIPTION
-.Nm Dm
+.Nm
 is a program used to regulate game playing.
-.Nm Dm
+.Nm
 expects to be invoked with the name of a game that a user wishes to play.
 This is done by creating symbolic links to
-.Nm dm ,
+.Nm ,
 in the directory
 .Pa /usr/games
 for all of the regulated games.
@@ -57,14 +53,13 @@ The actual binaries for these games should be placed in a
 directory,
 .Pa /usr/games/hide ,
 that may only be accessed by the
-.Nm dm
+.Nm
 program.
-.Nm Dm
+.Nm
 determines if the requested game is available and, if so, runs it.
 The file
 .Pa /etc/dm.conf
-controls the conditions under which games may
-be run.
+controls the conditions under which games may be run.
 .Pp
 The file
 .Pa /etc/nogames
@@ -86,26 +81,26 @@ game logging file
 .El
 .Sh SEE ALSO
 .Xr dm.conf 5
-.Sh BUGS
-Two problems result from
-.Nm dm
-running the games setuid
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.3 tahoe .
+.Sh SECURITY CONSIDERATIONS
+Two issues result from
+.Nm
+running the games setgid
 .Dq games .
 First, all games that allow users to run
-.Tn UNIX
+.Ux
 commands should carefully
-set both the real and effective user id's immediately before executing
-those commands.  Probably more important is that
-.Nm dm
-never be setuid
-anything but
+set both the real and effective group ids immediately before executing
+those commands.
+Probably more important is that
+.Nm
+never be setgid anything but
 .Dq games
 so that compromising a game will result only in
-the user's ability to play games at will.  Secondly, games which previously
-had no reason to run setuid and which accessed user files may have to
-be modified.
-.Sh HISTORY
-The
-.Nm dm
-command appeared in
-.Bx 4.3 tahoe .
+the user's ability to play games at will.
+Secondly, games which previously had no reason to run setgid and which
+accessed user files may have to be modified.