Index: stable/10/sbin/mksnap_ffs/Makefile
===================================================================
--- stable/10/sbin/mksnap_ffs/Makefile	(revision 271074)
+++ stable/10/sbin/mksnap_ffs/Makefile	(revision 271075)
@@ -1,20 +1,20 @@
 # $FreeBSD$
 
 .PATH:	${.CURDIR}/../mount
 
 PROG=	mksnap_ffs
 SRCS=	mksnap_ffs.c getmntopts.c
 MAN=	mksnap_ffs.8
 
 WARNS?=	2
 CFLAGS+=-I${.CURDIR}/../mount
 
 .if defined(NOSUID)
-BINMODE=550
+BINMODE=554
 .else
-BINMODE=4550
+BINMODE=4554
 BINOWN=	root
 .endif
 BINGRP=	operator
 
 .include <bsd.prog.mk>
Index: stable/10/sbin/shutdown/Makefile
===================================================================
--- stable/10/sbin/shutdown/Makefile	(revision 271074)
+++ stable/10/sbin/shutdown/Makefile	(revision 271075)
@@ -1,13 +1,13 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 # $FreeBSD$
 
 PROG=	shutdown
 MAN=	shutdown.8
 LINKS=	${BINDIR}/shutdown ${BINDIR}/poweroff
 MLINKS=	shutdown.8 poweroff.8
 
 BINOWN=	root
 BINGRP=	operator
-BINMODE=4550
+BINMODE=4554
 
 .include <bsd.prog.mk>
Index: stable/10/usr.sbin/ppp/Makefile
===================================================================
--- stable/10/usr.sbin/ppp/Makefile	(revision 271074)
+++ stable/10/usr.sbin/ppp/Makefile	(revision 271075)
@@ -1,115 +1,115 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 PROG=	ppp
 MAN=	ppp.8
 SRCS=	acf.c arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c \
 	command.c datalink.c deflate.c defs.c exec.c filter.c fsm.c hdlc.c \
 	iface.c ip.c ipcp.c ipv6cp.c iplist.c lcp.c link.c log.c lqr.c main.c \
 	mbuf.c mp.c ncp.c ncpaddr.c pap.c physical.c pred.c probe.c prompt.c \
 	proto.c route.c server.c sig.c slcompress.c sync.c systems.c tcp.c \
 	tcpmss.c throughput.c timer.c tty.c tun.c udp.c vjcomp.c
 WARNS?=	3
 .if defined(RELEASE_CRUNCH)
 CFLAGS+=-DRELEASE_CRUNCH
 PPP_NO_ATM=
 PPP_NO_DES=
 PPP_NO_KLDLOAD=
 PPP_NO_NAT=
 PPP_NO_PAM=
 PPP_NO_RADIUS=
 PPP_NO_SUID=
 .endif
 
 .if ${MK_ATM} == "no"
 PPP_NO_ATM=
 .endif
 .if ${MK_NETGRAPH} == "no"
 PPP_NO_NETGRAPH=
 .endif
 .if ${MK_PAM_SUPPORT} == "no"
 PPP_NO_PAM=
 .endif
 
 .if defined(PPP_NO_SUID)
-BINMODE=550
+BINMODE=554
 .else
-BINMODE=4550
+BINMODE=4554
 BINOWN=	root
 .endif
 BINGRP=	network
 M4FLAGS=
 
 LDADD= -lcrypt -lmd -lutil -lz
 DPADD=	${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
 
 .if defined(PPP_CONFDIR) && !empty(PPP_CONFDIR)
 CFLAGS+=-DPPP_CONFDIR=\"${PPP_CONFDIR}\"
 .endif
 
 .if defined(PPP_NO_KLDLOAD)
 CFLAGS+=-DNOKLDLOAD
 .endif
 
 .if ${MK_INET6_SUPPORT} == "no"
 CFLAGS+=-DNOINET6
 .endif
 
 .if defined(PPP_NO_NAT)
 CFLAGS+=-DNONAT
 .else
 SRCS+=	nat_cmd.c
 LDADD+=	-lalias
 DPADD+= ${LIBALIAS}
 .endif
 
 .if defined(PPP_NO_ATM)
 CFLAGS+=-DNOATM
 .else
 SRCS+=	atm.c
 .endif
 
 .if defined(PPP_NO_SUID)
 CFLAGS+=-DNOSUID
 .else
 SRCS+=	id.c
 .endif
 
 .if defined(RELEASE_CRUNCH) || ${MK_OPENSSL} == "no" || \
     defined(PPP_NO_DES)
 CFLAGS+=-DNODES
 .else
 SRCS+=	chap_ms.c mppe.c
 LDADD+= -lcrypto
 DPADD+= ${LIBCRYPTO}
 .endif
 
 .if defined(PPP_NO_RADIUS)
 CFLAGS+=-DNORADIUS
 .else
 SRCS+=	radius.c
 LDADD+=	-lradius
 DPADD+= ${LIBRADIUS}
 .endif
 
 .if defined(PPP_NO_NETGRAPH)
 CFLAGS+=-DNONETGRAPH
 .else
 SRCS+=	ether.c
 LDADD+=	-lnetgraph
 DPADD+= ${LIBNETGRAPH}
 .if defined(EXPERIMENTAL_NETGRAPH)
 CFLAGS+=-DEXPERIMENTAL_NETGRAPH
 SRCS+=	netgraph.c
 .endif
 .endif
 
 .if defined(PPP_NO_PAM)
 CFLAGS+=-DNOPAM
 .else
 LDADD+=	${MINUSLPAM}
 DPADD+=	${LIBPAM}
 .endif
 
 .include <bsd.prog.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 271074)
+++ stable/10	(revision 271075)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r270289