chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
gpt-auto-generator: print debug messages when we ignore a block device
[elogind.git]
/
src
/
login
/
logind-user-dbus.c
diff --git
a/src/login/logind-user-dbus.c
b/src/login/logind-user-dbus.c
index 2d49b8b96ede5ec4d7ec5069a5a08dd11261fdf8..b5d27e74dea8b588e8d7643aba00098f51bd2e93 100644
(file)
--- 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;