chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: trim cgroups when going down
[elogind.git]
/
src
/
dbus-common.c
diff --git
a/src/dbus-common.c
b/src/dbus-common.c
index 504eefbbb0b3e00fc6a917dd4de75fd413268839..11d989d7c34de57a7dd8a62b9f41ef205f5804ec 100644
(file)
--- a/
src/dbus-common.c
+++ b/
src/dbus-common.c
@@
-54,7
+54,7
@@
int bus_check_peercred(DBusConnection *c) {
return 1;
}
return 1;
}
-int bus_connect(DBusBusType t, DBusConnection **_bus, DBusError *error) {
+int bus_connect(DBusBusType t, DBusConnection **_bus,
bool *private,
DBusError *error) {
DBusConnection *bus;
assert(_bus);
DBusConnection *bus;
assert(_bus);
@@
-71,9
+71,16
@@
int bus_connect(DBusBusType t, DBusConnection **_bus, DBusError *error) {
dbus_set_error_const(error, DBUS_ERROR_ACCESS_DENIED, "Failed to verify owner of bus.");
return -EACCES;
}
dbus_set_error_const(error, DBUS_ERROR_ACCESS_DENIED, "Failed to verify owner of bus.");
return -EACCES;
}
+
+ if (private)
+ *private = true;
+
} else {
if (!(bus = dbus_bus_get(t, error)))
return -EIO;
} else {
if (!(bus = dbus_bus_get(t, error)))
return -EIO;
+
+ if (private)
+ *private = false;
}
dbus_connection_set_exit_on_disconnect(bus, FALSE);
}
dbus_connection_set_exit_on_disconnect(bus, FALSE);