dbus/dbus dbus-marshal.c,1.45,1.46 dbus-message.c,1.111,1.112

[Havoc Pennington]

Update of /cvs/dbus/dbus/dbus
In directory pdx:/tmp/cvs-serv6152/dbus

Modified Files:
	dbus-marshal.c dbus-message.c 
Log Message:
2003-10-22  Havoc Pennington  <hp@redhat.com>

	* bus/bus.c (bus_context_check_security_policy): fix up assertion

	* bus/connection.c (bus_transaction_send_from_driver): set the
	destination to the connection's base service



Index: dbus-marshal.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-marshal.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- dbus-marshal.c	21 Oct 2003 05:46:51 -0000	1.45
+++ dbus-marshal.c	22 Oct 2003 16:01:08 -0000	1.46
@@ -1808,6 +1808,8 @@
 	*end_pos = pos + 1;
       return TRUE;
     }
+
+  _dbus_verbose ("'%c' %d invalid type code\n", (int) *data, (int) *data);
   
   return FALSE;
 }

Index: dbus-message.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-message.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- dbus-message.c	21 Oct 2003 05:46:51 -0000	1.111
+++ dbus-message.c	22 Oct 2003 16:01:08 -0000	1.112
@@ -4907,13 +4907,15 @@
 
       if (!_dbus_marshal_validate_type (data, pos, &type, &pos))
 	{
-          _dbus_verbose ("Failed to validate type of named header field\n");
+          _dbus_verbose ("Failed to validate type of named header field pos = %d\n",
+                         pos);
 	  return FALSE;
 	}
       
       if (!_dbus_marshal_validate_arg (data, byte_order, 0, type, -1, pos, &new_pos))
         {
-          _dbus_verbose ("Failed to validate argument to named header field\n");
+          _dbus_verbose ("Failed to validate argument to named header field pos = %d\n",
+                         pos);
           return FALSE;
         }
 
@@ -5180,8 +5182,8 @@
   message = NULL;
   oom = FALSE;
   
-#if 0
-  _dbus_verbose_bytes_of_string (&loader->data, 0, header_len + body_len);
+#if 1
+  _dbus_verbose_bytes_of_string (&loader->data, 0, header_len /* + body_len */);
 #endif	  
 
   if (!decode_header_data (&loader->data,