From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 23 Apr 2013 02:27:38 +0000 (-0300)
Subject: bus: parse owner uid from cgroup path, too
X-Git-Tag: v203~113
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=bc7f3beb3090716d12406e2bfdba1df0e9d4b333

bus: parse owner uid from cgroup path, too
---

diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c
index 8134d77f3..f0de7a32f 100644
--- a/src/libsystemd-bus/bus-message.c
+++ b/src/libsystemd-bus/bus-message.c
@@ -861,6 +861,17 @@ int sd_bus_message_get_session(sd_bus_message *m, const char **ret) {
         return 0;
 }
 
+int sd_bus_message_get_owner_uid(sd_bus_message *m, uid_t *uid) {
+        if (!m)
+                return -EINVAL;
+        if (!uid)
+                return -EINVAL;
+        if (!m->cgroup)
+                return -ESRCH;
+
+        return cg_path_get_owner_uid(m->cgroup, uid);
+}
+
 int sd_bus_message_get_cmdline(sd_bus_message *m, char ***cmdline) {
         size_t n, i;
         const char *p;
@@ -3073,6 +3084,7 @@ int bus_message_dump(sd_bus_message *m) {
         char **cmdline = NULL;
         unsigned level = 1;
         int r;
+        uid_t owner;
 
         assert(m);
 
@@ -3149,6 +3161,8 @@ int bus_message_dump(sd_bus_message *m) {
         sd_bus_message_get_session(m, &s);
         if (s)
                 printf("\tsession=[%s]\n", s);
+        if (sd_bus_message_get_owner_uid(m, &owner) >= 0)
+                printf("\towner_uid=%lu\n", (unsigned long) owner);
 
         if (sd_bus_message_get_cmdline(m, &cmdline) >= 0) {
                 char **c;
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 1352acc90..92ae31b77 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -139,6 +139,7 @@ int sd_bus_message_get_cmdline(sd_bus_message *m, char ***cmdline);
 int sd_bus_message_get_unit(sd_bus_message *m, const char **unit);
 int sd_bus_message_get_user_unit(sd_bus_message *m, const char **unit);
 int sd_bus_message_get_session(sd_bus_message *m, const char **session);
+int sd_bus_message_get_owner_uid(sd_bus_message *m, uid_t *uid);
 
 int sd_bus_message_is_signal(sd_bus_message *m, const char *interface, const char *member);
 int sd_bus_message_is_method_call(sd_bus_message *m, const char *interface, const char *member);