projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e16f425
)
manager: log on two OOM occasions
author
Lennart Poettering
<lennart@poettering.net>
Mon, 19 Nov 2018 11:22:56 +0000
(12:22 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 19 Nov 2018 11:22:56 +0000
(12:22 +0100)
src/core/manager.c
patch
|
blob
|
history
diff --git
a/src/core/manager.c
b/src/core/manager.c
index
14be386
..
eba4bf3
100644
(file)
--- a/
src/core/manager.c
+++ b/
src/core/manager.c
@@
-623,7
+623,7
@@
static int manager_default_environment(Manager *m) {
m->transient_environment = strv_copy(environ);
if (!m->transient_environment)
- return
-ENOMEM
;
+ return
log_oom()
;
sanitize_environment(m->transient_environment);
@@
-3875,7
+3875,7
@@
int manager_transient_environment_add(Manager *m, char **plus) {
a = strv_env_merge(2, m->transient_environment, plus);
if (!a)
- return
-ENOMEM
;
+ return
log_oom()
;
sanitize_environment(a);