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

diff --git a/TODO b/TODO
index f10e7d7216fbd6048300e6d94ea8e7bd9a13a4f6..66f99a9ea83e63d4990d378ab0bcc538c040f7fe 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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

diff --git a/src/libsystemd-bus/bus-internal.c b/src/libsystemd-bus/bus-internal.c
index 3fb1cf40f35c72e863a1e52b470cc8b198c86643..0bea8cac498918b3e2f959ac07da4e8152c5558c 100644 (file)
--- 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 a1d60b113353cc79e4e765c9360faec8023a648a..4af5526b71dbb87585a026be26927c746f140b25 100644 (file)
--- 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 4aa7dde05c2a0ddabdbc76eb7fc82355c41d80d9..f698b2ee9989b537b11bd34d4eac116253917b20 100644 (file)
--- 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;