X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Fbus-creds.c;h=3da77cf1d708bbcdf75623c1bd6d906f65aa5e23;hb=d2e7b05f248a03dc528f4a270dac2ac3ff3e605a;hp=52e55fc5e134cf320b7011be7f9e5d87d94d9a4a;hpb=607553f9306286fdccf0b356bc3d1087adfe21c4;p=elogind.git diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c index 52e55fc5e..3da77cf1d 100644 --- a/src/libsystemd/sd-bus/bus-creds.c +++ b/src/libsystemd/sd-bus/bus-creds.c @@ -30,6 +30,7 @@ #include "time-util.h" #include "strv.h" #include "bus-creds.h" +#include "bus-label.h" enum { CAP_OFFSET_INHERITABLE = 0, @@ -48,6 +49,7 @@ void bus_creds_done(sd_bus_creds *c) { free(c->unit); free(c->user_unit); free(c->slice); + free(c->unescaped_conn_name); strv_free(c->cmdline_array); strv_free(c->well_known_names); @@ -92,6 +94,7 @@ _public_ sd_bus_creds *sd_bus_creds_unref(sd_bus_creds *c) { free(c->label); free(c->unique_name); free(c->cgroup_root); + free(c->conn_name); free(c); } } else { @@ -123,7 +126,7 @@ sd_bus_creds* bus_creds_new(void) { return c; } -_public_ int sd_bus_creds_new_from_pid(pid_t pid, uint64_t mask, sd_bus_creds **ret) { +_public_ int sd_bus_creds_new_from_pid(sd_bus_creds **ret, pid_t pid, uint64_t mask) { sd_bus_creds *c; int r; @@ -146,7 +149,7 @@ _public_ int sd_bus_creds_new_from_pid(pid_t pid, uint64_t mask, sd_bus_creds ** /* Check if the process existed at all, in case we haven't * figured that out already */ - if (kill(pid, 0) < 0 && errno == ESRCH) { + if (!pid_is_alive(pid)) { sd_bus_creds_unref(c); return -ESRCH; } @@ -462,6 +465,25 @@ _public_ int sd_bus_creds_get_well_known_names(sd_bus_creds *c, char ***well_kno return 0; } +_public_ int sd_bus_creds_get_connection_name(sd_bus_creds *c, const char **ret) { + assert_return(c, -EINVAL); + assert_return(ret, -EINVAL); + + if (!(c->mask & SD_BUS_CREDS_CONNECTION_NAME)) + return -ENODATA; + + assert(c->conn_name); + + if (!c->unescaped_conn_name) { + c->unescaped_conn_name = bus_label_unescape(c->conn_name); + if (!c->unescaped_conn_name) + return -ENOMEM; + } + + *ret = c->unescaped_conn_name; + return 0; +} + static int has_cap(sd_bus_creds *c, unsigned offset, int capability) { size_t sz;