[systemd-commits] 2 commits - src/libsystemd-bus

[Kay Sievers]

 src/libsystemd-bus/bus-creds.c  |    2 +-
 src/libsystemd-bus/bus-kernel.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 76037baee04c262f5d02a9c43ec9110c82196f36
Author: Kay Sievers <kay at vrfy.org>
Date:   Fri Nov 29 11:52:22 2013 +0100

    bus: creds - ignore EINVAL when acessing the (inactive) LSM /proc interface

diff --git a/src/libsystemd-bus/bus-creds.c b/src/libsystemd-bus/bus-creds.c
index 5ca70cc..454aeff 100644
--- a/src/libsystemd-bus/bus-creds.c
+++ b/src/libsystemd-bus/bus-creds.c
@@ -599,7 +599,7 @@ int bus_creds_add_more(sd_bus_creds *c, uint64_t mask, pid_t pid, pid_t tid) {
 
                 p = procfs_file_alloca(pid, "attr/current");
                 r = read_one_line_file(p, &c->label);
-                if (r < 0 && r != -ENOENT)
+                if (r < 0 && r != -ENOENT && r != -EINVAL)
                         return r;
                 else if (r >= 0)
                         c->mask |= SD_BUS_CREDS_SELINUX_CONTEXT;

commit 27df44a2c6344da89885dfabac611e5df77b620e
Author: Lukasz Skalski <l.skalski at partner.samsung.com>
Date:   Fri Nov 29 11:37:10 2013 +0100

    bus: Add KDBUS_MSG_SRC_NAMES to bus_kernel_make_message() function

diff --git a/src/libsystemd-bus/bus-kernel.c b/src/libsystemd-bus/bus-kernel.c
index 84d84df..f2b130b 100644
--- a/src/libsystemd-bus/bus-kernel.c
+++ b/src/libsystemd-bus/bus-kernel.c
@@ -593,7 +593,8 @@ static int bus_kernel_make_message(sd_bus *bus, struct kdbus_msg *k, sd_bus_mess
                 } else if (d->type == KDBUS_MSG_DST_NAME)
                         destination = d->str;
                 else if (d->type != KDBUS_MSG_FDS &&
-                           d->type != KDBUS_MSG_SRC_SECLABEL)
+                           d->type != KDBUS_MSG_SRC_SECLABEL &&
+                             d->type != KDBUS_MSG_SRC_NAMES)
                         log_debug("Got unknown field from kernel %llu", d->type);
         }