Fixed: FS#3127 - Firewall not fully disabled when the rule set is removed in ispconfig

Till Brehm · Till Brehm · commit 006b572cc510 · 2014-03-08T20:12:20.000+01:00
diff --git a/server/plugins-available/firewall_plugin.inc.php b/server/plugins-available/firewall_plugin.inc.php
@@ -257,10 +257,12 @@ private function bastille_update($event_name, $data) {
 			}
 			exec($conf['init_scripts'] . '/' . 'bastille-firewall restart 2>/dev/null');
 			if(@is_file('/etc/debian_version')) exec('update-rc.d bastille-firewall defaults');
+			if(@is_file('/sbin/insserv')) exec('insserv -d bastille-firewall');
 			$app->log('Restarting the firewall', LOGLEVEL_DEBUG);
 		} else {
 			exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null');
 			if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove');
+			if(@is_file('/sbin/insserv')) exec('insserv -r -f bastille-firewall');
 			$app->log('Stopping the firewall', LOGLEVEL_DEBUG);
 		}
 
@@ -272,6 +274,7 @@ private function bastille_delete($event_name, $data) {
 
 		exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null');
 		if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove');
+		if(@is_file('/sbin/insserv')) exec('insserv -r -f bastille-firewall');
 		$app->log('Stopping the firewall', LOGLEVEL_DEBUG);
 
 	}

Original file line number	Diff line number	Diff line change
`@@ -257,10 +257,12 @@ private function bastille_update($event_name, $data) {`
`257`	`257`	`}`
`258`	`258`	`exec($conf['init_scripts'] . '/' . 'bastille-firewall restart 2>/dev/null');`
`259`	`259`	`if(@is_file('/etc/debian_version')) exec('update-rc.d bastille-firewall defaults');`
	`260`	`+ if(@is_file('/sbin/insserv')) exec('insserv -d bastille-firewall');`
`260`	`261`	`$app->log('Restarting the firewall', LOGLEVEL_DEBUG);`
`261`	`262`	`} else {`
`262`	`263`	`exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null');`
`263`	`264`	`if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove');`
	`265`	`+ if(@is_file('/sbin/insserv')) exec('insserv -r -f bastille-firewall');`
`264`	`266`	`$app->log('Stopping the firewall', LOGLEVEL_DEBUG);`
`265`	`267`	`}`
`266`	`268`
`@@ -272,6 +274,7 @@ private function bastille_delete($event_name, $data) {`
`272`	`274`
`273`	`275`	`exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null');`
`274`	`276`	`if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove');`
	`277`	`+ if(@is_file('/sbin/insserv')) exec('insserv -r -f bastille-firewall');`
`275`	`278`	`$app->log('Stopping the firewall', LOGLEVEL_DEBUG);`
`276`	`279`
`277`	`280`	`}`