From 59071d87b94b0209ec62600ecf4ec96bcfe934f9 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@mimuw.edu.pl>
Date: Fri, 29 Apr 2011 02:26:25 +0200
Subject: [PATCH] Revert "Run nm-applet as normal user"

This reverts commit 2f5b6e6582e71630193d0098d4cc60db019e1e9b.

Dbus policy hacking not needed any more. ConsoleKit session is correctly started.
---
 netvm/dbus-nm-applet.conf | 42 ---------------------------------------
 rpm_spec/core-netvm.spec  |  9 ---------
 2 files changed, 51 deletions(-)
 delete mode 100644 netvm/dbus-nm-applet.conf

diff --git a/netvm/dbus-nm-applet.conf b/netvm/dbus-nm-applet.conf
deleted file mode 100644
index 0d0f082..0000000
--- a/netvm/dbus-nm-applet.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-	<!--
-	     WARNING: if running any D-Bus version prior to 1.2.6, you may be
-	     vulnerable to information leakage via the NM D-Bus interface.
-	     Previous D-Bus versions did not deny-by-default, and this permissions
-	     config file assumes that D-Bus will deny rules by default unless
-	     explicitly over-ridden with an <allow /> tag.
-	 -->
-
-        <policy user="root">
-                <allow own="org.freedesktop.NetworkManagerUserSettings"/>
-
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.NetworkManagerSettings"/>
-
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.NetworkManagerSettings.Connection"/>
-
-                <!-- Only root can get secrets -->
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.NetworkManagerSettings.Connection.Secrets"/>
-        </policy>
-        <policy user="user">
-                <allow own="org.freedesktop.NetworkManagerUserSettings"/>
-
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.NetworkManagerSettings"/>
-
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.NetworkManagerSettings.Connection"/>
-        </policy>
-        <policy context="default">
-                <allow send_destination="org.freedesktop.NetworkManagerUserSettings"
-                       send_interface="org.freedesktop.DBus.Introspectable"/>
-        </policy>
-
-        <limit name="max_replies_per_connection">512</limit>
-</busconfig>
-
diff --git a/rpm_spec/core-netvm.spec b/rpm_spec/core-netvm.spec
index 07200b4..a4c966b 100644
--- a/rpm_spec/core-netvm.spec
+++ b/rpm_spec/core-netvm.spec
@@ -66,9 +66,6 @@ mkdir -p $RPM_BUILD_ROOT/var/run/qubes
 mkdir -p $RPM_BUILD_ROOT/etc/xen/scripts
 cp ../common/vif-route-qubes $RPM_BUILD_ROOT/etc/xen/scripts
 
-mkdir -p $RPM_BUILD_ROOT/etc/dbus-1/system.d
-cp ../netvm/dbus-nm-applet.conf $RPM_BUILD_ROOT/etc/dbus-1/system.d/qubes-nm-applet.conf
-
 %post
 
 # Create NetworkManager configuration if we do not have it
@@ -91,11 +88,6 @@ if [ "$1" = 0 ] ; then
     chkconfig qubes_core_netvm off
 fi
 
-%triggerin -- NetworkManager
-# Fix PolicyKit settings to allow run as normal user not visible to ConsoleKit
-sed 's#<defaults>$#\0<allow_any>yes</allow_any>#' -i /usr/share/polkit-1/actions/org.freedesktop.NetworkManager.policy
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -108,4 +100,3 @@ rm -rf $RPM_BUILD_ROOT
 /etc/NetworkManager/dispatcher.d/qubes_nmhook
 /etc/NetworkManager/dispatcher.d/30-qubes_external_ip
 /etc/xen/scripts/vif-route-qubes
-/etc/dbus-1/system.d/qubes-nm-applet.conf