From: Kay Sievers <kay@vrfy.org>
Date: Sat, 8 Mar 2014 18:38:06 +0000 (+0100)
Subject: units: remove "AllowUser=root own", the bus owner can always own names
X-Git-Tag: v211~52
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d5ce683c0780c02cf657be4f5cff506edf913f0a

units: remove "AllowUser=root own", the bus owner can always own names
---

diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
index 6cfa8915c..b3dedb77c 100644
--- a/src/dbus1-generator/dbus1-generator.c
+++ b/src/dbus1-generator/dbus1-generator.c
@@ -128,7 +128,6 @@ static int create_dbus_files(
                 "[BusName]\n"
                 "Name=%s\n"
                 "Service=%s\n"
-                "AllowUser=root own\n"
                 "AllowWorld=talk\n",
                 path,
                 name,
diff --git a/units/org.freedesktop.DBus.busname b/units/org.freedesktop.DBus.busname
index cab389b13..1ce75b72b 100644
--- a/units/org.freedesktop.DBus.busname
+++ b/units/org.freedesktop.DBus.busname
@@ -10,5 +10,4 @@ Description=Bus Driver Service Bus Name
 
 [BusName]
 Service=systemd-bus-driverd.service
-AllowUser=root own
 AllowWorld=talk
diff --git a/units/org.freedesktop.hostname1.busname b/units/org.freedesktop.hostname1.busname
index a1b58b5b9..d64c36486 100644
--- a/units/org.freedesktop.hostname1.busname
+++ b/units/org.freedesktop.hostname1.busname
@@ -12,5 +12,4 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/hostnamed
 
 [BusName]
 Service=systemd-hostnamed.service
-AllowUser=root own
 AllowWorld=talk
diff --git a/units/org.freedesktop.locale1.busname b/units/org.freedesktop.locale1.busname
index a2c361a79..3cd201180 100644
--- a/units/org.freedesktop.locale1.busname
+++ b/units/org.freedesktop.locale1.busname
@@ -12,5 +12,4 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/localed
 
 [BusName]
 Service=systemd-localed.service
-AllowUser=root own
 AllowWorld=talk
diff --git a/units/org.freedesktop.login1.busname b/units/org.freedesktop.login1.busname
index d7f597ff8..d0686b17e 100644
--- a/units/org.freedesktop.login1.busname
+++ b/units/org.freedesktop.login1.busname
@@ -13,5 +13,4 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/multiseat
 
 [BusName]
 Service=systemd-logind.service
-AllowUser=root own
 AllowWorld=talk
diff --git a/units/org.freedesktop.machine1.busname b/units/org.freedesktop.machine1.busname
index 0a2241a57..7df8e9e73 100644
--- a/units/org.freedesktop.machine1.busname
+++ b/units/org.freedesktop.machine1.busname
@@ -12,5 +12,4 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/machined
 
 [BusName]
 Service=systemd-machined.service
-AllowUser=root own
 AllowWorld=talk
diff --git a/units/org.freedesktop.timedate1.busname b/units/org.freedesktop.timedate1.busname
index 21ae7b93c..eae4e536b 100644
--- a/units/org.freedesktop.timedate1.busname
+++ b/units/org.freedesktop.timedate1.busname
@@ -12,5 +12,4 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/timedated
 
 [BusName]
 Service=systemd-timedated.service
-AllowUser=root own
 AllowWorld=talk