From: Roy Marples <roy@marples.name>
Date: Wed, 18 Dec 2019 14:37:01 +0000 (+0000)
Subject: privsep: Support the generic _dhcp entry on DragonFly
X-Git-Tag: v9.0.0~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d67dbc42261587b76fe169bf0b49c6e4cc2fd4bc;p=thirdparty%2Fdhcpcd.git

privsep: Support the generic _dhcp entry on DragonFly

No need to create a specific _dhcpcd user in this instance.
---

diff --git a/configure b/configure
index e78370ab..0cb27ce1 100755
--- a/configure
+++ b/configure
@@ -12,7 +12,7 @@ ARPING=
 IPV4LL=
 INET6=
 PRIVSEP=
-PRIVSEP_USER=_dhcpcd
+PRIVSEP_USER=
 ARC4RANDOM=
 CLOSEFROM=
 RBTREE=
@@ -539,6 +539,18 @@ fi
 
 if [ "$PRIVSEP" = yes ]; then
 	echo "Enabling Priviledge Separation"
+
+	# Try and work out a user
+	if [ -z "$PRIVSEP_USER" ]; then
+		for x in _dhcpcd _dhcp; do
+			if id "$x" 2>/dev/null >&2; then
+				PRIVSEP_USER="$x"
+				break
+			fi
+		done
+	fi
+	: ${PRIVSEP_USER:= _dhcpcd}
+
 	echo "CPPFLAGS+=	-DPRIVSEP" >>$CONFIG_MK
 	echo "#ifndef PRIVSEP_USER" >>$CONFIG_H
 	echo "#define PRIVSEP_USER		 \"$PRIVSEP_USER\"" >>$CONFIG_H