summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrian <brian@cvs.openbsd.org>2000-08-18 00:06:26 +0000
committerbrian <brian@cvs.openbsd.org>2000-08-18 00:06:26 +0000
commit9d863ab45f098081ccb8d083dd784d2b7b493990 (patch)
treeb8c3f28f768b20fc30100aa45464b213c389d3aa
parentdbeb3c0f38e4fdb164b7a43ea1b8a2f0296b0453 (diff)
Make -DNOSUID (or -DPPP_NOSUID) possible to build ppp without SUID
capabilities.
-rw-r--r--usr.sbin/ppp/ppp/Makefile14
1 files changed, 12 insertions, 2 deletions
diff --git a/usr.sbin/ppp/ppp/Makefile b/usr.sbin/ppp/ppp/Makefile
index a4569e93c17..f851d7bea36 100644
--- a/usr.sbin/ppp/ppp/Makefile
+++ b/usr.sbin/ppp/ppp/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2000/08/13 22:05:47 brian Exp $
+# $OpenBSD: Makefile,v 1.17 2000/08/18 00:06:25 brian Exp $
PROG= ppp
SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
alias_nbt.c alias_pptp.c alias_proxy.c alias_smedia.c alias_util.c \
acf.c arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chap_ms.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 \
+ hdlc.c iface.c ip.c ipcp.c iplist.c lcp.c link.c log.c lqr.c \
main.c mbuf.c mp.c nat_cmd.c pap.c physical.c pred.c probe.c prompt.c \
proto.c radius.c radlib.c route.c server.c sig.c slcompress.c \
systems.c sync.c tcp.c throughput.c timer.c tty.c tun.c udp.c vjcomp.c
@@ -13,9 +13,19 @@ CFLAGS+=-Wall -DHAVE_DES -DNO_FW_PUNCH -DNOI4B -DNONETGRAPH
CFLAGS+=-DLOCALNAT -DLOCALRAD
LDADD+= -ldes -lutil -lz
DPADD+= ${LIBDES} ${LIBUTIL} ${LIBZ}
+.if defined(NOSUID) || defined(PPP_NOSUID)
+BINMODE=554
+.else
BINMODE=4554
BINOWN= root
+.endif
BINGRP= network
MAN= ppp.8
+.if defined(NOSUID) || defined(PPP_NOSUID)
+CFLAGS+=-DNOSUID
+.else
+SRCS+= id.c
+.endif
+
.include <bsd.prog.mk>