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:
16fb773
)
core: check parsed bus msg in full before applying it
author
Lennart Poettering
<lennart@poettering.net>
Thu, 22 Oct 2015 00:02:17 +0000
(
02:02
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 22 Oct 2015 00:02:17 +0000
(
02:02
+0200)
src/core/dbus-execute.c
patch
|
blob
|
history
diff --git
a/src/core/dbus-execute.c
b/src/core/dbus-execute.c
index
6712b86
..
b8da66c
100644
(file)
--- a/
src/core/dbus-execute.c
+++ b/
src/core/dbus-execute.c
@@
-1173,7
+1173,6
@@
int bus_exec_context_set_transient_property(
unit_write_drop_in_private_format(u, mode, name, "Environment=%s\n", joined);
}
-
}
return 1;
@@
-1262,6
+1261,10
@@
int bus_exec_context_set_transient_property(
if (r < 0)
return r;
+ r = sd_bus_message_exit_container(message);
+ if (r < 0)
+ return r;
+
r = fflush_and_check(f);
if (r < 0)
return r;
@@
-1279,10
+1282,6
@@
int bus_exec_context_set_transient_property(
}
}
- r = sd_bus_message_exit_container(message);
- if (r < 0)
- return r;
-
return 1;
} else if (STR_IN_SET(name, "ReadWriteDirectories", "ReadOnlyDirectories", "InaccessibleDirectories")) {