diff options
author | Cameron Nemo <camerontnorman@gmail.com> | 2018-10-23 18:02:25 -0700 |
---|---|---|
committer | Sven Eden <sven.eden@prydeworx.com> | 2018-11-08 08:02:57 +0100 |
commit | 18924a1e18b3c6159bf49a364e8bc339bb5175ae (patch) | |
tree | f9a478ddc6800f5731ae0ef749a77dc8a135ed39 /src/libelogind/sd-bus/sd-bus.c | |
parent | 3ab9309e18658e22c1322eef168871d26cd49fb3 (diff) |
sd-bus: enable support for user bus instances
Bug: #87
Closes: #87
Signed-off-by: Cameron Nemo <camerontnorman@gmail.com>
Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
Diffstat (limited to 'src/libelogind/sd-bus/sd-bus.c')
-rw-r--r-- | src/libelogind/sd-bus/sd-bus.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c index 2a490405e..0b325e44c 100644 --- a/src/libelogind/sd-bus/sd-bus.c +++ b/src/libelogind/sd-bus/sd-bus.c @@ -1203,19 +1203,15 @@ _public_ int sd_bus_open_with_description(sd_bus **ret, const char *description) if (e) { if (streq(e, "system")) return sd_bus_open_system_with_description(ret, description); -#if 0 /// elogind does not support systemd user instances else if (STR_IN_SET(e, "session", "user")) -#endif // 0 return sd_bus_open_user_with_description(ret, description); } e = secure_getenv("DBUS_STARTER_ADDRESS"); if (!e) { -#if 0 /// elogind does not support systemd user instances if (cg_pid_get_owner_uid(0, NULL) >= 0) return sd_bus_open_user_with_description(ret, description); else -#endif // 0 return sd_bus_open_system_with_description(ret, description); } @@ -1299,7 +1295,6 @@ _public_ int sd_bus_open_system(sd_bus **ret) { return sd_bus_open_system_with_description(ret, NULL); } -#if 0 /// elogind can not open/use a user bus int bus_set_address_user(sd_bus *b) { const char *e; _cleanup_free_ char *ee = NULL, *s = NULL; @@ -1325,10 +1320,8 @@ int bus_set_address_user(sd_bus *b) { return 0; } -#endif // 0 _public_ int sd_bus_open_user_with_description(sd_bus **ret, const char *description) { -#if 0 /// elogind does not support user buses _cleanup_(bus_freep) sd_bus *b = NULL; int r; @@ -1362,9 +1355,6 @@ _public_ int sd_bus_open_user_with_description(sd_bus **ret, const char *descrip *ret = TAKE_PTR(b); return 0; -#else - return sd_bus_open_system_with_description(ret, description); -#endif // 0 } _public_ int sd_bus_open_user(sd_bus **ret) { @@ -3276,8 +3266,6 @@ finish: return r; } -#if 0 /// UNNEEDED by elogind -#endif // 0 _public_ int sd_bus_add_match( sd_bus *bus, sd_bus_slot **slot, @@ -3651,11 +3639,7 @@ _public_ int sd_bus_default_system(sd_bus **ret) { } _public_ int sd_bus_default_user(sd_bus **ret) { -#if 0 /// elogind does not support user buses return bus_default(sd_bus_open_user, &default_user_bus, ret); -#else - return sd_bus_default_system(ret); -#endif // 0 } _public_ int sd_bus_default(sd_bus **ret) { @@ -4030,9 +4014,7 @@ static void flush_close(sd_bus *bus) { _public_ void sd_bus_default_flush_close(void) { flush_close(default_starter_bus); -#if 0 /// elogind does not support user buses flush_close(default_user_bus); -#endif // 0 flush_close(default_system_bus); } |