chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: fix bus_print_property with strv
[elogind.git]
/
src
/
libsystemd-bus
/
bus-container.c
diff --git
a/src/libsystemd-bus/bus-container.c
b/src/libsystemd-bus/bus-container.c
index 31bb624b34cd4dca37cac8c063d8fa8b7c222e86..25ea471a08475085d00b0c2166f554a02e429b18 100644
(file)
--- a/
src/libsystemd-bus/bus-container.c
+++ b/
src/libsystemd-bus/bus-container.c
@@
-72,7
+72,7
@@
int bus_container_connect(sd_bus *b) {
if (r < 0)
return -ENOMEM;
if (r < 0)
return -ENOMEM;
- rootfd = open(root, O_RDONLY|O_NOCTTY|O_CLOEXEC);
+ rootfd = open(root, O_RDONLY|O_NOCTTY|O_CLOEXEC
|O_DIRECTORY
);
if (rootfd < 0)
return -errno;
if (rootfd < 0)
return -errno;
@@
-101,7
+101,6
@@
int bus_container_connect(sd_bus *b) {
if (chroot(".") < 0)
_exit(255);
if (chroot(".") < 0)
_exit(255);
-
r = connect(b->input_fd, &b->sockaddr.sa, b->sockaddr_size);
if (r < 0) {
if (errno == EINPROGRESS)
r = connect(b->input_fd, &b->sockaddr.sa, b->sockaddr_size);
if (r < 0) {
if (errno == EINPROGRESS)