summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-07-03 19:31:35 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-07-03 19:31:35 +0000
commite858ebccdc2aa7fcde19dda90a1b70b6a7c07cff (patch)
tree56dac3660e4f6053e461c885e8d7a80689a5735d
parent2124458dedb829b44635f99cb4c3ad47233c56af (diff)
pfctl can finally run as non-root again, so we can get rid of a lot of ${SUDO}s
-rw-r--r--regress/sbin/pfctl/Makefile22
1 files changed, 11 insertions, 11 deletions
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 964c534af00..1312cc03440 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.179 2004/06/29 22:14:30 henning Exp $
+# $OpenBSD: Makefile,v 1.180 2004/07/03 19:31:34 henning Exp $
# TARGETS
# pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
@@ -56,11 +56,11 @@ PFAIL_TARGETS+=pfail${n}
PFAIL_UPDATES+=pfail${n}-update
pfail${n}:
- ${SUDO} pfctl -nv -f - < ${.CURDIR}/pfail${n}.in 2>&1 | \
+ pfctl -nv -f - < ${.CURDIR}/pfail${n}.in 2>&1 | \
diff -u ${.CURDIR}/pfail${n}.ok /dev/stdin
pfail${n}-update:
- if ${SUDO} pfctl -nv -f - < ${.CURDIR}/pfail${n}.in > \
+ if pfctl -nv -f - < ${.CURDIR}/pfail${n}.in > \
${.CURDIR}/pfail${n}.ok 2>&1; then \
true; \
fi;
@@ -77,15 +77,15 @@ PF_TARGETS+=pf${n}
PF_UPDATES+=pf${n}-update
pf${n}:
- ${SUDO} pfctl -nv -f - < ${.CURDIR}/pf${n}.in | \
+ pfctl -nv -f - < ${.CURDIR}/pf${n}.in | \
diff -u ${.CURDIR}/pf${n}.ok /dev/stdin
pf${n}-update:
- ${SUDO} pfctl -nv -f - < ${.CURDIR}/pf${n}.in > ${.CURDIR}/pf${n}.ok
+ pfctl -nv -f - < ${.CURDIR}/pf${n}.in > ${.CURDIR}/pf${n}.ok
SELFPF_TARGETS+=selfpf${n}
selfpf${n}:
- ${SUDO} pfctl -nv -f - < ${.CURDIR}/pf${n}.ok | \
+ pfctl -nv -f - < ${.CURDIR}/pf${n}.ok | \
diff -u ${.CURDIR}/pf${n}.ok /dev/stdin
.endfor
@@ -101,7 +101,7 @@ UPDATE_TARGETS+=pf-update
PFSIMPLE_TARGETS+=pfsimple${n}
pfsimple${n}:
- ${SUDO} pfctl -nf - < ${.CURDIR}/pfsimple${n}.in
+ pfctl -nf - < ${.CURDIR}/pfsimple${n}.in
.endfor
@@ -176,12 +176,12 @@ PFOPT_TARGETS+=pfopt${n}
PFOPT_UPDATES+=pfopt${n}-update
pfopt${n}:
- ${SUDO} pfctl -nv -f - `cat ${.CURDIR}/pfopt${n}.opts` \
+ pfctl -nv -f - `cat ${.CURDIR}/pfopt${n}.opts` \
< ${.CURDIR}/pfopt${n}.in | \
diff -u ${.CURDIR}/pfopt${n}.ok /dev/stdin
pfopt${n}-update:
- ${SUDO} pfctl -nv -f - `cat ${.CURDIR}/pfopt${n}.opts` \
+ pfctl -nv -f - `cat ${.CURDIR}/pfopt${n}.opts` \
< ${.CURDIR}/pfopt${n}.in > ${.CURDIR}/pfopt${n}.ok
.endfor
@@ -197,13 +197,13 @@ PFSETUP_UPDATES+=pfsetup${n}-update
pfsetup${n}:
${SUDO} ${SHELL} ${.CURDIR}/pfsetup${n}.setup
- ${SUDO} pfctl -nv -f - < ${.CURDIR}/pfsetup${n}.in | \
+ pfctl -nv -f - < ${.CURDIR}/pfsetup${n}.in | \
diff -u ${.CURDIR}/pfsetup${n}.ok /dev/stdin
${SUDO} ${SHELL} ${.CURDIR}/pfsetup${n}.clean
pfsetup${n}-update:
${SUDO} ${SHELL} ${.CURDIR}/pfsetup${n}.setup
- ${SUDO} pfctl -nv -f - < ${.CURDIR}/pfsetup${n}.in \
+ pfctl -nv -f - < ${.CURDIR}/pfsetup${n}.in \
> ${.CURDIR}/pfsetup${n}.ok
${SUDO} ${SHELL} ${.CURDIR}/pfsetup${n}.clean