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: parse uid/gid/pid/tid meta data from kdbus messages
[elogind.git]
/
src
/
libsystemd-bus
/
bus-kernel.c
diff --git
a/src/libsystemd-bus/bus-kernel.c
b/src/libsystemd-bus/bus-kernel.c
index 712b697b0a8410d518e19342744be3eebb5282d3..83379d1430408f6807f53a90edb28b5a38174a61 100644
(file)
--- a/
src/libsystemd-bus/bus-kernel.c
+++ b/
src/libsystemd-bus/bus-kernel.c
@@
-224,6
+224,7
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess
_cleanup_free_ int *fds = NULL;
struct bus_header *h = NULL;
size_t total, n_bytes = 0, idx = 0;
_cleanup_free_ int *fds = NULL;
struct bus_header *h = NULL;
size_t total, n_bytes = 0, idx = 0;
+ struct kdbus_creds *creds = NULL;
int r;
assert(bus);
int r;
assert(bus);
@@
-262,7
+263,9
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess
fds = f;
memcpy(fds + n_fds, d->fds, j);
n_fds += j;
fds = f;
memcpy(fds + n_fds, d->fds, j);
n_fds += j;
- }
+
+ } else if (d->type == KDBUS_MSG_SRC_CREDS)
+ creds = &d->creds;
}
if (!h)
}
if (!h)
@@
-301,6
+304,14
@@
static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess
idx += l;
}
idx += l;
}
+ if (creds) {
+ m->uid = creds->uid;
+ m->gid = creds->gid;
+ m->pid = creds->pid;
+ m->tid = creds->tid;
+ m->uid_valid = m->gid_valid = true;
+ }
+
r = bus_message_parse_fields(m);
if (r < 0) {
sd_bus_message_unref(m);
r = bus_message_parse_fields(m);
if (r < 0) {
sd_bus_message_unref(m);