X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-user-dbus.c;h=b5d27e74dea8b588e8d7643aba00098f51bd2e93;hb=897e184c7d54156357fd204beafe06ab9bd0341a;hp=2d49b8b96ede5ec4d7ec5069a5a08dd11261fdf8;hpb=556089dc57b10a12a03edd3d3e90ca17398ad206;p=elogind.git

diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index 2d49b8b96..b5d27e74d 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -180,7 +180,7 @@ static int method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata
         assert(message);
         assert(u);
 
-        r = user_stop(u);
+        r = user_stop(u, true);
         if (r < 0)
                 return r;
 
@@ -315,11 +315,9 @@ int user_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***
                 if (!p)
                         return -ENOMEM;
 
-                r = strv_push(&l, p);
-                if (r < 0) {
-                        free(p);
+                r = strv_consume(&l, p);
+                if (r < 0)
                         return r;
-                }
         }
 
         *nodes = l;