summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-05-21 21:24:55 +0200
committerLennart Poettering <lennart@poettering.net>2015-05-21 21:24:55 +0200
commitb860a90ea5afd2da57225195c1cb7edd64a8b73d (patch)
tree3d2108da7f816479c6dd5cdf66cd5a4471d45ae2
parent5ba7a26847846322740c02b9b469f42ea4c3f105 (diff)
downloadsystemd-b860a90ea5afd2da57225195c1cb7edd64a8b73d.tar.gz
bus-proxy: fix GetConnectionSELinuxSecurityContext() return value
-rw-r--r--src/bus-proxyd/driver.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c
index 90ddd735dc..4ac955da41 100644
--- a/src/bus-proxyd/driver.c
+++ b/src/bus-proxyd/driver.c
@@ -280,6 +280,7 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli
return synthetic_driver_send(m->bus, reply);
} else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "GetConnectionSELinuxSecurityContext")) {
+ _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
_cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
@@ -293,7 +294,15 @@ int bus_proxy_process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m, SharedPoli
if (!(creds->mask & SD_BUS_CREDS_SELINUX_CONTEXT))
return synthetic_reply_method_errno(m, -EOPNOTSUPP, NULL);
- return synthetic_reply_method_return(m, "y", creds->label, strlen(creds->label));
+ r = sd_bus_message_new_method_return(m, &reply);
+ if (r < 0)
+ return synthetic_reply_method_errno(m, r, NULL);
+
+ r = sd_bus_message_append_array(reply, 'y', creds->label, strlen(creds->label));
+ if (r < 0)
+ return synthetic_reply_method_errno(m, r, NULL);
+
+ return synthetic_driver_send(m->bus, reply);
} else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "GetConnectionUnixProcessID")) {
_cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;