From: Stefan Schantl <Stevee@ipfire.org>
Date: Fri, 24 Apr 2009 12:51:02 +0000 (+0200)
Subject: Removed http_preprocessor disable feature from ids.cgi
X-Git-Tag: v2.5-beta1~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de062c71841cca6fc7ee1ebe158d1ea426feb813;p=ipfire-2.x.git

Removed http_preprocessor disable feature from ids.cgi
---

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 3566b938a4..76b846ad91 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -56,7 +56,6 @@ $snortsettings{'ENABLE_SNORT'} = 'off';
 $snortsettings{'ENABLE_SNORT_GREEN'} = 'off';
 $snortsettings{'ENABLE_SNORT_BLUE'} = 'off';
 $snortsettings{'ENABLE_SNORT_ORANGE'} = 'off';
-$snortsettings{'ENABLE_PREPROCESSOR_HTTP_INSPECT'} = 'off';
 $snortsettings{'ENABLE_GUARDIAN'} = 'off';
 $snortsettings{'GUARDIAN_INTERFACE'} = `cat /var/ipfire/red/iface`;
 $snortsettings{'GUARDIAN_HOSTGATEWAYBYTE'} = '1';
@@ -112,17 +111,6 @@ if (-e "/etc/snort/snort.conf") {
 		# Trim the line
 		chomp $line;
 
-		if ($snortsettings{'ACTION'} eq $Lang::tr{'save'}) {
-			# Check for preprocessor settings
-			if ($line =~ /preprocessor http_inspect/) {
-				# Strip out leading # from rule line
-				$line =~ s/\# ?//i;
-				if (($snortsettings{'ENABLE_PREPROCESSOR_HTTP_INSPECT'} eq 'off')) {
-					$line = "# $line";
-				}
-			}
-		}
-
 		# Check for a line with .rules
 		if ($line =~ /\.rules$/) {
 			# Parse out rule file name
@@ -384,9 +372,6 @@ $checked{'ENABLE_SNORT_BLUE'}{$snortsettings{'ENABLE_SNORT_BLUE'}} = "checked='c
 $checked{'ENABLE_SNORT_ORANGE'}{'off'} = '';
 $checked{'ENABLE_SNORT_ORANGE'}{'on'} = '';
 $checked{'ENABLE_SNORT_ORANGE'}{$snortsettings{'ENABLE_SNORT_ORANGE'}} = "checked='checked'";
-$checked{'ENABLE_PREPROCESSOR_HTTP_INSPECT'}{'off'} = '';
-$checked{'ENABLE_PREPROCESSOR_HTTP_INSPECT'}{'on'} = '';
-$checked{'ENABLE_PREPROCESSOR_HTTP_INSPECT'}{$snortsettings{'ENABLE_PREPROCESSOR_HTTP_INSPECT'}} = "checked='checked'";
 $checked{'ENABLE_GUARDIAN'}{'off'} = '';
 $checked{'ENABLE_GUARDIAN'}{'on'} = '';
 $checked{'ENABLE_GUARDIAN'}{$snortsettings{'ENABLE_GUARDIAN'}} = "checked='checked'";
@@ -455,14 +440,6 @@ print <<END
 <tr>
 	<td><hr /></td>
 </tr>
-<tr>
-	<td><b>$Lang::tr{'ids preprocessor'}</b></td>
-</tr>
-<tr>
-  	<td><input type='checkbox' name='ENABLE_PREPROCESSOR_HTTP_INSPECT' $checked{'ENABLE_PREPROCESSOR_HTTP_INSPECT'}{'on'} />  http_inspect $Lang::tr{'active'}
-<tr>
-	<td><hr /></td>
-</tr>
 <tr>
 	<td><b>$Lang::tr{'ids rules update'}</b></td>
 </tr>