chiark / gitweb /
systemctl: fix enable/disable reply handling
[elogind.git] / src / login / logind-dbus.c
index b1c2ef19b13da67d6f999857572625a219666d3e..a972d93774eb9946539e107a605ee5a6c5407c99 100644 (file)
@@ -568,11 +568,12 @@ static int method_create_session(sd_bus *bus, sd_bus_message *message, void *use
                         return -ENOMEM;
 
                 return sd_bus_reply_method_return(
-                                message, "soshsub",
+                                message, "soshusub",
                                 session->id,
                                 path,
                                 session->user->runtime_path,
                                 fifo_fd,
+                                (uint32_t) session->user->uid,
                                 session->seat ? session->seat->id : "",
                                 (uint32_t) session->vtnr,
                                 true);
@@ -1855,7 +1856,7 @@ const sd_bus_vtable manager_vtable[] = {
         SD_BUS_METHOD("ListUsers", NULL, "a(uso)", method_list_users, 0),
         SD_BUS_METHOD("ListSeats", NULL, "a(so)", method_list_seats, 0),
         SD_BUS_METHOD("ListInhibitors", NULL, "a(ssssuu)", method_list_inhibitors, 0),
-        SD_BUS_METHOD("CreateSession", "uussssussbssa(sv)", "soshsub", method_create_session, 0),
+        SD_BUS_METHOD("CreateSession", "uussssussbssa(sv)", "soshusub", method_create_session, 0),
         SD_BUS_METHOD("ReleaseSession", "s", NULL, method_release_session, 0),
         SD_BUS_METHOD("ActivateSession", "s", NULL, method_activate_session, 0),
         SD_BUS_METHOD("ActivateSessionOnSeat", "ss", NULL, method_activate_session_on_seat, 0),
@@ -2216,6 +2217,10 @@ int manager_start_scope(
         if (r < 0)
                 return r;
 
+        r = sd_bus_message_append(m, "a(sa(sv))", 0);
+        if (r < 0)
+                return r;
+
         r = sd_bus_call(manager->bus, m, 0, error, &reply);
         if (r < 0)
                 return r;