diff options
| author | Kay Sievers <kay@vrfy.org> | 2013-05-13 05:56:31 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-05-13 05:56:31 +0200 |
| commit | c8150fa751ac4490583d1b2c8688a73edb7cd76c (patch) | |
| tree | e85c003c57a8963f486631aa9b6c4b7301814eb0 | |
| parent | 18cd014f13cb988037acc16f8150b8f6d7042cd5 (diff) | |
bus: update test-bus-memfd
| -rw-r--r-- | src/libsystemd-bus/kdbus.h | 1 | ||||
| -rw-r--r-- | src/libsystemd-bus/test-bus-memfd.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libsystemd-bus/kdbus.h b/src/libsystemd-bus/kdbus.h index 9dd28a71c2..20b804539b 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 3300470e0f..db199d46db 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); |