chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
logind: fix session-device dbus notify
[elogind.git]
/
src
/
core
/
manager.c
diff --git
a/src/core/manager.c
b/src/core/manager.c
index bc57e4a1fd31ce1a14293ec5fc770d4afb92b38c..58dacdc8b5d7e894d909eb5cc60e66a3018ae75f 100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-2665,14
+2665,16
@@
void manager_undo_generators(Manager *m) {
}
int manager_environment_add(Manager *m, char **environment) {
-
char **e = NULL;
assert(m);
+
e = strv_env_merge(2, m->environment, environment);
if (!e)
return -ENOMEM;
+
strv_free(m->environment);
m->environment = e;
+
return 0;
}