From 7a38df483b6ea65ee2aa17fb25a8518d74d36f06 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 07 Apr 2013 16:08:02 -0400
Subject: [PATCH] SQL error in mail/mail_domain_del.php
---
server/plugins-available/firewall_plugin.inc.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/plugins-available/firewall_plugin.inc.php b/server/plugins-available/firewall_plugin.inc.php
index 08f735c..7197ccc 100644
--- a/server/plugins-available/firewall_plugin.inc.php
+++ b/server/plugins-available/firewall_plugin.inc.php
@@ -202,7 +202,7 @@
$app->log('Reloading the firewall',LOGLEVEL_DEBUG);
} else {
//* Ensure that bastille firewall is stopped
- exec($conf['init_scripts'] . '/' . 'bastille-firewall stop');
+ exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null');
if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove');
//* Start ufw firewall
@@ -255,11 +255,11 @@
if($app->system->is_installed('ufw')) {
exec('ufw disable');
}
- exec($conf['init_scripts'] . '/' . 'bastille-firewall restart');
+ exec($conf['init_scripts'] . '/' . 'bastille-firewall restart 2>/dev/null');
if(@is_file('/etc/debian_version')) exec('update-rc.d bastille-firewall defaults');
$app->log('Restarting the firewall',LOGLEVEL_DEBUG);
} else {
- exec($conf['init_scripts'] . '/' . 'bastille-firewall stop');
+ exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null');
if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove');
$app->log('Stopping the firewall',LOGLEVEL_DEBUG);
}
@@ -270,7 +270,7 @@
private function bastille_delete($event_name,$data) {
global $app, $conf;
- exec($conf['init_scripts'] . '/' . 'bastille-firewall stop');
+ exec($conf['init_scripts'] . '/' . 'bastille-firewall stop 2>/dev/null');
if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove');
$app->log('Stopping the firewall',LOGLEVEL_DEBUG);
--
Gitblit v1.9.1