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

diff --git a/ChangeLog b/ChangeLog
index 5806aee89749b8b7bff6866c9385aae70c710937..46d6dea56b6e3a24263bc082a1368652abfde6b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 d47d200b1d05c3fa9ba4c5247607d87af55af192..b16f4ea5a0c61bbcd1bfde321e509a753e6f1644 100644 (file)
--- 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");
           }
       }