tests/mac_ipacl: restore sysctls after modification

While here, use 'required_kmods' instead of ad-hoc
checks.

Signed-off-by: Siva Mahadevan <me@svmhdvn.name>

Reviewed by:	markj
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
Pull request:	https://github.com/freebsd/freebsd-src/pull/1856

tests/sys/mac/ipacl/Makefile

@@ -6,4 +6,9 @@ ATF_TESTS_SH+=	ipacl_test
 
 ${PACKAGE}FILES+=	utils.subr
 
+.for t in ${ATF_TESTS_SH}
+TEST_METADATA.$t+=	required_kmods="mac_ipacl"
+TEST_METADATA.$t+=	is_exclusive="true"
+.endfor
+
 .include <bsd.test.mk>

tests/sys/mac/ipacl/ipacl_test.sh

@@ -40,6 +40,9 @@ ipacl_v4_body()
 {
 	ipacl_test_init
 
+	prev_ipacl_ipv4="$(sysctl -n security.mac.ipacl.ipv4)"
+	prev_ipacl_rules="$(sysctl -n security.mac.ipacl.rules)"
+
 	epairA=$(vnet_mkepair)
 	epairB=$(vnet_mkepair)
 	epairC=$(vnet_mkepair)
@@ -130,8 +133,9 @@ ipacl_v4_body()
 	atf_check -s not-exit:0 -e ignore \
 	    jexec A ifconfig ${epairA}b 203.0.113.1/24 up
 
-	# Reset rules OID.
-	sysctl security.mac.ipacl.rules=
+	# Reset sysctls.
+	sysctl security.mac.ipacl.rules="${prev_ipacl_rules}"
+	sysctl security.mac.ipacl.ipv4="${prev_ipacl_ipv4}"
 }
 
 ipacl_v4_cleanup()
@@ -151,6 +155,9 @@ ipacl_v6_body()
 {
 	ipacl_test_init
 
+	prev_ipacl_ipv6="$(sysctl -n security.mac.ipacl.ipv6)"
+	prev_ipacl_rules="$(sysctl -n security.mac.ipacl.rules)"
+
 	epairA=$(vnet_mkepair)
 	epairB=$(vnet_mkepair)
 	epairC=$(vnet_mkepair)
@@ -265,8 +272,9 @@ ipacl_v6_body()
 	atf_check -s not-exit:0 -e ignore jexec A ifconfig \
 	    ${epairA}b inet6 2001:db8::abcd/32 up
 
-	# Reset rules OID.
-	sysctl security.mac.ipacl.rules=
+	# Reset sysctls.
+	sysctl security.mac.ipacl.rules="${prev_ipacl_rules}"
+	sysctl security.mac.ipacl.ipv6="${prev_ipacl_ipv6}"
 }
 
 ipacl_v6_cleanup()

tests/sys/mac/ipacl/utils.subr

@@ -5,10 +5,6 @@
 ipacl_test_init()
 {
 	vnet_init
-
-	if ! kldstat -q -m mac_ipacl; then
-		atf_skip "mac_ipacl is not loaded"
-	fi
 }
 
 ipacl_test_cleanup()