chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: set up a kdbus namespace when starting a container
[elogind.git]
/
src
/
libsystemd-bus
/
bus-match.c
diff --git
a/src/libsystemd-bus/bus-match.c
b/src/libsystemd-bus/bus-match.c
index 61b8a5cd8878570b034b52b8df33b97e8d33e89a..f7fca5f573de962ec250927bff15a84d648b6a3a 100644
(file)
--- a/
src/libsystemd-bus/bus-match.c
+++ b/
src/libsystemd-bus/bus-match.c
@@
-22,6
+22,8
@@
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-match.h"
#include "bus-internal.h"
#include "bus-message.h"
#include "bus-match.h"
+#include "bus-error.h"
+#include "bus-util.h"
/* Example:
*
/* Example:
*
@@
-272,7
+274,10
@@
int bus_match_run(
/* Run the callback. And then invoke siblings. */
if (node->leaf.callback) {
/* Run the callback. And then invoke siblings. */
if (node->leaf.callback) {
- r = node->leaf.callback(bus, m, node->leaf.userdata);
+ _cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
+
+ r = node->leaf.callback(bus, m, node->leaf.userdata, &error_buffer);
+ r = bus_maybe_reply_error(m, r, &error_buffer);
if (r != 0)
return r;
}
if (r != 0)
return r;
}