[systemd-commits] src/libsystemd-bus

Kay Sievers kay at kemper.freedesktop.org
Sun May 12 20:56:58 PDT 2013


 src/libsystemd-bus/kdbus.h          |    1 +
 src/libsystemd-bus/test-bus-memfd.c |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c8150fa751ac4490583d1b2c8688a73edb7cd76c
Author: Kay Sievers <kay at vrfy.org>
Date:   Mon May 13 05:56:31 2013 +0200

    bus: update test-bus-memfd

diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h
index 9dd28a7..20b8045 100644
--- a/src/libsystemd-bus/kdbus.h
+++ b/src/libsystemd-bus/kdbus.h
@@ -138,6 +138,7 @@ struct kdbus_item {
 		struct kdbus_timestamp timestamp;
 
 		/* specific fields */
+		struct kdbus_memfd memfd;
 		int fds[0];
 		struct kdbus_manager_msg_name_change name_change;
 		struct kdbus_manager_msg_id_change id_change;
diff --git a/src/libsystemd-bus/test-bus-memfd.c b/src/libsystemd-bus/test-bus-memfd.c
index 3300470..db199d4 100644
--- a/src/libsystemd-bus/test-bus-memfd.c
+++ b/src/libsystemd-bus/test-bus-memfd.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[]) {
         strcpy(s, "----- world");
 
         r = sd_memfd_set_sealed(m, 1);
-        assert_se(r == -EPERM);
+        assert_se(r == -ETXTBSY);
 
         assert_se(write(sd_memfd_get_fd(m), "he", 2) == 2);
         assert_se(write(sd_memfd_get_fd(m), "XXX", 3) == 3);
@@ -116,7 +116,7 @@ int main(int argc, char *argv[]) {
 
         /* we cannot break the seal, it is mapped */
         r = sd_memfd_set_sealed(m, 0);
-        assert_se(r == -EPERM);
+        assert_se(r == -ETXTBSY);
 
         /* unmap it; become the single owner */
         assert_se(munmap(s, 12) == 0);



More information about the systemd-commits mailing list