[systemd-commits] 2 commits - TODO src/bus-proxyd

[Lennart Poettering]

 TODO                        |    2 +-
 src/bus-proxyd/bus-proxyd.c |   15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit aa575ef8dec6fe74c9fdf27960125dd214511202
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jan 22 19:10:49 2014 +0100

    bus: temporarily disable faking of seclabels, as this is broken in kdbus right now

diff --git a/TODO b/TODO
index e5318d7..0999c90 100644
--- a/TODO
+++ b/TODO
@@ -152,7 +152,6 @@ Features:
   - implement monitor logic
   - see if we can drop more message validation on the sending side
   - add API to clone sd_bus_message objects
-  - SD_BUS_COMMENT() macro for inclusion in vtables, syntax inspired by gdbus
   - systemd-bus-proxyd needs to enforce good old XML policy
   - upload minimal kdbus policy into the kernel at boot
   - kdbus: matches against source or destination pids for an "strace -p"-like feel. Problem: The PID info needs to be available in userspace too...
@@ -170,6 +169,7 @@ Features:
   - bus proxy: override unique id sender for messages from driver to match the well-known name
   - bus driver: GetNameOwner() for "org.freedesktop.DBus" should return "org.freedesktop.DBus"
   - update systemd.special(7) to mention that dbus.socket is only about the compatibility socket now
+  - bus proxy should fake seclabel when connecting to kdbus
 
 * sd-event
   - allow multiple signal handlers per signal?
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index b038459..ca2a2ab 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -465,10 +465,11 @@ int main(int argc, char *argv[]) {
                 a->fake_creds_valid = true;
         }
 
-        if (peersec) {
-                a->fake_label = peersec;
-                peersec = NULL;
-        }
+        /* FIXME: faking security labels is broken in kdbus right now */
+        /* if (peersec) { */
+        /*         a->fake_label = peersec; */
+        /*         peersec = NULL; */
+        /* } */
 
         a->manual_peer_interface = true;
 

commit 44b0ed05865e0aa900471a5e822dbd1b4e840053
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jan 22 19:08:22 2014 +0100

    bus: set debug name of proxy bus connections

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index d085598..b038459 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -440,6 +440,12 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        r = sd_bus_set_name(a, "sd-proxy");
+        if (r < 0) {
+                log_error("Failed to set bus name: %s", strerror(-r));
+                goto finish;
+        }
+
         r = sd_bus_set_address(a, arg_address);
         if (r < 0) {
                 log_error("Failed to set address to connect to: %s", strerror(-r));