X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-convenience.c;h=3964960fab150616a8998c940fdf945675bf172d;hp=e765ddb21d47f925ee924cdd0481c3f1866c8eed;hb=65dae17a2f890b12a07dd4901b3db02b1031c463;hpb=780896a4f1ec7e36c8f72c866ba9693d790f9741

diff --git a/src/libsystemd-bus/bus-convenience.c b/src/libsystemd-bus/bus-convenience.c
index e765ddb21..3964960fa 100644
--- a/src/libsystemd-bus/bus-convenience.c
+++ b/src/libsystemd-bus/bus-convenience.c
@@ -103,7 +103,7 @@ _public_ int sd_bus_reply_method_return(
         assert_return(call->bus && BUS_IS_OPEN(call->bus->state), -ENOTCONN);
         assert_return(!bus_pid_changed(call->bus), -ECHILD);
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+        if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
                 return 0;
 
         r = sd_bus_message_new_method_return(call, &m);
@@ -137,7 +137,7 @@ _public_ int sd_bus_reply_method_error(
         assert_return(call->bus && BUS_IS_OPEN(call->bus->state), -ENOTCONN);
         assert_return(!bus_pid_changed(call->bus), -ECHILD);
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+        if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
                 return 0;
 
         r = sd_bus_message_new_method_error(call, e, &m);
@@ -162,7 +162,7 @@ _public_ int sd_bus_reply_method_errorf(
         assert_return(call->bus && BUS_IS_OPEN(call->bus->state), -ENOTCONN);
         assert_return(!bus_pid_changed(call->bus), -ECHILD);
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+        if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
                 return 0;
 
         va_start(ap, format);
@@ -185,7 +185,7 @@ _public_ int sd_bus_reply_method_errno(
         assert_return(call->bus && BUS_IS_OPEN(call->bus->state), -ENOTCONN);
         assert_return(!bus_pid_changed(call->bus), -ECHILD);
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+        if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
                 return 0;
 
         if (sd_bus_error_is_set(p))
@@ -211,7 +211,7 @@ _public_ int sd_bus_reply_method_errnof(
         assert_return(call->bus && BUS_IS_OPEN(call->bus->state), -ENOTCONN);
         assert_return(!bus_pid_changed(call->bus), -ECHILD);
 
-        if (call->header->flags & SD_BUS_MESSAGE_NO_REPLY_EXPECTED)
+        if (call->header->flags & BUS_MESSAGE_NO_REPLY_EXPECTED)
                 return 0;
 
         va_start(ap, format);
@@ -410,3 +410,33 @@ _public_ int sd_bus_set_property(
 
         return sd_bus_call(bus, m, 0, error, NULL);
 }
+
+_public_ int sd_bus_query_sender_creds(sd_bus_message *call, uint64_t mask, sd_bus_creds **creds) {
+        sd_bus_creds *c;
+
+        assert_return(call, -EINVAL);
+        assert_return(call->sealed, -EPERM);
+        assert_return(call->bus && BUS_IS_OPEN(call->bus->state), -ENOTCONN);
+        assert_return(!bus_pid_changed(call->bus), -ECHILD);
+
+        c = sd_bus_message_get_creds(call);
+
+        /* All data we need? */
+        if (c && (mask & ~c->mask) == 0) {
+                *creds = sd_bus_creds_ref(c);
+                return 0;
+        }
+
+        /* No data passed? Or not enough data passed to retrieve the missing bits? */
+        if (!c || !(c->mask & SD_BUS_CREDS_PID)) {
+                /* We couldn't read anything from the call, let's try
+                 * to get it from the sender or peer */
+
+                if (call->sender)
+                        return sd_bus_get_owner(call->bus, call->sender, mask, creds);
+                else
+                        return sd_bus_get_peer_creds(call->bus, mask, creds);
+        }
+
+        return bus_creds_extend_by_pid(c, mask, creds);
+}