From 48edb429c07c8b319900cbc329dc36279de8f42e Mon Sep 17 00:00:00 2001 From: zrj Date: Sat, 22 Jul 2017 16:19:21 +0300 Subject: [PATCH] dm(8): Retire the Dungeon Master. One setgid utility less in base + it was shadowing dm(4). Approved-by: swildner --- Makefile_upgrade.inc | 7 + etc/Makefile | 2 +- etc/dm.conf | 21 --- etc/mtree/BSD.usr.dist | 2 - games/Makefile | 2 - games/Makefile.inc | 8 - games/dm/Makefile | 19 --- games/dm/dm.8 | 107 ------------ games/dm/dm.c | 336 ------------------------------------- games/dm/dm.conf.5 | 97 ----------- games/dm/pathnames.h | 35 ---- share/examples/etc/README.examples | 1 - share/mk/bsd.README | 4 - share/mk/bsd.prog.mk | 4 - 14 files changed, 8 insertions(+), 637 deletions(-) delete mode 100644 etc/dm.conf delete mode 100644 games/dm/Makefile delete mode 100644 games/dm/dm.8 delete mode 100644 games/dm/dm.c delete mode 100644 games/dm/dm.conf.5 delete mode 100644 games/dm/pathnames.h diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index fe8fe6a326..316efcf264 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -3283,6 +3283,13 @@ TO_REMOVE+=/usr/share/calendar/de_DE.ISO_8859-1 TO_REMOVE+=/usr/share/calendar/de_DE.ISO_8859-15 TO_REMOVE+=/usr/share/calendar/hr_HR.ISO_8859-2 TO_REMOVE+=/usr/share/man/man7/mailaddr.7.gz +TO_REMOVE+=/etc/dm.conf +TO_REMOVE+=/etc/nogames +TO_REMOVE+=/usr/games/dm +TO_REMOVE+=/usr/games/hide +TO_REMOVE+=/usr/share/examples/etc/dm.conf +TO_REMOVE+=/usr/share/man/man5/dm.conf.5.gz +TO_REMOVE+=/usr/share/man/man8/dm.8.gz .if !defined(WANT_INSTALLER) TO_REMOVE+=/usr/sbin/dfuibe_installer diff --git a/etc/Makefile b/etc/Makefile index 4194b320ff..560ace9975 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -23,7 +23,7 @@ BINUPDATE+=${.CURDIR}/../usr.bin/mail/misc/mail.rc \ # BIN1= auth.conf auto_master \ crontab csh.cshrc csh.login csh.logout \ - devtab dhclient.conf dm.conf dntpd.conf \ + devtab dhclient.conf dntpd.conf \ ftpusers group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ diff --git a/etc/dm.conf b/etc/dm.conf deleted file mode 100644 index 4f0afd14ec..0000000000 --- a/etc/dm.conf +++ /dev/null @@ -1,21 +0,0 @@ -# -# Game Control File -# $FreeBSD: src/etc/dm.conf,v 1.3 1999/08/27 23:23:41 peter Exp $ -# $DragonFly: src/etc/dm.conf,v 1.2 2003/06/17 04:24:45 dillon Exp $ -# @(#)dm.conf 5.5 (Berkeley) 4/12/89 -# - -# TTYNAME -# badtty /dev/tty19 # news -# badtty /dev/tty20 # news/mail - -# DAY OF WEEK START STOP -# time Monday 7 16 # 7am to 4pm -# time Tuesday 7 16 -# time Wednesday 7 16 -# time Thursday 7 16 -# time Friday 7 16 - -# GAME MAX LOAD MAX USERS PRIORITY -# default must be the last entry for the ``game'' keyword -game default 5 * * diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index af8a4f4be1..8c786e0f72 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -8,8 +8,6 @@ bin .. games - hide gname=games mode=0550 - .. .. include .. diff --git a/games/Makefile b/games/Makefile index a16bfdafad..a9e144fc5b 100644 --- a/games/Makefile +++ b/games/Makefile @@ -1,6 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/31/94 # $FreeBSD: src/games/Makefile,v 1.16 1999/08/27 23:28:45 peter Exp $ -# $DragonFly: src/games/Makefile,v 1.3 2008/09/02 21:50:17 dillon Exp $ # XXX missing: chess ching monop [copyright] SUBDIR= adventure \ @@ -14,7 +13,6 @@ SUBDIR= adventure \ canfield \ cribbage \ colorbars \ - dm \ factor \ fish \ fortune \ diff --git a/games/Makefile.inc b/games/Makefile.inc index 3fd5150277..54bca3ce1e 100644 --- a/games/Makefile.inc +++ b/games/Makefile.inc @@ -10,11 +10,3 @@ WARNS?= 6 BINGRP= games BINMODE= 550 .endif - -.if defined(HIDEGAME) -ORIGBINDIR:= ${BINDIR} -BINDIR:= ${BINDIR}/hide -ORIGBINGRP:= ${BINGRP} -BINGRP= games -BINMODE= 550 -.endif diff --git a/games/dm/Makefile b/games/dm/Makefile deleted file mode 100644 index f32d29f714..0000000000 --- a/games/dm/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/dm/Makefile,v 1.3.6.1 2001/04/25 09:28:52 ru Exp $ -# $DragonFly: src/games/dm/Makefile,v 1.4 2006/10/08 16:22:35 pavalos Exp $ - -# -DLOG log games -.PATH: ${.CURDIR}/../../usr.bin/who - -PROG= dm -SRCS= dm.c utmpentry.c -MAN= dm.8 dm.conf.5 -BINGRP= games -BINMODE=2555 - -DPADD= ${LIBUTIL} -LDADD= -lutil - -CFLAGS+= -I${.CURDIR}/../../usr.bin/who -DSUPPORT_UTMP -DSUPPORT_UTMPX - -.include diff --git a/games/dm/dm.8 b/games/dm/dm.8 deleted file mode 100644 index 19c4af160a..0000000000 --- a/games/dm/dm.8 +++ /dev/null @@ -1,107 +0,0 @@ -.\" Copyright (c) 1987, 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 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. 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. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" @(#)dm.8 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/games/dm/dm.8,v 1.3.2.1 2000/12/08 13:40:03 ru Exp $ -.\" $DragonFly: src/games/dm/dm.8,v 1.4 2007/07/30 22:11:32 swildner Exp $ -.\" -.Dd May 31, 1993 -.Dt DM 8 -.Os -.Sh NAME -.Nm dm -.Nd dungeon master -.Sh SYNOPSIS -.Nm ln -.Fl s Cm dm Ar game -.Sh DESCRIPTION -.Nm Dm -is a program used to regulate game playing. -.Nm Dm -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 , -in the directory -.Pa /usr/games -for all of the regulated games. -The actual binaries for these games should be placed in a -.Dq hidden -directory, -.Pa /usr/games/hide , -that may only be accessed by the -.Nm -program. -.Nm Dm -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. -.Pp -The file -.Pa /etc/nogames -may be used to -.Dq turn off -game playing. -If the file exists, no game playing is allowed; the contents of the file -will be displayed to any user requesting a game. -.Sh FILES -.Bl -tag -width /var/log/games.log -compact -.It Pa /etc/dm.conf -configuration file -.It Pa /etc/nogames -turns off game playing -.It Pa /usr/games/hide -directory of ``real'' binaries -.It Pa /var/log/games.log -game logging file -.El -.Sh SEE ALSO -.Xr dm.conf 5 -.Sh HISTORY -The -.Nm -command appeared in -.Bx 4.3 tahoe . -.Sh BUGS -Two problems result from -.Nm -running the games setuid -.Dq games . -First, all games that allow users to run -.Ux -commands should carefully -set both the real and effective user id's immediately before executing -those commands. Probably more important is that -.Nm -never be setuid -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. diff --git a/games/dm/dm.c b/games/dm/dm.c deleted file mode 100644 index 7cbfb724f7..0000000000 --- a/games/dm/dm.c +++ /dev/null @@ -1,336 +0,0 @@ -/* - * Copyright (c) 1987, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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. 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. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#) Copyright (c) 1987, 1993 The Regents of the University of California. All rights reserved. - * @(#)dm.c 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/games/dm/dm.c,v 1.8 1999/12/10 02:54:18 billf Exp $ - * $DragonFly: src/games/dm/dm.c,v 1.4 2006/08/08 17:05:14 pavalos Exp $ - */ - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "utmpentry.h" - -#include "pathnames.h" - -static time_t now; /* current time value */ -static int priority = 0; /* priority game runs at */ -static char *game, /* requested game */ - *gametty; /* from tty? */ - -static void c_day(char *, char *, char *); -static void c_tty(char *); -static void c_game(char *, char *, char *, char *); -static void hour(int); -static double load(void); -static void nogamefile(void); -static void play(char **); -static void read_config(void); -static int users(void); -#ifdef LOG -static void logfile(void); -#endif - -int -main(__unused int argc, char *argv[]) -{ - char *cp; - - nogamefile(); - game = (cp = strrchr(*argv, '/')) ? ++cp : *argv; - - if (!strcmp(game, "dm")) - exit(0); - - gametty = ttyname(0); - unsetenv("TZ"); - time(&now); - read_config(); -#ifdef LOG - logfile(); -#endif - play(argv); - /*NOTREACHED*/ - exit(EXIT_FAILURE); -} - -/* - * play -- - * play the game - */ -static void -play(char **args) -{ - char pbuf[MAXPATHLEN]; - - if (sizeof(_PATH_HIDE) + strlen(game) > sizeof(pbuf)) { - fprintf(stderr, "dm: %s/%s: %s\n", _PATH_HIDE, game, - strerror(ENAMETOOLONG)); - exit(1); - } - strcpy(pbuf, _PATH_HIDE); - strcpy(pbuf + sizeof(_PATH_HIDE) - 1, game); - if (priority > 0) /* < 0 requires root */ - setpriority(PRIO_PROCESS, 0, priority); - execv(pbuf, args); - fprintf(stderr, "dm: %s: %s\n", pbuf, strerror(errno)); - exit(1); -} - -/* - * read_config -- - * read through config file, looking for key words. - */ -static void -read_config(void) -{ - FILE *cfp; - char lbuf[BUFSIZ], f1[40], f2[40], f3[40], f4[40], f5[40]; - - if (!(cfp = fopen(_PATH_CONFIG, "r"))) - return; - while (fgets(lbuf, sizeof(lbuf), cfp)) - switch(*lbuf) { - case 'b': /* badtty */ - if (sscanf(lbuf, "%s%s", f1, f2) != 2 || - strcasecmp(f1, "badtty")) - break; - c_tty(f2); - break; - case 'g': /* game */ - if (sscanf(lbuf, "%s%s%s%s%s", - f1, f2, f3, f4, f5) != 5 || strcasecmp(f1, "game")) - break; - c_game(f2, f3, f4, f5); - break; - case 't': /* time */ - if (sscanf(lbuf, "%s%s%s%s", f1, f2, f3, f4) != 4 || - strcasecmp(f1, "time")) - break; - c_day(f2, f3, f4); - } - fclose(cfp); -} - -/* - * c_day -- - * if day is today, see if okay to play - */ -static void -c_day(char *s_day, char *s_start, char *s_stop) -{ - static const char *days[] = { - "sunday", "monday", "tuesday", "wednesday", - "thursday", "friday", "saturday", - }; - static struct tm *ct; - int start, stop; - - if (!ct) - ct = localtime(&now); - if (strcasecmp(s_day, days[ct->tm_wday])) - return; - if (!isdigit(*s_start) || !isdigit(*s_stop)) - return; - start = atoi(s_start); - stop = atoi(s_stop); - if (ct->tm_hour >= start && ct->tm_hour < stop) { - fputs("dm: Sorry, games are not available from ", stderr); - hour(start); - fputs(" to ", stderr); - hour(stop); - fputs(" today.\n", stderr); - exit(0); - } -} - -/* - * c_tty -- - * decide if this tty can be used for games. - */ -static void -c_tty(char *tty) -{ - static int first = 1; - static char *p_tty; - - if (first) { - p_tty = strrchr(gametty, '/'); - first = 0; - } - - if (!strcmp(gametty, tty) || (p_tty && !strcmp(p_tty, tty))) { - fprintf(stderr, "dm: Sorry, you may not play games on %s.\n", gametty); - exit(0); - } -} - -/* - * c_game -- - * see if game can be played now. - */ -static void -c_game(char *s_game, char *s_load, char *s_users, char *s_priority) -{ - static int found; - - if (found) - return; - if (strcmp(game, s_game) && strcasecmp("default", s_game)) - return; - ++found; - if (isdigit(*s_load) && atoi(s_load) < load()) { - fputs("dm: Sorry, the load average is too high right now.\n", stderr); - exit(0); - } - if (isdigit(*s_users) && atoi(s_users) <= users()) { - fputs("dm: Sorry, there are too many users logged on right now.\n", stderr); - exit(0); - } - if (isdigit(*s_priority)) - priority = atoi(s_priority); -} - -/* - * load -- - * return 15 minute load average - */ -static double -load(void) -{ - double avenrun[3]; - - if (getloadavg(avenrun, sizeof(avenrun)/sizeof(avenrun[0])) < 0) { - fputs("dm: getloadavg() failed.\n", stderr); - exit(1); - } - return(avenrun[2]); -} - -/* - * users -- - * return current number of users - * todo: check idle time; if idle more than X minutes, don't - * count them. - */ -static int -users(void) -{ - struct utmpentry *ep = NULL; /* avoid gcc warnings */ - int nusers = 0; - - getutentries(NULL, &ep); - for (; ep; ep = ep->next) - ++nusers; - - return(nusers); -} - -static void -nogamefile(void) -{ - int fd, n; - char buf[BUFSIZ]; - - if ((fd = open(_PATH_NOGAMES, O_RDONLY, 0)) >= 0) { -#define MESG "Sorry, no games right now.\n\n" - write(2, MESG, sizeof(MESG) - 1); - while ((n = read(fd, buf, sizeof(buf))) > 0) - write(2, buf, n); - exit(1); - } -} - -/* - * hour -- - * print out the hour in human form - */ -static void -hour(int h) -{ - switch(h) { - case 0: - fputs("midnight", stderr); - break; - case 12: - fputs("noon", stderr); - break; - default: - if (h > 12) - fprintf(stderr, "%dpm", h - 12); - else - fprintf(stderr, "%dam", h); - } -} - -#ifdef LOG -/* - * logfile -- - * log play of game - */ -static void -logfile(void) -{ - struct passwd *pw; - FILE *lp; - uid_t uid; - int lock_cnt; - - if (lp = fopen(_PATH_LOG, "a")) { - for (lock_cnt = 0;; ++lock_cnt) { - if (!flock(fileno(lp), LOCK_EX)) - break; - if (lock_cnt == 4) { - perror("dm: log lock"); - fclose(lp); - return; - } - sleep((u_int)1); - } - if (pw = getpwuid(uid = getuid())) - fputs(pw->pw_name, lp); - else - fprintf(lp, "%u", uid); - fprintf(lp, "\t%s\t%s\t%s", game, gametty, ctime(&now)); - fclose(lp); - flock(fileno(lp), LOCK_UN); - } -} -#endif /* LOG */ diff --git a/games/dm/dm.conf.5 b/games/dm/dm.conf.5 deleted file mode 100644 index ff62b4b379..0000000000 --- a/games/dm/dm.conf.5 +++ /dev/null @@ -1,97 +0,0 @@ -.\" Copyright (c) 1988, 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 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. 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. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" @(#)dm.conf.5 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/games/dm/dm.conf.5,v 1.3.2.2 2001/08/16 10:08:22 ru Exp $ -.\" $DragonFly: src/games/dm/dm.conf.5,v 1.2 2003/06/17 04:25:23 dillon Exp $ -.\" -.Dd May 31, 1993 -.Dt DM.CONF 5 -.Os -.Sh NAME -.Nm dm.conf -.Nd \&dm configuration file -.Sh DESCRIPTION -The -.Nm -file -is the configuration file for the -.Xr \&dm 8 -program. -It consists of lines beginning with one of three keywords, ``badtty'', -``game'', and ``time''. All other lines are ignored. -.Pp -Any tty listed after the keyword ``badtty'' may not have games played on -it. -Entries consist of two white-space separated fields: the string -``badtty'' and the ttyname as returned by -.Xr ttyname 3 . -For example, -to keep the uucp dialout, ``tty19'', from being used for games, the -entry would be: -.Bd -literal -offset indent -badtty /dev/tty19 -.Ed -.Pp -Any day/hour combination listed after the keyword ``time'' will disallow -games during those hours. Entries consist of four white-space separated -fields: the string ``time'', the unabbreviated day of the week and the -beginning and ending time of a period of the day when games may not be -played. The time fields are in a 0 based, 24-hour clock. For example, -the following entry allows games playing before 8AM and after 5PM on -Mondays. -.Bd -literal -offset indent -time Monday 8 17 -.Ed -.Pp -Any game listed after the keyword ``game'' will set parameters for a specific -game. Entries consist of five white-space separated fields: the keyword -``game'', the name of a game, the highest system load average at which the -game may be played, the maximum users allowed if the game is to be played, -and the priority at which the game is to be run. Any of these fields may -start with a non-numeric character, resulting in no game limitation or -priority based on that field. The game "default" controls the settings for -any game not otherwise listed, and must be the last ``game'' entry in the -file. Priorities may not be negative. For example, the following entries -limits the game ``hack'' to running only when the system has 10 or less -users and a load average of 5 or less; all other games may be run any time -the system has 15 or less users. -.Bd -literal -offset indent -game hack 5 10 * -game default * 15 * -.Ed -.Sh FILES -.Bl -tag -width /etc/dm.conf -compact -.It Pa /etc/dm.conf -The -.Xr \&dm 8 -configuration file. -.El -.Sh SEE ALSO -.Xr setpriority 2 , -.Xr ttyname 3 , -.Xr dm 8 diff --git a/games/dm/pathnames.h b/games/dm/pathnames.h deleted file mode 100644 index 6df49a735f..0000000000 --- a/games/dm/pathnames.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 1989, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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. 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. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 - */ - -#define _PATH_CONFIG "/etc/dm.conf" -#define _PATH_HIDE "/usr/games/hide/" -#define _PATH_LOG "/var/log/games.log" -#define _PATH_NOGAMES "/etc/nogames" diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples index 9b844152c2..68629e8cb4 100644 --- a/share/examples/etc/README.examples +++ b/share/examples/etc/README.examples @@ -21,7 +21,6 @@ devd.conf - configuration file for devd(8) devtab - label conversion file for device paths dhclient.conf - DHCP client configuration file disktab - disk description file -dm.conf - configuration file for games (see dm(6)) dntpd.conf - configuration file for dntpd(8) fbtab - configuration file for login(1) ftpusers - user restriction file for ftpd(8) diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 34f0837d79..5cbeb8c2ab 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -231,10 +231,6 @@ FILES A list of non-executable files. FILESGRP, FILESMODE, FILESDIR variables that can be further specialized by _. -HIDEGAME If HIDEGAME is defined, the binary is installed in - /usr/games/hide, and a symbolic link is created to - /usr/games/dm. - LDADD Additional loader objects. Usually used for libraries. For example, to load with the compatibility and utility libraries, use: diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index c0e9d632fb..3be631c696 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -116,10 +116,6 @@ _proginstall: ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} .endif .endif -.if defined(HIDEGAME) - (cd ${DESTDIR}${ORIGBINDIR}; ${LN} -fs dm ${PROG}; \ - chown -h ${BINOWN}:${ORIGBINGRP} ${PROG}) -.endif .endif # !target(realinstall) && !defined(INTERNALPROG) .if defined(SCRIPTS) && !empty(SCRIPTS) -- 2.11.4.GIT