filter: rip out an unused table

opnsense · Aug 28, 2015 · f326e38 · f326e38
1 parent 74e3d1f
commit f326e38
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc
@@ -526,12 +526,11 @@ function filter_generate_aliases()
 		}
 	}
 
-	$aliases .= "\n#SSH Lockout Table\n";
+	$aliases .= "\n# SSH Lockout Table\n";
 	$aliases .= "table <sshlockout> persist\n";
 	$aliases .= "table <webConfiguratorlockout> persist\n";
 
-	$aliases .= "#Snort tables\n";
-	$aliases .= "table <snort2c>\n";
+	$aliases .= "# Other tables\n";
 	$aliases .= "table <virusprot>\n";
 	touch('/usr/local/etc/bogons');
 	touch('/usr/local/etc/bogonsv6');
@@ -2680,10 +2679,6 @@ block {$log['block']} quick inet proto { tcp, udp } from any to any port = 0
 block {$log['block']} quick inet6 proto { tcp, udp } from any port = 0 to any
 block {$log['block']} quick inet6 proto { tcp, udp } from any to any port = 0
 
-# Snort package
-block {$log['block']} quick from <snort2c> to any  label "Block snort2c hosts"
-block {$log['block']} quick from any to <snort2c>  label "Block snort2c hosts"
-
 EOD;
 
 

diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
@@ -501,7 +501,8 @@ function upgrade_024_to_025() {
 	unset($config['system']['use_rrd_gateway']);
 }
 
-function upgrade_025_to_026() {
+function upgrade_025_to_026()
+{
 	global $config;
 	$cron_item = array();
 	$cron_item['minute'] = "0";
@@ -568,20 +569,8 @@ function upgrade_025_to_026() {
 	$cron_item['command'] = "/usr/local/sbin/expiretable -v -t 3600 virusprot";
 
 	$config['cron']['item'][] = $cron_item;
-
-	$cron_item = array();
-	$cron_item['minute'] = "*/60";
-	$cron_item['hour'] = "*";
-	$cron_item['mday'] = "*";
-	$cron_item['month'] = "*";
-	$cron_item['wday'] = "*";
-	$cron_item['who'] = "root";
-	$cron_item['command'] = "/usr/local/sbin/expiretable -t 1800 snort2c";
-
-	$config['cron']['item'][] = $cron_item;
 }
 
-
 function upgrade_028_to_029() {
 	global $config;
 	$rule_item = array();

diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc
@@ -85,7 +85,6 @@ $reserved_table_names = array(
         "bogons",
         "bogonsv6",
         "negate_networks",
-        "snort2c",
         "sshlockout",
         "tonatsubnets",
         "virusprot",