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

Till Brehm

2014-03-08 006b572cc510033dd6d42aec8f84418869da64fd

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

 server/plugins-available/firewall_plugin.inc.php

@@ -257,10 +257,12 @@
            }
            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 @@

        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);

    }