From 53f79a190c56b491f05d4d239554fecbc2ea2216 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 7 Oct 2014 21:46:36 -0700
Subject: [PATCH] Make error message if iptables is missing nicer

---
 firewall/redhat-linux-lib.pl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/firewall/redhat-linux-lib.pl b/firewall/redhat-linux-lib.pl
index 2318f7726..f22a84651 100755
--- a/firewall/redhat-linux-lib.pl
+++ b/firewall/redhat-linux-lib.pl
@@ -8,10 +8,8 @@ $init_script = "$init::config{'init_dir'}/iptables";
 # Returns an error message if something is wrong with iptables on this system
 sub check_iptables
 {
-if (!-r $init_script &&
-    &backquote_command("service iptables status 2>/dev/null") !~ /Loaded:\s+loaded/) {
-	return &text('redhat_escript', "<tt>$init_script</tt>");
-	}
+&foreign_require("init");
+&init::action_status("iptables") > 0 || return $text{'redhat_einstalled'};
 return undef if ($gconfig{'os_type'} eq 'trustix-linux');
 return undef if ($gconfig{'os_type'} eq 'redhat-linux' &&
 		 $gconfig{'os_version'} > 10);