[systemd-commits] src/libsystemd-bus

Kay Sievers kay at kemper.freedesktop.org
Sat Nov 30 11:41:31 PST 2013


 src/libsystemd-bus/bus-control.c |    5 -----
 src/libsystemd-bus/kdbus.h       |    1 -
 2 files changed, 6 deletions(-)

New commits:
commit 98a4025806f478fc791b6bcf2ad4764c2e43b168
Author: Kay Sievers <kay at vrfy.org>
Date:   Sat Nov 30 20:41:02 2013 +0100

    bus: catch up with kdbus

diff --git a/src/libsystemd-bus/bus-control.c b/src/libsystemd-bus/bus-control.c
index 9e815a6..0fc2b1a 100644
--- a/src/libsystemd-bus/bus-control.c
+++ b/src/libsystemd-bus/bus-control.c
@@ -426,11 +426,6 @@ static int bus_get_owner_kdbus(
         }
 
         cmd->size = size;
-
-        r = kdbus_translate_attach_flags(mask, (uint64_t*) &cmd->attach_flags);
-        if (r < 0)
-                return r;
-
         r = ioctl(bus->input_fd, KDBUS_CMD_NAME_INFO, cmd);
         if (r < 0)
                 return -errno;
diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h
index 23d3c13..838a087 100644
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd-bus/kdbus.h
@@ -368,7 +368,6 @@ struct kdbus_name_list {
 struct kdbus_cmd_name_info {
 	__u64 size;
 	__u64 flags;			/* query flags */
-	__u64 attach_flags;		/* which meta data payload to attach */
 	__u64 id;			/* either ID, or 0 and name follows */
 	__u64 offset;			/* returned offset in the caller's buffer */
 	char name[0];



More information about the systemd-commits mailing list