diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-01-15 16:30:33 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-02-16 15:27:37 +0000 |
| commit | 953bc072a3335a7fb232790a2d323094ad4a0e13 (patch) | |
| tree | 9a4a3bfecd63b6ff51ff0cbf7278f394b84cd8c9 /bus/dispatch.c | |
| parent | c6b91129facf88d7b30540b0073973bbf7ca5bb4 (diff) | |
| download | dbus-953bc072a3335a7fb232790a2d323094ad4a0e13.tar.gz | |
DBusMessage: Add a header field for the container instance
In the bus daemon, don't pass through the container instance path:
if there's any value here at all, we want to be able to guarantee that
we sent it (in a later commit).
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101899
Diffstat (limited to 'bus/dispatch.c')
| -rw-r--r-- | bus/dispatch.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c index b16ad2b3..c3914a86 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -290,7 +290,8 @@ bus_dispatch (DBusConnection *connection, /* Make sure the message does not have any header fields that we * don't understand (or validate), so that we can add header fields * in future and clients can assume that we have checked them. */ - if (!_dbus_message_remove_unknown_fields (message)) + if (!_dbus_message_remove_unknown_fields (message) || + !dbus_message_set_container_instance (message, NULL)) { BUS_SET_OOM (&error); goto out; |