From 5072ba882c72d6e52f3da607d476074ec26b0a7f Mon Sep 17 00:00:00 2001 From: Michael Rash Date: Sun, 29 Nov 2015 01:10:57 -0800 Subject: [PATCH] remove firewalld config var from test suite (it isn't necessary now that #13 is closed) --- test/conf/auto_blocking.conf | 1 - test/conf/auto_min_dl5_blocking.conf | 1 - test/conf/default_psad.conf | 1 - test/conf/disable_ipv6_detection.conf | 1 - test/conf/enable_ack_detection.conf | 1 - test/conf/ignore_igmp.conf | 1 - test/conf/ignore_intf.conf | 1 - test/conf/ignore_tcp.conf | 1 - test/conf/ignore_udp.conf | 1 - test/conf/require_DROP_syslog_prefix_str.conf | 1 - test/conf/require_missing_syslog_prefix_str.conf | 1 - 11 files changed, 11 deletions(-) diff --git a/test/conf/auto_blocking.conf b/test/conf/auto_blocking.conf index 7276aed..9e4e970 100644 --- a/test/conf/auto_blocking.conf +++ b/test/conf/auto_blocking.conf @@ -34,7 +34,6 @@ FW_MSG_READ_MIN_PKTS 30; ENABLE_SIG_MSG_SYSLOG Y; SIG_MSG_SYSLOG_THRESHOLD 10; SIG_SID_SYSLOG_THRESHOLD 10; -ENABLE_FIREWALLD Y; EXPECT_TCP_OPTIONS Y; MAX_HOPS 20; IGNORE_KERNEL_TIMESTAMP Y; diff --git a/test/conf/auto_min_dl5_blocking.conf b/test/conf/auto_min_dl5_blocking.conf index d09f5c5..351e86a 100644 --- a/test/conf/auto_min_dl5_blocking.conf +++ b/test/conf/auto_min_dl5_blocking.conf @@ -34,7 +34,6 @@ FW_MSG_READ_MIN_PKTS 30; ENABLE_SIG_MSG_SYSLOG Y; SIG_MSG_SYSLOG_THRESHOLD 10; SIG_SID_SYSLOG_THRESHOLD 10; -ENABLE_FIREWALLD Y; EXPECT_TCP_OPTIONS Y; MAX_HOPS 20; IGNORE_KERNEL_TIMESTAMP Y; diff --git a/test/conf/default_psad.conf b/test/conf/default_psad.conf index 56e7b46..664c830 100644 --- a/test/conf/default_psad.conf +++ b/test/conf/default_psad.conf @@ -34,7 +34,6 @@ FW_MSG_READ_MIN_PKTS 30; ENABLE_SIG_MSG_SYSLOG Y; SIG_MSG_SYSLOG_THRESHOLD 10; SIG_SID_SYSLOG_THRESHOLD 10; -ENABLE_FIREWALLD Y; EXPECT_TCP_OPTIONS Y; MAX_HOPS 20; IGNORE_KERNEL_TIMESTAMP Y; diff --git a/test/conf/disable_ipv6_detection.conf b/test/conf/disable_ipv6_detection.conf index ef148da..5aaba7e 100644 --- a/test/conf/disable_ipv6_detection.conf +++ b/test/conf/disable_ipv6_detection.conf @@ -34,7 +34,6 @@ FW_MSG_READ_MIN_PKTS 30; ENABLE_SIG_MSG_SYSLOG Y; SIG_MSG_SYSLOG_THRESHOLD 10; SIG_SID_SYSLOG_THRESHOLD 10; -ENABLE_FIREWALLD Y; EXPECT_TCP_OPTIONS Y; MAX_HOPS 20; IGNORE_KERNEL_TIMESTAMP Y; diff --git a/test/conf/enable_ack_detection.conf b/test/conf/enable_ack_detection.conf index 6787a65..8a38b40 100644 --- a/test/conf/enable_ack_detection.conf +++ b/test/conf/enable_ack_detection.conf @@ -34,7 +34,6 @@ FW_MSG_READ_MIN_PKTS 30; ENABLE_SIG_MSG_SYSLOG Y; SIG_MSG_SYSLOG_THRESHOLD 10; SIG_SID_SYSLOG_THRESHOLD 10; -ENABLE_FIREWALLD Y; EXPECT_TCP_OPTIONS Y; MAX_HOPS 20; IGNORE_KERNEL_TIMESTAMP Y; diff --git a/test/conf/ignore_igmp.conf b/test/conf/ignore_igmp.conf index 899f89b..9987147 100644 --- a/test/conf/ignore_igmp.conf +++ b/test/conf/ignore_igmp.conf @@ -34,7 +34,6 @@ FW_MSG_READ_MIN_PKTS 30; ENABLE_SIG_MSG_SYSLOG Y; SIG_MSG_SYSLOG_THRESHOLD 10; SIG_SID_SYSLOG_THRESHOLD 10; -ENABLE_FIREWALLD Y; EXPECT_TCP_OPTIONS Y; MAX_HOPS 20; IGNORE_KERNEL_TIMESTAMP Y; diff --git a/test/conf/ignore_intf.conf b/test/conf/ignore_intf.conf index dca7a19..eb0b679 100644 --- a/test/conf/ignore_intf.conf +++ b/test/conf/ignore_intf.conf @@ -34,7 +34,6 @@ FW_MSG_READ_MIN_PKTS 30; ENABLE_SIG_MSG_SYSLOG Y; SIG_MSG_SYSLOG_THRESHOLD 10; SIG_SID_SYSLOG_THRESHOLD 10; -ENABLE_FIREWALLD Y; EXPECT_TCP_OPTIONS Y; MAX_HOPS 20; IGNORE_KERNEL_TIMESTAMP Y; diff --git a/test/conf/ignore_tcp.conf b/test/conf/ignore_tcp.conf index d65884c..27ebdae 100644 --- a/test/conf/ignore_tcp.conf +++ b/test/conf/ignore_tcp.conf @@ -34,7 +34,6 @@ FW_MSG_READ_MIN_PKTS 30; ENABLE_SIG_MSG_SYSLOG Y; SIG_MSG_SYSLOG_THRESHOLD 10; SIG_SID_SYSLOG_THRESHOLD 10; -ENABLE_FIREWALLD Y; EXPECT_TCP_OPTIONS Y; MAX_HOPS 20; IGNORE_KERNEL_TIMESTAMP Y; diff --git a/test/conf/ignore_udp.conf b/test/conf/ignore_udp.conf index e173527..e8e93e5 100644 --- a/test/conf/ignore_udp.conf +++ b/test/conf/ignore_udp.conf @@ -34,7 +34,6 @@ FW_MSG_READ_MIN_PKTS 30; ENABLE_SIG_MSG_SYSLOG Y; SIG_MSG_SYSLOG_THRESHOLD 10; SIG_SID_SYSLOG_THRESHOLD 10; -ENABLE_FIREWALLD Y; EXPECT_TCP_OPTIONS Y; MAX_HOPS 20; IGNORE_KERNEL_TIMESTAMP Y; diff --git a/test/conf/require_DROP_syslog_prefix_str.conf b/test/conf/require_DROP_syslog_prefix_str.conf index 645cec5..22545d4 100644 --- a/test/conf/require_DROP_syslog_prefix_str.conf +++ b/test/conf/require_DROP_syslog_prefix_str.conf @@ -34,7 +34,6 @@ FW_MSG_READ_MIN_PKTS 30; ENABLE_SIG_MSG_SYSLOG Y; SIG_MSG_SYSLOG_THRESHOLD 10; SIG_SID_SYSLOG_THRESHOLD 10; -ENABLE_FIREWALLD Y; EXPECT_TCP_OPTIONS Y; MAX_HOPS 20; IGNORE_KERNEL_TIMESTAMP Y; diff --git a/test/conf/require_missing_syslog_prefix_str.conf b/test/conf/require_missing_syslog_prefix_str.conf index 0e223ba..6af8395 100644 --- a/test/conf/require_missing_syslog_prefix_str.conf +++ b/test/conf/require_missing_syslog_prefix_str.conf @@ -34,7 +34,6 @@ FW_MSG_READ_MIN_PKTS 30; ENABLE_SIG_MSG_SYSLOG Y; SIG_MSG_SYSLOG_THRESHOLD 10; SIG_SID_SYSLOG_THRESHOLD 10; -ENABLE_FIREWALLD Y; EXPECT_TCP_OPTIONS Y; MAX_HOPS 20; IGNORE_KERNEL_TIMESTAMP Y;