diff options
| author | Roy Marples <roy@marples.name> | 2020-05-12 11:23:03 +0100 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2020-05-12 11:23:03 +0100 |
| commit | a9671ceddfb947fd7eebf27d0062103e04f53dbf (patch) | |
| tree | 8b3ac1a695436be5e5309d381e5b4b693c717004 /configure | |
| parent | b5672cc1ac480308cdb0942cd1880dd13b5039ae (diff) | |
| download | dhcpcd-a9671ceddfb947fd7eebf27d0062103e04f53dbf.tar.xz | |
privsep: No longer need the chrootdir configure option.
As we work with an empty chroot directory.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 15 |
1 files changed, 0 insertions, 15 deletions
@@ -13,7 +13,6 @@ IPV4LL= INET6= PRIVSEP= PRIVSEP_USER= -PRIVSEP_CHROOT= ARC4RANDOM= CLOSEFROM= RBTREE= @@ -72,7 +71,6 @@ for x do --disable-privsep) PRIVSEP=no;; --enable-privsep) PRIVSEP=yes;; --privsepuser) PRIVSEP_USER=$var;; - --chrootdir) PRIVSEP_CHROOT=$var;; --prefix) PREFIX=$var;; --sysconfdir) SYSCONFDIR=$var;; --bindir|--sbindir) SBINDIR=$var;; @@ -581,22 +579,9 @@ if [ "$PRIVSEP" = yes ]; then echo "CPPFLAGS+= -DPRIVSEP" >>$CONFIG_MK echo "PRIVSEP_USER?= $PRIVSEP_USER" >>$CONFIG_MK - if [ -n "$PRIVSEP_CHROOT" ]; then - echo "PRIVSEP_CHROOT= $PRIVSEP_CHROOT" >>$CONFIG_MK - cat <<EOF >>$CONFIG_MK -SED_CHROOT= -e 's:@CHDIR^@.*@CHDIR\$\$@:default of:g' \\ - -e 's:@CHDIR1@:.Pa \${PRIVSEP_CHROOT} .:g' \\ - -e 's:@CHDIR2@:A blank string chroots to the privileged separation users home directory.:g' -EOF - fi echo "#ifndef PRIVSEP_USER" >>$CONFIG_H echo "#define PRIVSEP_USER \"$PRIVSEP_USER\"" >>$CONFIG_H echo "#endif" >>$CONFIG_H - if [ -n "$PRIVSEP_CHROOT" ]; then - echo "#ifndef PRIVSEP_CHROOT" >>$CONFIG_H - echo "#define PRIVSEP_CHROOT \"$PRIVSEP_CHROOT\"" >>$CONFIG_H - echo "#endif" >>$CONFIG_H - fi echo "DHCPCD_SRCS+= privsep.c privsep-root.c privsep-inet.c" \ >>$CONFIG_MK if [ -z "$INET" ] || [ "$INET" = yes ]; then |