Blob Blame History Raw
diff -up wicd-1.7.2.4/in/other=wicd.conf.in.dbus wicd-1.7.2.4/in/other=wicd.conf.in
--- wicd-1.7.2.4/in/other=wicd.conf.in.dbus	2011-09-18 04:48:13.000000000 -0400
+++ wicd-1.7.2.4/in/other=wicd.conf.in	2014-06-30 10:29:35.968246038 -0400
@@ -7,41 +7,34 @@
                 <allow own="org.wicd.daemon"/>
                 <allow send_destination="org.wicd.daemon"/>
                 <allow send_interface="org.wicd.daemon"/>
-		<allow send_destination="org.wicd.daemon.wireless"/>
-		<allow send_interface="org.wicd.daemon.wireless"/>
-		<allow send_destination="org.wicd.daemon.wired"/>
-		<allow send_interface="org.wicd.daemon.wired"/>
+                <allow send_destination="org.wicd.daemon.wireless"/>
+                <allow send_interface="org.wicd.daemon.wireless"/>
+                <allow send_destination="org.wicd.daemon.wired"/>
+                <allow send_interface="org.wicd.daemon.wired"/>
         </policy>
 
-        <policy context="default">
-                <deny own="org.wicd.daemon"/>
-        </policy>
-
-	<!-- This Unix group will have permission to use Wicd's gui -->
-        <policy group="%WICDGROUP%">
+        <policy group="users">
+                <allow own="org.wicd.daemon"/>
                 <allow send_destination="org.wicd.daemon"/>
                 <allow send_interface="org.wicd.daemon"/>
-                <allow send_interface="org.freedesktop.DBus.Introspectable"/>
-                <!-- The Introspectable allow shouldn't be needed here, but
-                     it seems that a few distributions aren't yet allowing
-                     it in their hal configs, and we need it here, so... -->
+                <allow send_destination="org.wicd.daemon.wireless"/>
+                <allow send_interface="org.wicd.daemon.wireless"/>
+                <allow send_destination="org.wicd.daemon.wired"/>
+                <allow send_interface="org.wicd.daemon.wired"/>
         </policy>
 
-       <!-- Comment the block below if you do not want all users logged in 
-            locally to have permission to use wicd-client.  This ignores the 
-            group based permission model defined above for the "%WICDGROUP%"
-            group. Note that this only applies if you are using ConsoleKit -
-            if you do not have ConsoleKit installed and in use, then this
-            block makes no difference either way.  -->
+        <policy context="default">
+                <deny own="org.wicd.daemon"/>
+        </policy>
 
         <policy at_console="true">
                 <allow send_destination="org.wicd.daemon"/>
                 <allow send_interface="org.wicd.daemon"/>
-		<allow send_destination="org.wicd.daemon.wireless"/>
-		<allow send_interface="org.wicd.daemon.wireless"/>
-		<allow send_destination="org.wicd.daemon.wired"/>
-		<allow send_interface="org.wicd.daemon.wired"/>
-		<allow send_interface="org.freedesktop.DBus.Introspectable"/>
+                <allow send_destination="org.wicd.daemon.wireless"/>
+                <allow send_interface="org.wicd.daemon.wireless"/>
+                <allow send_destination="org.wicd.daemon.wired"/>
+                <allow send_interface="org.wicd.daemon.wired"/>
+                <allow send_interface="org.freedesktop.DBus.Introspectable"/>
         </policy>
 
 </busconfig>