From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Nov 2013 23:49:44 +0000 (+0100)
Subject: machinectl: close bus to container early
X-Git-Tag: v209~1523
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a6c616024db23fef34152c1432892824a07799cc

machinectl: close bus to container early
---

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 4b8351c98..a1890aa85 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -226,7 +226,7 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) {
 }
 
 static int show_info(const char *verb, sd_bus *bus, const char *path, bool *new_line) {
-        MachineStatusInfo info = {};
+
         static const struct bus_properties_map map[]  = {
                 { "Name",          "s",  NULL,          offsetof(MachineStatusInfo, name) },
                 { "Class",         "s",  NULL,          offsetof(MachineStatusInfo, class) },
@@ -238,6 +238,8 @@ static int show_info(const char *verb, sd_bus *bus, const char *path, bool *new_
                 { "Id",            "ay", bus_map_id128, offsetof(MachineStatusInfo, id) },
                 {}
         };
+
+        MachineStatusInfo info = {};
         int r;
 
         assert(path);
@@ -603,6 +605,8 @@ static int login_machine(sd_bus *bus, char **args, unsigned n) {
                 return r;
         }
 
+        container_bus = sd_bus_unref(container_bus);
+
         assert_se(sigemptyset(&mask) == 0);
         sigset_add_many(&mask, SIGWINCH, SIGTERM, SIGINT, -1);
         assert_se(sigprocmask(SIG_BLOCK, &mask, NULL) == 0);