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-util: turn on exit-on-disconnect for all command line tools
[elogind.git]
/
src
/
shared
/
bus-util.c
diff --git
a/src/shared/bus-util.c
b/src/shared/bus-util.c
index 4f1b68f6ea17e69f2a54623bdbdc3fbbe46ace8d..c8b070b53b8b9e8885cce2e5ef5c75fa192f3aa2 100644
(file)
--- a/
src/shared/bus-util.c
+++ b/
src/shared/bus-util.c
@@
-1236,12
+1236,13
@@
int bus_map_all_properties(
return bus_message_map_all_properties(m, map, userdata);
}
return bus_message_map_all_properties(m, map, userdata);
}
-int bus_connect_transport(BusTransport transport, const char *host, bool user, sd_bus **bus) {
+int bus_connect_transport(BusTransport transport, const char *host, bool user, sd_bus **ret) {
+ _cleanup_(sd_bus_unrefp) sd_bus *bus = NULL;
int r;
assert(transport >= 0);
assert(transport < _BUS_TRANSPORT_MAX);
int r;
assert(transport >= 0);
assert(transport < _BUS_TRANSPORT_MAX);
- assert(
bus
);
+ assert(
ret
);
assert_return((transport == BUS_TRANSPORT_LOCAL) == !host, -EINVAL);
assert_return(transport == BUS_TRANSPORT_LOCAL || !user, -EOPNOTSUPP);
assert_return((transport == BUS_TRANSPORT_LOCAL) == !host, -EINVAL);
assert_return(transport == BUS_TRANSPORT_LOCAL || !user, -EOPNOTSUPP);
@@
-1251,26
+1252,35
@@
int bus_connect_transport(BusTransport transport, const char *host, bool user, s
case BUS_TRANSPORT_LOCAL:
#if 0 /// elogind does not support a user bus
if (user)
case BUS_TRANSPORT_LOCAL:
#if 0 /// elogind does not support a user bus
if (user)
- r = sd_bus_default_user(bus);
+ r = sd_bus_default_user(
&
bus);
else
#endif // 0
else
#endif // 0
- r = sd_bus_default_system(bus);
+ r = sd_bus_default_system(
&
bus);
break;
case BUS_TRANSPORT_REMOTE:
break;
case BUS_TRANSPORT_REMOTE:
- r = sd_bus_open_system_remote(bus, host);
+ r = sd_bus_open_system_remote(
&
bus, host);
break;
case BUS_TRANSPORT_MACHINE:
break;
case BUS_TRANSPORT_MACHINE:
- r = sd_bus_open_system_machine(bus, host);
+ r = sd_bus_open_system_machine(
&
bus, host);
break;
default:
assert_not_reached("Hmm, unknown transport type.");
}
break;
default:
assert_not_reached("Hmm, unknown transport type.");
}
+ if (r < 0)
+ return r;
- return r;
+ r = sd_bus_set_exit_on_disconnect(bus, true);
+ if (r < 0)
+ return r;
+
+ *ret = bus;
+ bus = NULL;
+
+ return 0;
}
#if 0 /// UNNEEDED by elogind
}
#if 0 /// UNNEEDED by elogind