Make -DNOSUID (or -DPPP_NOSUID) possible to build ppp without SUID

capabilities.

1 files changed, 16 insertions, 4 deletions

diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index fda3c44..2dc6da0 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -3,15 +3,19 @@
 PROG=	ppp
 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 \
-	id.c iface.c ip.c ipcp.c iplist.c lcp.c link.c log.c lqr.c main.c \
+	iface.c ip.c ipcp.c iplist.c lcp.c link.c log.c lqr.c main.c \
 	mbuf.c mp.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 throughput.c \
 	timer.c tty.c tun.c udp.c vjcomp.c
 CFLAGS+=-Wall
 LDADD+= -lcrypt -lmd -lutil -lz
 DPADD+=	${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
+.if defined(NOSUID) || defined(PPP_NOSUID)
+BINMODE=554
+.else
 BINMODE=4554
 BINOWN=	root
+.endif
 BINGRP=	network
 MAN8=	ppp.8
 
@@ -37,6 +41,14 @@ DPADD+= ${LIBALIAS}
 .endif
 .endif
 
+.if defined(NOSUID) || defined(PPP_NOSUID)
+CFLAGS+=-DNOSUID
+.else
+.if !defined(RELEASE_CRUNCH)
+SRCS+=	id.c
+.endif
+.endif
+
 .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
 DISTRIBUTION=crypto
 CFLAGS+=-DHAVE_DES
@@ -72,9 +84,9 @@ DPADD+= ${LIBNETGRAPH}
 .if defined(RELEASE_CRUNCH)
 # We must create these objects because crunchgen will link them,
 # and we don't want any unused symbols to spoil the final link.
-CFLAGS+=-DNONAT -DNORADIUS -DNOI4B
-OBJS+=	chap_ms.o nat_cmd.o radius.o
-chap_ms.o nat_cmd.o radius.o:
+CFLAGS+=-DNONAT -DNORADIUS -DNOI4B -DNOSUID
+OBJS+=	chap_ms.o id.o nat_cmd.o radius.o
+chap_ms.o id.o nat_cmd.o radius.o:
 	>null_${.PREFIX}.c
 	cc -c -o ${.TARGET} null_${.PREFIX}.c
 .endif