summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2014-09-24 17:10:31 +0200
committerDaniel Mack <daniel@zonque.org>2014-11-11 14:14:01 +0100
commitac4eaf6dd4e314515f3595c2838b2da3231fa357 (patch)
tree8d38d9c54e920e28d5b2f5a9a41ddda93e36b52a /src
parent022fb8558e797483709ab3e9fe846f04f7026dac (diff)
bus-proxyd: keep track of names acquired by legacy client
Store names successfully acquired by the legacy client into a hashmap. We need to take these names into account when checking for send policies.
Diffstat (limited to 'src')
-rw-r--r--src/bus-proxyd/bus-proxyd.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 88346edeef..aaa79243cf 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -51,6 +51,8 @@ static char *arg_command_line_buffer = NULL;
static bool arg_drop_privileges = false;
static char **arg_configuration = NULL;
+static Hashmap *names_hash = NULL;
+
static int help(void) {
printf("%s [OPTIONS...]\n\n"
@@ -837,6 +839,8 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
return synthetic_reply_method_errno(m, r, NULL);
}
+ hashmap_remove(names_hash, name);
+
return synthetic_reply_method_return(m, "u", BUS_NAME_RELEASED);
} else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "ReloadConfig")) {
@@ -849,6 +853,7 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
} else if (sd_bus_message_is_method_call(m, "org.freedesktop.DBus", "RequestName")) {
const char *name;
uint32_t flags, param;
+ bool in_queue;
r = sd_bus_message_read(m, "su", &name, &flags);
if (r < 0)
@@ -876,7 +881,13 @@ static int process_driver(sd_bus *a, sd_bus *b, sd_bus_message *m) {
return synthetic_reply_method_errno(m, r, NULL);
}
- if (r == 0)
+ in_queue = (r == 0);
+
+ r = hashmap_put(names_hash, name, NULL);
+ if (r < 0)
+ return synthetic_reply_method_errno(m, r, NULL);
+
+ if (in_queue)
return synthetic_reply_method_return(m, "u", BUS_NAME_IN_QUEUE);
return synthetic_reply_method_return(m, "u", BUS_NAME_PRIMARY_OWNER);
@@ -1186,6 +1197,12 @@ int main(int argc, char *argv[]) {
goto finish;
}
+ names_hash = hashmap_new(&string_hash_ops);
+ if (!names_hash) {
+ log_oom();
+ goto finish;
+ }
+
r = sd_bus_new(&a);
if (r < 0) {
log_error("Failed to allocate bus: %s", strerror(-r));
@@ -1514,6 +1531,7 @@ finish:
policy_free(&policy);
strv_free(arg_configuration);
+ hashmap_free(names_hash);
free(arg_address);
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;