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: always talk to the full dbus driver object
[elogind.git]
/
src
/
libsystemd-bus
/
bus-control.c
diff --git
a/src/libsystemd-bus/bus-control.c
b/src/libsystemd-bus/bus-control.c
index f08d78a7891d1a40dbef1abe4247ce952d80d4ac..a38ce0cb600b40f8f64360b0c083deb7e594c68a 100644
(file)
--- a/
src/libsystemd-bus/bus-control.c
+++ b/
src/libsystemd-bus/bus-control.c
@@
-96,7
+96,7
@@
static int bus_request_name_dbus1(sd_bus *bus, const char *name, uint64_t flags)
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
- "/",
+ "/
org/freedesktop/DBus
",
"org.freedesktop.DBus",
"RequestName",
NULL,
"org.freedesktop.DBus",
"RequestName",
NULL,
@@
-173,7
+173,7
@@
static int bus_release_name_dbus1(sd_bus *bus, const char *name) {
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
- "/",
+ "/
org/freedesktop/DBus
",
"org.freedesktop.DBus",
"ReleaseName",
NULL,
"org.freedesktop.DBus",
"ReleaseName",
NULL,
@@
-295,7
+295,7
@@
static int bus_list_names_dbus1(sd_bus *bus, char ***acquired, char ***activatab
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
- "/",
+ "/
org/freedesktop/DBus
",
"org.freedesktop.DBus",
"ListNames",
NULL,
"org.freedesktop.DBus",
"ListNames",
NULL,
@@
-315,7
+315,7
@@
static int bus_list_names_dbus1(sd_bus *bus, char ***acquired, char ***activatab
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
- "/",
+ "/
org/freedesktop/DBus
",
"org.freedesktop.DBus",
"ListActivatableNames",
NULL,
"org.freedesktop.DBus",
"ListActivatableNames",
NULL,
@@
-565,7
+565,7
@@
static int bus_get_owner_dbus1(
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
- "/",
+ "/
org/freedesktop/DBus
",
"org.freedesktop.DBus",
"GetNameOwner",
NULL,
"org.freedesktop.DBus",
"GetNameOwner",
NULL,
@@
-603,7
+603,7
@@
static int bus_get_owner_dbus1(
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
- "/",
+ "/
org/freedesktop/DBus
",
"org.freedesktop.DBus",
"GetConnectionUnixProcessID",
NULL,
"org.freedesktop.DBus",
"GetConnectionUnixProcessID",
NULL,
@@
-632,7
+632,7
@@
static int bus_get_owner_dbus1(
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
- "/",
+ "/
org/freedesktop/DBus
",
"org.freedesktop.DBus",
"GetConnectionUnixUser",
NULL,
"org.freedesktop.DBus",
"GetConnectionUnixUser",
NULL,
@@
-659,7
+659,7
@@
static int bus_get_owner_dbus1(
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
r = sd_bus_call_method(
bus,
"org.freedesktop.DBus",
- "/",
+ "/
org/freedesktop/DBus
",
"org.freedesktop.DBus",
"GetConnectionSELinuxSecurityContext",
NULL,
"org.freedesktop.DBus",
"GetConnectionSELinuxSecurityContext",
NULL,
@@
-803,7
+803,7
@@
static int add_name_change_match(sd_bus *bus,
item->name_change.new.id = new_owner_id;
if (name)
item->name_change.new.id = new_owner_id;
if (name)
-
strcpy(item->name_change.name, name
);
+
memcpy(item->name_change.name, name, l
);
/* If the old name is unset or empty, then
* this can match against added names */
/* If the old name is unset or empty, then
* this can match against added names */
@@
-854,7
+854,9
@@
static int add_name_change_match(sd_bus *bus,
m->cookie = cookie;
item = m->items;
m->cookie = cookie;
item = m->items;
- item->size = offsetof(struct kdbus_item, id_change) + sizeof(struct kdbus_notify_id_change);
+ item->size =
+ offsetof(struct kdbus_item, id_change) +
+ sizeof(struct kdbus_notify_id_change);
item->id_change.id = name_id;
/* If the old name is unset or empty, then this can
item->id_change.id = name_id;
/* If the old name is unset or empty, then this can
@@
-1071,7
+1073,7
@@
static int bus_add_match_internal_dbus1(
return sd_bus_call_method(
bus,
"org.freedesktop.DBus",
return sd_bus_call_method(
bus,
"org.freedesktop.DBus",
- "/",
+ "/
org/freedesktop/DBus
",
"org.freedesktop.DBus",
"AddMatch",
NULL,
"org.freedesktop.DBus",
"AddMatch",
NULL,
@@
-1128,7
+1130,7
@@
static int bus_remove_match_internal_dbus1(
return sd_bus_call_method(
bus,
"org.freedesktop.DBus",
return sd_bus_call_method(
bus,
"org.freedesktop.DBus",
- "/",
+ "/
org/freedesktop/DBus
",
"org.freedesktop.DBus",
"RemoveMatch",
NULL,
"org.freedesktop.DBus",
"RemoveMatch",
NULL,