]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Revert "privsep: default to using _dhcpcd and not _dhcp"
authorRoy Marples <roy@marples.name>
Sun, 5 Apr 2020 14:52:50 +0000 (15:52 +0100)
committerRoy Marples <roy@marples.name>
Sun, 5 Apr 2020 14:52:50 +0000 (15:52 +0100)
This reverts commit 36c47a8df0951236a7842bbf8241e2932357ef61.

configure

index fe5db53aa20b797763c7d4ad5f3256ee1a6e62f1..de0bf3f2505848c97caa137ad788c038f285fa78 100755 (executable)
--- a/configure
+++ b/configure
@@ -555,7 +555,18 @@ fi
 
 if [ "$PRIVSEP" = yes ]; then
        echo "Enabling Privilege 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