2003-05-16 Havoc Pennington <hp@redhat.com>

	* dbus/dbus-connection.c: disable verbose lock spew

	* tools/dbus-send.c: add --print-reply command line option

	* tools/dbus-print-message.h (print_message): new util function
	shared by dbus-send and dbus-monitor

	* tools/dbus-monitor.c (handler_func): exit on disconnect

	* dbus/dbus-transport-unix.c (do_reading): if the transport is
	disconnected, don't try to use the read_watch

	* dbus/dbus-watch.c (dbus_watch_get_enabled): assert watch != NULL
	so we can find this bug more easily

1 files changed, 5 insertions, 1 deletions

diff --git a/bus/bus.c b/bus/bus.c
index 85d737da..e86243a6 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -970,6 +970,7 @@ bus_context_check_security_policy (BusContext     *context,
                       "had name \"%s\" destination \"%s\")",
                       dbus_message_get_name (message),
                       dest ? dest : DBUS_SERVICE_DBUS);
+      _dbus_verbose ("security policy disallowing message due to sender policy\n");
       return FALSE;
     }
 
@@ -986,6 +987,7 @@ bus_context_check_security_policy (BusContext     *context,
                       "had name \"%s\" destination \"%s\")",
                       dbus_message_get_name (message),
                       dest ? dest : DBUS_SERVICE_DBUS);
+      _dbus_verbose ("security policy disallowing message due to recipient policy\n");
       return FALSE;
     }
 
@@ -998,8 +1000,10 @@ bus_context_check_security_policy (BusContext     *context,
       dbus_set_error (error, DBUS_ERROR_LIMITS_EXCEEDED,
                       "The destination service \"%s\" has a full message queue",
                       dest ? dest : DBUS_SERVICE_DBUS);
+      _dbus_verbose ("security policy disallowing message due to full message queue\n");
       return FALSE;
     }
-  
+
+  _dbus_verbose ("security policy allowing message\n");
   return TRUE;
 }