chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[3/5] Apply missing fixes from upstream
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-creds.c
diff --git
a/src/libelogind/sd-bus/bus-creds.c
b/src/libelogind/sd-bus/bus-creds.c
index 4fccae5034406c277273df513602a4f625a79e17..ed82df2534ea0106d85b7de81bf2add624117a2c 100644
(file)
--- a/
src/libelogind/sd-bus/bus-creds.c
+++ b/
src/libelogind/sd-bus/bus-creds.c
@@
-109,8
+109,7
@@
_public_ sd_bus_creds *sd_bus_creds_unref(sd_bus_creds *c) {
c->supplementary_gids = mfree(c->supplementary_gids);
c->supplementary_gids = mfree(c->supplementary_gids);
- strv_free(c->well_known_names);
- c->well_known_names = NULL;
+ c->well_known_names = strv_free(c->well_known_names);
bus_creds_done(c);
bus_creds_done(c);
@@
-1047,9
+1046,8
@@
int bus_creds_add_more(sd_bus_creds *c, uint64_t mask, pid_t pid, pid_t tid) {
if (r != -EPERM && r != -EACCES)
return r;
} else {
if (r != -EPERM && r != -EACCES)
return r;
} else {
- if (c->cmdline_size == 0)
{
+ if (c->cmdline_size == 0)
c->cmdline = mfree(c->cmdline);
c->cmdline = mfree(c->cmdline);
- }
c->mask |= SD_BUS_CREDS_CMDLINE;
}
c->mask |= SD_BUS_CREDS_CMDLINE;
}