From 95b4cf32ed4a85b4f7d96e0e2bd9f7ba67930c56 Mon Sep 17 00:00:00 2001
From: robiscool <robrob2626@yahoo.com>
Date: Mon, 5 Apr 2010 18:54:02 -0700
Subject: snort, fix the service path entry

---
 config/snort/snort.xml                |  2 +-
 config/snort/snort_define_servers.php |  6 +-----
 config/snort/snort_interfaces.php     | 10 ++++++++++
 config/snort/snort_preprocessors.php  |  7 +------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index 502438c2..bf053112 100644
--- a/config/snort/snort.xml
+++ b/config/snort/snort.xml
@@ -58,7 +58,7 @@
 	<service>
 		<name>snort</name>
 		<rcfile></rcfile>
-		<executable>snort</executable>
+		<executable>/usr/local/bin/snort</executable>
 		<description>Snort is the most widely deployed IDS/IPS technology worldwide.</description>
 	</service>
 	<tabs>
diff --git a/config/snort/snort_define_servers.php b/config/snort/snort_define_servers.php
index 97e6a28b..b22e206b 100644
--- a/config/snort/snort_define_servers.php
+++ b/config/snort/snort_define_servers.php
@@ -573,11 +573,7 @@ if($id != "")
   </table>
 </form>
 
-<script language="JavaScript">
-<!--
-enable_change(false);
-//-->
-</script>
+
 <?php include("fend.inc"); ?>
 </body>
 </html>
diff --git a/config/snort/snort_interfaces.php b/config/snort/snort_interfaces.php
index b83068e1..d11422cc 100644
--- a/config/snort/snort_interfaces.php
+++ b/config/snort/snort_interfaces.php
@@ -169,6 +169,16 @@ if (isset($_POST['del_x'])) {
 	    }
 	    
 	    write_config();
+	    sleep(2);
+	    
+	    /* if there are no ifaces do not create snort.sh */
+	    if (isset($config['installedpackages']['snortglobal']['rule'][0]['enable'])) {
+	    	create_snort_sh();
+	    }else{
+	    	conf_mount_rw();
+	    	exec('/bin/rm /usr/local/etc/rc.d/snort.sh');
+	    	conf_mount_ro();
+	    }
 	    
 	    //touch("/var/run/snort_conf_delete.dirty");
 	    
diff --git a/config/snort/snort_preprocessors.php b/config/snort/snort_preprocessors.php
index d6cbb55d..cb00099e 100644
--- a/config/snort/snort_preprocessors.php
+++ b/config/snort/snort_preprocessors.php
@@ -224,7 +224,7 @@ $d_snortconfdirty_path = "/var/run/snort_conf_{$snort_uuid}_{$if_real}.dirty";
 		write_config();
         
 		/* after click go to this page */
-		//touch($d_snortconfdirty_path);
+		touch($d_snortconfdirty_path);
 		header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' );
 		header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
 		header( 'Cache-Control: no-store, no-cache, must-revalidate' );
@@ -428,11 +428,6 @@ if($id != "")
   </table>
 </form>
 
-<script language="JavaScript">
-<!--
-enable_change(false);
-//-->
-</script>
 <?php include("fend.inc"); ?>
 </body>
 </html>
-- 
cgit v1.2.3