Prep v321.2: Fix org.freedesktop.login1 where named org.freedesktop.elogind

diff --git a/src/libelogind/sd-bus/bus-introspect.c b/src/libelogind/sd-bus/bus-introspect.c
index f71130044d66d9e6cf0fe9af5919d1c5ee4bf6aa..d4b9878b17ab50cd4b1fa7b2d6b539347e671b95 100644 (file)
--- a/src/libelogind/sd-bus/bus-introspect.c
+++ b/src/libelogind/sd-bus/bus-introspect.c
@@ -83,7 +83,7 @@ static void introspect_write_flags(struct introspect *i, int type, int flags) {
 
         if (type == _SD_BUS_VTABLE_PROPERTY || type == _SD_BUS_VTABLE_WRITABLE_PROPERTY) {
                 if (flags & SD_BUS_VTABLE_PROPERTY_EXPLICIT)
-                        fputs("   <annotation name=\"org.freedesktop.elogind.Explicit\" value=\"true\"/>\n", i->f);
+                        fputs("   <annotation name=\"org.freedesktop.login1.Explicit\" value=\"true\"/>\n", i->f);
 
                 if (flags & SD_BUS_VTABLE_PROPERTY_CONST)
                         fputs("   <annotation name=\"org.freedesktop.DBus.Property.EmitsChangedSignal\" value=\"const\"/>\n", i->f);
@@ -96,7 +96,7 @@ static void introspect_write_flags(struct introspect *i, int type, int flags) {
         if (!i->trusted &&
             (type == _SD_BUS_VTABLE_METHOD || type == _SD_BUS_VTABLE_WRITABLE_PROPERTY) &&
             !(flags & SD_BUS_VTABLE_UNPRIVILEGED))
-                fputs("   <annotation name=\"org.freedesktop.elogind.Privileged\" value=\"true\"/>\n", i->f);
+                fputs("   <annotation name=\"org.freedesktop.login1.Privileged\" value=\"true\"/>\n", i->f);
 }
 
 static int introspect_write_arguments(struct introspect *i, const char *signature, const char *direction) {

diff --git a/src/login/elogind.c b/src/login/elogind.c
index de12c8119e2008c1a72e864f096363e076529789..5ff9ed7f2139c73c3b8e06b5f2fdc32a53949a71 100644 (file)
--- a/src/login/elogind.c
+++ b/src/login/elogind.c
@@ -42,7 +42,7 @@ static int signal_agent_released(sd_bus_message *message, void *userdata, sd_bus
         assert(message);
         assert(m);
 
-        /* only accept org.freedesktop.elogind.Agent from UID=0 */
+        /* only accept org.freedesktop.login1.Agent from UID=0 */
         r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_EUID, &creds);
         if (r < 0)
                 return r;
@@ -77,9 +77,9 @@ void elogind_bus_setup_system(Manager* m) {
                                 m->bus,
                                 NULL,
                                 "type='signal',"
-                                "interface='org.freedesktop.elogind.Agent',"
+                                "interface='org.freedesktop.login1.Agent',"
                                 "member='Released',"
-                                "path='/org/freedesktop/elogind/agent'",
+                                "path='/org/freedesktop.login1/agent'",
                                 signal_agent_released, m);
                 if (r < 0)
                         log_warning_errno(r, "Failed to register Released match on system bus: %m");