From 9398dbc1ddc79ca4ef46e327e6a2c7eec621fe5f Mon Sep 17 00:00:00 2001
From: Derek Jennings <djennings@mageia.org>
Date: Tue, 2 Jul 2013 15:37:34 +0000
Subject: allow urpmi to work when parental controls enabled (mga#7775)

---
 Makefile      | 2 +-
 NEWS          | 3 +++
 bin/drakguard | 5 +++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index fe99115..74b148b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME = drakguard
-VERSION = 0.7.11
+VERSION = 0.7.12
 
 DESTDIR=
 sbindir=/usr/sbin
diff --git a/NEWS b/NEWS
index bc5d50d..5663099 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+0.7.12
+- allow urpmi to work when parental controls enabled (mga#7775)
+
 0.7.11
 - allow for ext4 when enabling acl (mga#9195)
 
diff --git a/bin/drakguard b/bin/drakguard
index bb6cc75..5be4409 100755
--- a/bin/drakguard
+++ b/bin/drakguard
@@ -69,6 +69,7 @@ my $proxy_port = 3128;
 my $proxy_user = 'squid';
 my $guardian_port = 8080;
 my $guardian_user = 'dansguardian';
+my $root_user = 'root';
 load();
 
 
@@ -91,7 +92,7 @@ my $users_program_list;
 
 my $users_list = Gtk2::SimpleList->new(N("Allowed users") => 'text');
 $users_list->get_selection->set_mode('multiple');
-@{$users_list->{data}} = difference2($shorewall->{accept_local_users}{http}, [ $proxy_user ]);
+@{$users_list->{data}} = difference2($shorewall->{accept_local_users}{http}, [ $root_user, $proxy_user ]);
 
 my @url_lists = (
     {
@@ -466,7 +467,7 @@ sub save() {
 
     if ($shorewall) {
         $shorewall->{disabled} = 0 if $enable;
-        @{$shorewall->{accept_local_users}{http}} = if_($enable, uniq($proxy_user, list_get_entries($users_list)));
+        @{$shorewall->{accept_local_users}{http}} = if_($enable, uniq($proxy_user, $root_user, list_get_entries($users_list)));
         @{$shorewall->{accept_local_users}{$proxy_port}} = if_($enable, $guardian_user);
         network::shorewall::set_redirected_ports($shorewall, 'tcp', $guardian_port, if_($enable, 'http', $proxy_port));
         network::shorewall::write($shorewall, $in);
-- 
cgit v1.2.1