From 615a0a96618fa99e7e452523145d6c0f238d4473 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 31 Jul 2013 09:33:43 -0400
Subject: [PATCH] Merged revisions 3960-4065 from stable branch.
---
server/mods-available/dns_module.inc.php | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/server/mods-available/dns_module.inc.php b/server/mods-available/dns_module.inc.php
index 01c4526..2fac7b5 100644
--- a/server/mods-available/dns_module.inc.php
+++ b/server/mods-available/dns_module.inc.php
@@ -128,12 +128,13 @@
$daemon = 'named';
}
+ $retval = array('output' => '', 'retval' => 0);
if($action == 'restart') {
- exec($conf['init_scripts'] . '/' . $daemon . ' restart');
+ exec($conf['init_scripts'] . '/' . $daemon . ' restart', $retval['output'], $retval['retval']);
} else {
- exec($conf['init_scripts'] . '/' . $daemon . ' reload');
+ exec($conf['init_scripts'] . '/' . $daemon . ' reload', $retval['output'], $retval['retval']);
}
-
+ return $retval;
}
function restartPowerDNS($action = 'restart') {
@@ -177,9 +178,11 @@
$daemon = 'pdns';
}
- exec($conf['init_scripts'] . '/' . $daemon . ' restart');
+ $retval = array('output' => '', 'retval' => 0);
+ exec($conf['init_scripts'] . '/' . $daemon . ' restart', $retval['output'], $retval['retval']);
// unset $tmps;
+ return $retval;
}
--
Gitblit v1.9.1