shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-25 21:57:32 +03:00
Code

bus: the :no-sender hack is now unnecessary, since the new library doesn't require this anymore

Browse Source
This commit is contained in:
Lennart Poettering 2013-11-21 02:17:24 +01:00
parent 5a3eb5a77d
commit 51b4ea6f48
4 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -88,8 +88,6 @@ Features:
* be more careful what we export on the bus as (usec_t) 0 and (usec_t) -1
* check :no-sender logic after PID 1 conversion
* increase journal files by a few MB each time, instead of piecemeal
* add field to transient units that indicate whether systemd or somebody else saves/restores its settings, for integration with libvirt

11
src/libsystemd-bus/bus-internal.c
View File

@ -166,17 +166,6 @@ bool service_name_is_valid(const char *p) {
return true;
}
bool sender_name_is_valid(const char *p) {
if (isempty(p))
return false;
/* FIXME: remove after PID 1 bus conversion */
if (streq(p, ":no-sender"))
return true;
return service_name_is_valid(p);
}
bool member_name_is_valid(const char *p) {
const char *q;

1
src/libsystemd-bus/bus-internal.h
View File

@ -274,7 +274,6 @@ struct sd_bus {
bool interface_name_is_valid(const char *p);
bool service_name_is_valid(const char *p);
bool sender_name_is_valid(const char *p);
bool member_name_is_valid(const char *p);
bool object_path_is_valid(const char *p);
char *object_path_startswith(const char *a, const char *b);

4
src/libsystemd-bus/bus-message.c
View File

@ -4020,7 +4020,7 @@ int bus_message_parse_fields(sd_bus_message *m) {
if (!streq(signature, "s"))
return -EBADMSG;
r = message_peek_field_string(m, sender_name_is_valid, &ri, &m->destination);
r = message_peek_field_string(m, service_name_is_valid, &ri, &m->destination);
break;
case SD_BUS_MESSAGE_HEADER_SENDER:
@ -4031,7 +4031,7 @@ int bus_message_parse_fields(sd_bus_message *m) {
if (!streq(signature, "s"))
return -EBADMSG;
r = message_peek_field_string(m, sender_name_is_valid, &ri, &m->sender);
r = message_peek_field_string(m, service_name_is_valid, &ri, &m->sender);
break;