diff options
author | Lennart Poettering <lennart@poettering.net> | 2013-12-12 20:00:19 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-12-12 20:00:45 +0100 |
commit | 3df7a7e610eece1362d0ab148f3d92b2c98277a1 (patch) | |
tree | fd9f85f460d001e838b334c70ca7847d1ac14edf /src/libsystemd-bus/bus-message.c | |
parent | 0f437184b687af58c5c4b2e3201a83d98485b0e4 (diff) |
bus: always pass valid timeout to kdbus
Diffstat (limited to 'src/libsystemd-bus/bus-message.c')
-rw-r--r-- | src/libsystemd-bus/bus-message.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c index 0f19ee238a..a86cd9a196 100644 --- a/src/libsystemd-bus/bus-message.c +++ b/src/libsystemd-bus/bus-message.c @@ -2695,7 +2695,7 @@ static int bus_message_close_header(sd_bus_message *m) { return 0; } -int bus_message_seal(sd_bus_message *m, uint64_t serial) { +int bus_message_seal(sd_bus_message *m, uint64_t serial, usec_t timeout) { struct bus_body_part *part; size_t l, a; unsigned i; @@ -2742,6 +2742,7 @@ int bus_message_seal(sd_bus_message *m, uint64_t serial) { return r; m->header->serial = serial; + m->timeout = m->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED ? 0 : timeout; /* Add padding at the end of the fields part, since we know * the body needs to start at an 8 byte alignment. We made |