diff options
author | Havoc Pennington <hp@redhat.com> | 2007-06-12 18:53:32 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2007-06-12 18:53:32 +0000 |
commit | 1680f1fb403db648c1a9ebc45873df44dcfde6ef (patch) | |
tree | 9258e379e2af6c690c132119aec461925aa7fbb4 | |
parent | 94125e89b6be74cb20100d5321a98aa6529187a9 (diff) |
2007-06-12 Havoc Pennington <hp@redhat.com>
* dbus/dbus-marshal-recursive.c (write_or_verify_typecode):
improve the warning a bit if you write extra data into a message
-rw-r--r-- | ChangeLog | 18 | ||||
-rw-r--r-- | dbus/dbus-marshal-recursive.c | 8 |
2 files changed, 24 insertions, 2 deletions
@@ -1,3 +1,21 @@ +2007-06-12 Havoc Pennington <hp@redhat.com> + + * dbus/dbus-marshal-recursive.c (write_or_verify_typecode): + improve the warning a bit if you write extra data into a message + +2007-06-12 Havoc Pennington <hp@redhat.com> + + * dbus/dbus-auth.c (sha1_handle_second_client_response) + (handle_server_data_anonymous_mech): add the process ID from + socket credentials, if available, even if not using EXTERNAL + + * dbus/dbus-transport.c (auth_via_default_rules): support + allow_anonymous flag + + * dbus/dbus-connection.c (dbus_connection_get_is_anonymous) + (dbus_connection_set_allow_anonymous): new API for controlling + anonymous access + 2007-06-09 Havoc Pennington <hp@redhat.com> * dbus/dbus-string.c (_dbus_string_pop_line): fix this not to diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c index d47d200b..b16f4ea5 100644 --- a/dbus/dbus-marshal-recursive.c +++ b/dbus/dbus-marshal-recursive.c @@ -1702,8 +1702,12 @@ write_or_verify_typecode (DBusTypeWriter *writer, if (expected != typecode) { - _dbus_warn_check_failed ("Array or variant type requires that type %s be written, but %s was written\n", - _dbus_type_to_string (expected), _dbus_type_to_string (typecode)); + if (expected != DBUS_TYPE_INVALID) + _dbus_warn_check_failed ("Array or variant type requires that type %s be written, but %s was written\n", + _dbus_type_to_string (expected), _dbus_type_to_string (typecode)); + else + _dbus_warn_check_failed ("Array or variant type wasn't expecting any more values to be written into it, but a value %s was written\n", + _dbus_type_to_string (typecode)); _dbus_assert_not_reached ("bad type inserted somewhere inside an array or variant"); } } |