From cda2a9b2f0ab38e44572729b85e2ef744b6c831f Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Thu, 13 Sep 2001 06:48:18 +0000 Subject: [PATCH] Set BINOWN=root explicitly for setuid root binaries. This is not "useless", as one may have non-default setting for BINOWN in make.conf, and we still want these to be installed setuid root in this case. --- sbin/ping/Makefile | 1 + sbin/ping6/Makefile | 1 + sbin/shutdown/Makefile | 1 + usr.bin/at/Makefile | 1 + usr.bin/chpass/Makefile | 1 + usr.bin/lock/Makefile | 1 + usr.bin/login/Makefile | 1 + usr.bin/opieinfo/Makefile | 1 + usr.bin/opiepasswd/Makefile | 1 + usr.bin/passwd/Makefile | 1 + usr.bin/quota/Makefile | 2 ++ usr.bin/rlogin/Makefile | 1 + usr.bin/rsh/Makefile | 1 + usr.bin/su/Makefile | 1 + usr.sbin/lpr/lpq/Makefile | 1 + usr.sbin/lpr/lpr/Makefile | 1 + usr.sbin/lpr/lprm/Makefile | 1 + usr.sbin/mrouted/mrinfo/Makefile | 1 + usr.sbin/mrouted/mtrace/Makefile | 1 + usr.sbin/sliplogin/Makefile | 1 + usr.sbin/timed/timedc/Makefile | 1 + usr.sbin/traceroute/Makefile | 1 + 22 files changed, 23 insertions(+) diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile index 45ca4497d746..a557b371f1c2 100644 --- a/sbin/ping/Makefile +++ b/sbin/ping/Makefile @@ -3,6 +3,7 @@ PROG= ping MAN= ping.8 +BINOWN= root BINMODE=4555 CFLAGS+=-Wall -Wmissing-prototypes .if ${MACHINE_ARCH} == "alpha" diff --git a/sbin/ping6/Makefile b/sbin/ping6/Makefile index cd727f6d8d2d..ddc996282653 100644 --- a/sbin/ping6/Makefile +++ b/sbin/ping6/Makefile @@ -5,6 +5,7 @@ MAN= ping6.8 CFLAGS+=-DINET6 -DIPSEC +BINOWN= root BINMODE=4555 LDADD= -lipsec -lmd diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile index 0a8f848f67ec..0d6434a22012 100644 --- a/sbin/shutdown/Makefile +++ b/sbin/shutdown/Makefile @@ -4,6 +4,7 @@ PROG= shutdown WARNS?= 2 MAN= shutdown.8 +BINOWN= root BINGRP= operator BINMODE=4550 diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile index 0f31ee08af3f..f69aee38e4a9 100644 --- a/usr.bin/at/Makefile +++ b/usr.bin/at/Makefile @@ -12,6 +12,7 @@ MLINKS= at.1 batch.1 \ at.1 atq.1 \ at.1 atrm.1 +BINOWN= root BINMODE= 4555 CLEANFILES+= at.1 diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index 393087328729..69b93c0cf9b0 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -7,6 +7,7 @@ SRCS= chpass.c edit.c field.c pw_copy.c pw_scan.c pw_util.c pw_yp.c \ table.c util.c ypxfr_misc.c ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_clnt.c yppasswd_private.h \ yppasswd_private_clnt.c yppasswd_private_xdr.c +BINOWN= root BINMODE=4555 .PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../usr.sbin/vipw \ ${.CURDIR}/../../libexec/ypxfr \ diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile index 84c8fd1f8c10..dc09a87b1b9c 100644 --- a/usr.bin/lock/Makefile +++ b/usr.bin/lock/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PROG= lock +BINOWN= root BINMODE=4555 DPADD= ${LIBCRYPT} LDADD= -lcrypt diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile index 9ed86035ecba..6769090ee243 100644 --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -10,6 +10,7 @@ CFLAGS+=-DLOGIN_ACCESS -DLOGALL DPADD= ${LIBUTIL} ${LIBCRYPT} ${LIBPAM} LDADD= -lutil -lcrypt ${MINUSLPAM} +BINOWN= root BINMODE=4555 INSTALLFLAGS=-fschg NEED_LIBNAMES= yes diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile index 2ee633d6d43d..e9944e19af76 100644 --- a/usr.bin/opieinfo/Makefile +++ b/usr.bin/opieinfo/Makefile @@ -10,6 +10,7 @@ CFLAGS+=-DINSECURE_OVERRIDE DPADD= ${LIBOPIE} ${LIBMD} LDADD= -lopie -lmd +BINOWN= root BINMODE=4555 INSTALLFLAGS=-fschg diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile index 00021f641db6..169fd7229a32 100644 --- a/usr.bin/opiepasswd/Makefile +++ b/usr.bin/opiepasswd/Makefile @@ -10,6 +10,7 @@ CFLAGS+=-DINSECURE_OVERRIDE DPADD= ${LIBOPIE} ${LIBMD} LDADD= -lopie -lmd +BINOWN= root BINMODE=4555 INSTALLFLAGS=-fschg diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index 65c5dcfc941c..67022c3b51c6 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -74,6 +74,7 @@ yppasswd_private_xdr.c: ${RPCSRC_PRIV} yppasswd_private_clnt.c: ${RPCSRC_PRIV} ${RPCGEN} -l -o ${.TARGET} ${RPCSRC_PRIV} +BINOWN= root BINMODE=4555 LINKS=${BINDIR}/passwd ${BINDIR}/yppasswd MLINKS=passwd.1 yppasswd.1 diff --git a/usr.bin/quota/Makefile b/usr.bin/quota/Makefile index f9093b3d2b5b..4d41fae73152 100644 --- a/usr.bin/quota/Makefile +++ b/usr.bin/quota/Makefile @@ -1,6 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= quota +BINOWN= root BINMODE=4555 DPADD= ${LIBRPCSVC} diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile index 9e61a6e81a7f..c8573f6e8500 100644 --- a/usr.bin/rlogin/Makefile +++ b/usr.bin/rlogin/Makefile @@ -6,6 +6,7 @@ SRCS= rlogin.c CFLAGS+=-Wall CFLAGS+=-I${.CURDIR}/../../libexec/rlogind +BINOWN= root BINMODE=4555 INSTALLFLAGS=-fschg diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile index 0cdb0079ccab..404c9a6ef180 100644 --- a/usr.bin/rsh/Makefile +++ b/usr.bin/rsh/Makefile @@ -20,6 +20,7 @@ DISTRIBUTION= krb4 .PATH: ${.CURDIR}/../../crypto/kerberosIV/appl/bsd .endif +BINOWN= root BINMODE=4555 INSTALLFLAGS=-fschg diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile index 7d208430da2d..fff40f22e08a 100644 --- a/usr.bin/su/Makefile +++ b/usr.bin/su/Makefile @@ -8,6 +8,7 @@ LDADD+= -lutil ${MINUSLPAM} WARNS?= 2 +BINOWN= root BINMODE=4555 INSTALLFLAGS=-fschg diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile index 2b795d9af6f6..e4a5effd053a 100644 --- a/usr.sbin/lpr/lpq/Makefile +++ b/usr.sbin/lpr/lpq/Makefile @@ -4,6 +4,7 @@ BINDIR= /usr/bin PROG= lpq +BINOWN= root BINGRP= daemon BINMODE= 6555 diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile index e952f608b3b7..0e11b49dfa75 100644 --- a/usr.sbin/lpr/lpr/Makefile +++ b/usr.sbin/lpr/lpr/Makefile @@ -7,6 +7,7 @@ BINDIR= /usr/bin PROG= lpr MAN= lpr.1 printcap.5 +BINOWN= root BINGRP= daemon BINMODE= 6555 diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile index cc9d07582706..df7241f99ca1 100644 --- a/usr.sbin/lpr/lprm/Makefile +++ b/usr.sbin/lpr/lprm/Makefile @@ -6,6 +6,7 @@ BINDIR= /usr/bin PROG= lprm +BINOWN= root BINGRP= daemon BINMODE= 6555 diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile index feae4cea32d6..f111aa981663 100644 --- a/usr.sbin/mrouted/mrinfo/Makefile +++ b/usr.sbin/mrouted/mrinfo/Makefile @@ -5,6 +5,7 @@ S= ${.CURDIR}/.. PROG= mrinfo MAN= mrinfo.8 +BINOWN= root BINMODE= 4555 CFLAGS+= -I$S diff --git a/usr.sbin/mrouted/mtrace/Makefile b/usr.sbin/mrouted/mtrace/Makefile index 125493e5d95f..ee9adb7c7eb5 100644 --- a/usr.sbin/mrouted/mtrace/Makefile +++ b/usr.sbin/mrouted/mtrace/Makefile @@ -5,6 +5,7 @@ S= ${.CURDIR}/.. PROG= mtrace MAN= mtrace.8 +BINOWN= root BINMODE= 4555 CFLAGS+= -I$S diff --git a/usr.sbin/sliplogin/Makefile b/usr.sbin/sliplogin/Makefile index 3136dbb3f19b..860b9b099303 100644 --- a/usr.sbin/sliplogin/Makefile +++ b/usr.sbin/sliplogin/Makefile @@ -3,6 +3,7 @@ PROG= sliplogin MAN= sliplogin.8 +BINOWN= root BINGRP= network BINMODE=4550 INSTALLFLAGS=-fschg diff --git a/usr.sbin/timed/timedc/Makefile b/usr.sbin/timed/timedc/Makefile index 6963a570b495..5262f46d805d 100644 --- a/usr.sbin/timed/timedc/Makefile +++ b/usr.sbin/timed/timedc/Makefile @@ -6,6 +6,7 @@ PROG= timedc MAN= timedc.8 SRCS= cmds.c cmdtab.c timedc.c byteorder.c measure.c cksum.c +BINOWN= root BINMODE= 4555 .include "../../Makefile.inc" diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile index 6e22227a68f4..bdd65b433623 100644 --- a/usr.sbin/traceroute/Makefile +++ b/usr.sbin/traceroute/Makefile @@ -6,6 +6,7 @@ TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute PROG= traceroute MAN= traceroute.8 SRCS= version.c traceroute.c +BINOWN= root BINMODE=4555 CLEANFILES= version.c