From 4a354c84796c5eae74053435ccc5ecd718734c34 Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Sun, 6 Sep 2015 17:42:56 +0200
Subject: [PATCH] Change ipfw to IPFW, change exeception ID for IPFW test
---
include/tests_firewalls | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/tests_firewalls b/include/tests_firewalls
index fdd6106a..9f620faf 100644
--- a/include/tests_firewalls
+++ b/include/tests_firewalls
@@ -269,32 +269,32 @@
#################################################################################
#
# Test : FIRE-4530
- # Description : Check ipfw (FreeBSD)
- Register --test-no FIRE-4530 --os FreeBSD --weight L --network NO --description "Check ipfw status"
+ # Description : Check IPFW (FreeBSD)
+ Register --test-no FIRE-4530 --os FreeBSD --weight L --network NO --description "Check IPFW status"
if [ ${SKIPTEST} -eq 0 ]; then
if [ ! "${SYSCTLBINARY}" = "" ]; then
# For now, only check for IPv4.
FIND=`${SYSCTLBINARY} net.inet.ip.fw.enable | awk '{ print $2 }'`
if [ "${FIND}" = "1" ]; then
- Display --indent 2 --text "- Checking ipfw status" --result RUNNING --color GREEN
- logtext "Result: ipfw is running for IPv4"
+ Display --indent 2 --text "- Checking IPFW status" --result RUNNING --color GREEN
+ logtext "Result: IPFW is running for IPv4"
FIREWALL_ACTIVE=1
FIREWALL_SOFTWARE="ipfw"
IPFW_ENABLED=`service -e | grep -o ipfw`
if [ "${IPFW_ENABLED}" = "ipfw" ]; then
- Display --indent 4 --text "- ipfw enabled in /etc/rc.conf" --result YES --color GREEN
- logtext "Result: ipfw is enabled at start-up for IPv4"
+ Display --indent 4 --text "- IPFW enabled in /etc/rc.conf" --result YES --color GREEN
+ logtext "Result: IPFW is enabled at start-up for IPv4"
else
Display --indent 4 --text "- ipfw enabled in /etc/rc.conf" --result NO --color YELLOW
- logtext "Result: ipfw is disabled at start-up for IPv4"
+ logtext "Result: IPFW is disabled at start-up for IPv4"
fi
else
- Display --indent 2 --text "- Checking ipfw status" --result "NOT RUNNING" --color YELLOW
- logtext "Result: ipfw is not running for IPv4"
+ Display --indent 2 --text "- Checking IPFW status" --result "NOT RUNNING" --color YELLOW
+ logtext "Result: IPFW is not running for IPv4"
fi
else
- Display --indent 2 --text "- Checking ipfw" --result SKIPPED --color YELLOW
- ReportException "${TEST_NO}:4" "No IPFW test available (sysctl missing)"
+ Display --indent 2 --text "- Checking IPFW" --result SKIPPED --color YELLOW
+ ReportException "${TEST_NO}:1" "No IPFW test available (sysctl missing)"
fi
fi
#