From a5a258d1820690b7d2bbe945dbe2f43884708269 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Tue, 1 Oct 2013 10:41:21 +0100
Subject: Fix namespace problem on root user check (mga#11332)

---
 NEWS             | 2 ++
 bin/drakfirewall | 3 +--
 bin/drakvpn      | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 42594b4..f23b81b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix namespace problem on root check (mga#11332)
+
 1.26:
 - use polkit for authorisation (mga#11125)
 
diff --git a/bin/drakfirewall b/bin/drakfirewall
index 688fd5b..9679cf9 100755
--- a/bin/drakfirewall
+++ b/bin/drakfirewall
@@ -21,13 +21,12 @@ use lib qw(/usr/lib/libDrakX);
 # i18n: IMPORTANT: to get correct namespace (drakx-net instead of libDrakX)
 BEGIN { unshift @::textdomains, 'drakx-net' }
 use standalone;     #- warning, standalone must be loaded very first, for 'explanations'
-
 use interactive;
 use network::drakfirewall;
 
 $ugtk2::wm_icon = "/usr/share/mcc/themes/default/firewall-mdk.png";
 
-require_root_capability();
+common::require_root_capability();
 
 my $in = 'interactive'->vnew;
 
diff --git a/bin/drakvpn b/bin/drakvpn
index 595787c..d50ce2f 100755
--- a/bin/drakvpn
+++ b/bin/drakvpn
@@ -13,7 +13,7 @@ use standalone;
 use interactive;
 use network::drakvpn;
 
-require_root_capability();
+common::require_root_capability();
 
 my $in = 'interactive'->vnew;
 network::drakvpn::create_connection($in);
-- 
cgit v1.2.1