summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2008-12-12 16:58:06 -0500
committerColin Walters <walters@verbum.org>2009-01-21 15:57:53 -0500
commitc42a14b936d7adb993b701cc6e3078cf75125c99 (patch)
treeac7010d75564f228b50330508bc1109f1c84169d
parent6ca4b8c6bb0a04574373073cc8b3f59eaf8740fa (diff)
downloaddbus-c42a14b936d7adb993b701cc6e3078cf75125c99.tar.gz
Add message type to security syslog entries
It's part of the security check, we should have it in the log.
-rw-r--r--bus/bus.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/bus/bus.c b/bus/bus.c
index 6e6ff38f..4a7b3d27 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -1339,11 +1339,12 @@ bus_context_check_security_policy (BusContext *context,
{
const char *dest;
const char *msg = "Rejected send message, %d matched rules; "
- "sender=\"%s\" interface=\"%s\" member=\"%s\" error name=\"%s\" destination=\"%s\")";
+ "type=\"%s\", sender=\"%s\" interface=\"%s\" member=\"%s\" error name=\"%s\" destination=\"%s\")";
dest = dbus_message_get_destination (message);
dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED, msg,
toggles,
+ dbus_message_type_to_string (dbus_message_get_type (message)),
sender_name ? sender_name : "(unset)",
dbus_message_get_interface (message) ?
dbus_message_get_interface (message) : "(unset)",
@@ -1355,6 +1356,7 @@ bus_context_check_security_policy (BusContext *context,
/* Needs to be duplicated to avoid calling malloc and having to handle OOM */
bus_context_log_security (context, msg,
toggles,
+ dbus_message_type_to_string (dbus_message_get_type (message)),
sender_name ? sender_name : "(unset)",
dbus_message_get_interface (message) ?
dbus_message_get_interface (message) : "(unset)",
@@ -1376,12 +1378,13 @@ bus_context_check_security_policy (BusContext *context,
message, &toggles))
{
const char *msg = "Rejected receive message, %d matched rules; "
- "sender=\"%s\" interface=\"%s\" member=\"%s\" error name=\"%s\" destination=\"%s\" reply serial=%u requested_reply=%d)";
+ "type=\"%s\" sender=\"%s\" interface=\"%s\" member=\"%s\" error name=\"%s\" destination=\"%s\" reply serial=%u requested_reply=%d)";
const char *dest;
dest = dbus_message_get_destination (message);
dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED, msg,
toggles,
+ dbus_message_type_to_string (dbus_message_get_type (message)),
sender_name ? sender_name : "(unset)",
dbus_message_get_interface (message) ?
dbus_message_get_interface (message) : "(unset)",
@@ -1395,6 +1398,7 @@ bus_context_check_security_policy (BusContext *context,
/* Needs to be duplicated to avoid calling malloc and having to handle OOM */
bus_context_log_security (context, msg,
toggles,
+ dbus_message_type_to_string (dbus_message_get_type (message)),
sender_name ? sender_name : "(unset)",
dbus_message_get_interface (message) ?
dbus_message_get_interface (message) : "(unset)",