diff options
Diffstat (limited to 'src/libsystemd-bus')
| -rw-r--r-- | src/libsystemd-bus/bus-internal.c | 11 | ||||
| -rw-r--r-- | src/libsystemd-bus/bus-internal.h | 1 | ||||
| -rw-r--r-- | src/libsystemd-bus/bus-message.c | 4 |
3 files changed, 2 insertions, 14 deletions
diff --git a/src/libsystemd-bus/bus-internal.c b/src/libsystemd-bus/bus-internal.c index 3fb1cf40f3..0bea8cac49 100644 --- a/src/libsystemd-bus/bus-internal.c +++ b/src/libsystemd-bus/bus-internal.c @@ -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; diff --git a/src/libsystemd-bus/bus-internal.h b/src/libsystemd-bus/bus-internal.h index a1d60b1133..4af5526b71 100644 --- a/src/libsystemd-bus/bus-internal.h +++ b/src/libsystemd-bus/bus-internal.h @@ -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); diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c index 4aa7dde05c..f698b2ee99 100644 --- a/src/libsystemd-bus/bus-message.c +++ b/src/libsystemd-bus/bus-message.c @@ -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; |