Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcpcd/sbin/dhcpcd dhcpcd: Disable priviledge s...



details:   https://anonhg.NetBSD.org/src/rev/f40f10cce810
branches:  trunk
changeset: 972855:f40f10cce810
user:      roy <roy%NetBSD.org@localhost>
date:      Thu Jun 11 16:05:54 2020 +0000

description:
dhcpcd: Disable priviledge separation and sandboxing for SMALLPROG builds

It's a fair chunk of code and is probably safe enough for our ramdisks.

diffstat:

 external/bsd/dhcpcd/sbin/dhcpcd/Makefile |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (33 lines):

diff -r 8bb7c24de592 -r f40f10cce810 external/bsd/dhcpcd/sbin/dhcpcd/Makefile
--- a/external/bsd/dhcpcd/sbin/dhcpcd/Makefile  Thu Jun 11 14:22:10 2020 +0000
+++ b/external/bsd/dhcpcd/sbin/dhcpcd/Makefile  Thu Jun 11 16:05:54 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2020/05/02 19:35:03 fox Exp $
+# $NetBSD: Makefile,v 1.53 2020/06/11 16:05:54 roy Exp $
 #
 
 WARNS?=                6
@@ -13,9 +13,13 @@
 SRCS+=         dhcp-common.c dhcpcd-embedded.c
 SRCS+=         if-bsd.c
 
+# Disable privilege separation and sandboxing
+# This should be fine for ramdisk based installers
+.if !defined(SMALLPROG)
 CPPFLAGS+=     -DPRIVSEP -DPRIVSEP_USER=\"_dhcpcd\"
 SRCS+=         privsep.c privsep-root.c privsep-inet.c
 SRCS+=         privsep-bsd.c
+.endif
 
 CPPFLAGS+=     -DHAVE_CONFIG_H -D_OPENBSD_SOURCE
 
@@ -31,7 +35,9 @@
 .if (${USE_INET} != "no")
 CPPFLAGS+=     -DINET
 SRCS+=         bpf.c dhcp.c ipv4.c
+.if !defined(SMALLPROG)
 SRCS+=         privsep-bpf.c
+.endif
 
 .if (${MKLIBCSANITIZER:Uno} == "yes")
 .if (${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8)



Home | Main Index | Thread Index | Old Index