chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: sync kdbus.h (ABI break)
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-container.c
diff --git
a/src/libsystemd/sd-bus/bus-container.c
b/src/libsystemd/sd-bus/bus-container.c
index 2cd0e1f99ed017ef54db34ba87c9027d32f21199..dd4bf1512e1f58b05a35da3c6d118b231d4a5d54 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-container.c
+++ b/
src/libsystemd/sd-bus/bus-container.c
@@
-42,7
+42,7
@@
int bus_container_connect_socket(sd_bus *b) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = namespace_open(leader, &pidnsfd, &mntnsfd, &rootfd);
+ r = namespace_open(leader, &pidnsfd, &mntnsfd,
NULL,
&rootfd);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-61,7
+61,7
@@
int bus_container_connect_socket(sd_bus *b) {
if (child == 0) {
pid_t grandchild;
if (child == 0) {
pid_t grandchild;
- r = namespace_enter(pidnsfd, mntnsfd, rootfd);
+ r = namespace_enter(pidnsfd, mntnsfd,
-1,
rootfd);
if (r < 0)
_exit(255);
if (r < 0)
_exit(255);
@@
-116,7
+116,7
@@
int bus_container_connect_socket(sd_bus *b) {
}
int bus_container_connect_kernel(sd_bus *b) {
}
int bus_container_connect_kernel(sd_bus *b) {
- _cleanup_close_p
ipe
_ int pair[2] = { -1, -1 };
+ _cleanup_close_p
air
_ int pair[2] = { -1, -1 };
_cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
union {
struct cmsghdr cmsghdr;
_cleanup_close_ int pidnsfd = -1, mntnsfd = -1, rootfd = -1;
union {
struct cmsghdr cmsghdr;
@@
-140,7
+140,7
@@
int bus_container_connect_kernel(sd_bus *b) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = namespace_open(leader, &pidnsfd, &mntnsfd, &rootfd);
+ r = namespace_open(leader, &pidnsfd, &mntnsfd,
NULL,
&rootfd);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-156,7
+156,7
@@
int bus_container_connect_kernel(sd_bus *b) {
pair[0] = safe_close(pair[0]);
pair[0] = safe_close(pair[0]);
- r = namespace_enter(pidnsfd, mntnsfd, rootfd);
+ r = namespace_enter(pidnsfd, mntnsfd,
-1,
rootfd);
if (r < 0)
_exit(EXIT_FAILURE);
if (r < 0)
_exit(EXIT_FAILURE);