diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-08-20 14:48:04 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-08-20 14:48:04 +0000 |
| commit | d0c588575e3e2911eacb098fac26f02d1010cbfd (patch) | |
| tree | ae33b122f0e28611117ad1d8f90c2611c3f99041 /dbus | |
| parent | 68a3c593b9e77b33614726363c7b6fd85d113021 (diff) | |
2003-08-19 Havoc Pennington <hp@pobox.com>
* dbus/dbus-message.c (decode_string_field): support FIELD_SENDER
(dbus_message_is_error): fix this function
* bus/dbus-daemon-1.1: clarify logic on when <deny>/<allow> rules
match
* bus/policy.c (bus_client_policy_check_can_receive): fix code to
reflect clarified man page
(bus_client_policy_check_can_send): ditto
* bus/session.conf.in: fixup
* bus/system.conf.in: fixup
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-message.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index c062c934..9b87c3d9 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -4155,7 +4155,7 @@ dbus_message_is_error (DBusMessage *message, if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_ERROR) return FALSE; - n = dbus_message_get_member (message); + n = dbus_message_get_error_name (message); if (n && strcmp (n, error_name) == 0) return TRUE; @@ -4529,7 +4529,8 @@ decode_string_field (const DBusString *data, return FALSE; } } - else if (field == FIELD_SERVICE) + else if (field == FIELD_SERVICE || + field == FIELD_SENDER) { if (!_dbus_string_validate_service (&tmp, 0, _dbus_string_get_length (&tmp))) { @@ -4537,7 +4538,7 @@ decode_string_field (const DBusString *data, field_name, _dbus_string_get_const_data (&tmp)); return FALSE; } - } + } else { _dbus_assert_not_reached ("Unknown field\n"); |