From: kremlin <ian@kremlin.cc>
Date: Tue, 22 Jul 2014 02:18:42 +0000 (-0500)
Subject: cut out cruft in dbus confs
X-Git-Tag: gsoc-final~72
X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=commitdiff_plain;h=e464995c2beea674236454f029c9049220fe9a8e;hp=15d5f24827ccb89f0dceb6e98bb4edf64462a7d9

cut out cruft in dbus confs
---

diff --git a/conf/hostnamed-dbus.conf b/conf/hostnamed-dbus.conf
index 46b4aad..ea11b9d 100644
--- a/conf/hostnamed-dbus.conf
+++ b/conf/hostnamed-dbus.conf
@@ -1,27 +1,14 @@
-<?xml version="1.0"?> <!--*-nxml-*-->
+<?xml version="1.0"?> 
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
         "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<!--
-  This file is part of systemd.
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
--->
-
 <busconfig>
-
         <policy user="root">
                 <allow own="org.freedesktop.hostname1"/>
                 <allow send_destination="org.freedesktop.hostname1"/>
                 <allow receive_sender="org.freedesktop.hostname1"/>
         </policy>
-
         <policy context="default">
                 <allow send_destination="org.freedesktop.hostname1"/>
                 <allow receive_sender="org.freedesktop.hostname1"/>
         </policy>
-
 </busconfig>
diff --git a/conf/localed-dbus.conf b/conf/localed-dbus.conf
index 79d0ecd..b7d8edd 100644
--- a/conf/localed-dbus.conf
+++ b/conf/localed-dbus.conf
@@ -1,27 +1,14 @@
-<?xml version="1.0"?> <!--*-nxml-*-->
+<?xml version="1.0"?> 
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
         "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<!--
-  This file is part of systemd.
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
--->
-
 <busconfig>
-
         <policy user="root">
                 <allow own="org.freedesktop.locale1"/>
                 <allow send_destination="org.freedesktop.locale1"/>
                 <allow receive_sender="org.freedesktop.locale1"/>
         </policy>
-
         <policy context="default">
                 <allow send_destination="org.freedesktop.locale1"/>
                 <allow receive_sender="org.freedesktop.locale1"/>
         </policy>
-
 </busconfig>
diff --git a/conf/logind-dbus.conf b/conf/logind-dbus.conf
index 1318328..c420ba4 100644
--- a/conf/logind-dbus.conf
+++ b/conf/logind-dbus.conf
@@ -1,186 +1,132 @@
-<?xml version="1.0"?> <!--*-nxml-*-->
+<?xml version="1.0"?>
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
         "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<!--
-  This file is part of systemd.
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
--->
-
 <busconfig>
-
         <policy user="root">
                 <allow own="org.freedesktop.login1"/>
                 <allow send_destination="org.freedesktop.login1"/>
                 <allow receive_sender="org.freedesktop.login1"/>
         </policy>
-
         <policy context="default">
                 <deny send_destination="org.freedesktop.login1"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.DBus.Introspectable"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.DBus.Peer"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.DBus.Properties"
                        send_member="Get"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.DBus.Properties"
                        send_member="GetAll"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="GetSession"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="GetSessionByPID"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="GetUser"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="GetUserByPID"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="GetSeat"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="ListSessions"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="ListUsers"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="ListSeats"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="ListInhibitors"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="Inhibit"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="SetUserLinger"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="ActivateSession"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="ActivateSessionOnSeat"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="PowerOff"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="Reboot"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="Suspend"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="Hibernate"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="HybridSleep"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="CanPowerOff"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="CanReboot"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="CanSuspend"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="CanHibernate"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="CanHybridSleep"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="AttachDevice"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Manager"
                        send_member="FlushDevices"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Seat"
                        send_member="ActivateSession"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Seat"
                        send_member="SwitchTo"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Seat"
                        send_member="SwitchToPrevious"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Seat"
                        send_member="SwitchToNext"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Session"
                        send_member="Activate"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Session"
                        send_member="SetIdleHint"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Session"
                        send_member="TakeControl"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Session"
                        send_member="ReleaseControl"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Session"
                        send_member="TakeDevice"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Session"
                        send_member="ReleaseDevice"/>
-
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Session"
                        send_member="PauseDeviceComplete"/>
-
                 <allow receive_sender="org.freedesktop.login1"/>
         </policy>
-
 </busconfig>
diff --git a/conf/timedated-dbus.conf b/conf/timedated-dbus.conf
index 36557d5..38d4109 100644
--- a/conf/timedated-dbus.conf
+++ b/conf/timedated-dbus.conf
@@ -1,27 +1,14 @@
-<?xml version="1.0"?> <!--*-nxml-*-->
+<?xml version="1.0"?> 
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
         "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<!--
-  This file is part of systemd.
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
--->
-
 <busconfig>
-
         <policy user="root">
                 <allow own="org.freedesktop.timedate1"/>
                 <allow send_destination="org.freedesktop.timedate1"/>
                 <allow receive_sender="org.freedesktop.timedate1"/>
         </policy>
-
         <policy context="default">
                 <allow send_destination="org.freedesktop.timedate1"/>
                 <allow receive_sender="org.freedesktop.timedate1"/>
         </policy>
-
 </busconfig>