Merge branch 'master' of git@github.com:webmin/webmin

This commit is contained in:
Jamie Cameron
2012-04-30 14:00:42 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -18,7 +18,7 @@ if ($c = &missing_firewall_commands()) {
}
# Check if the kernel supports iptables
$out = `iptables -n -t filter -L OUTPUT 2>&1`;
$out = &backquote_command("iptables -n -t filter -L OUTPUT 2>&1");
if ($?) {
print "<p>",&text('index_ekernel', "<pre>$out</pre>"),"<p>\n";
&ui_print_footer("/", $text{'index'});

View File

@@ -9,7 +9,7 @@ do 'firewall-lib.pl';
sub is_installed
{
return 0 if (&missing_firewall_commands());
local $out = `iptables -n -t filter -L OUTPUT 2>&1`;
local $out = &backquote_command("iptables -n -t filter -L OUTPUT 2>&1");
return 0 if ($?);
if ($_[0]) {
if (!$config{'direct'} &&