chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: always pass valid timeout to kdbus
[elogind.git]
/
src
/
libsystemd-bus
/
bus-message.c
diff --git
a/src/libsystemd-bus/bus-message.c
b/src/libsystemd-bus/bus-message.c
index 0f19ee238ada80b3be29556d16ebeae902fdcd9d..a86cd9a19677a23b7c97df077395574b656cd6ab 100644
(file)
--- 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;
}
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;
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;
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
/* Add padding at the end of the fields part, since we know
* the body needs to start at an 8 byte alignment. We made