From 652a324fb6a1030b3525f8395bf5bc05ab50d3d7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 2 Feb 2015 18:15:27 +0000 Subject: bus_context_log_and_set_error: add and use Bug: https://bugs.freedesktop.org/show_bug.cgi?id=88810 Reviewed-by: Philip Withnall --- bus/driver.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) (limited to 'bus/driver.c') diff --git a/bus/driver.c b/bus/driver.c index 21d4a0a9..6e8a6dac 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -106,14 +106,8 @@ bus_driver_check_caller_is_privileged (DBusConnection *connection, { const char *method = dbus_message_get_member (message); - /* Yes this repetition is pretty horrible, but there's no - * bus_context_log_valist() or dbus_set_error_valist() or - * bus_context_log_literal() or dbus_set_error_literal(). - */ - bus_context_log (bus_transaction_get_context (transaction), - DBUS_SYSTEM_LOG_SECURITY, - "rejected attempt to call %s by unknown uid", method); - dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED, + bus_context_log_and_set_error (bus_transaction_get_context (transaction), + DBUS_SYSTEM_LOG_SECURITY, error, DBUS_ERROR_ACCESS_DENIED, "rejected attempt to call %s by unknown uid", method); return FALSE; } @@ -133,10 +127,8 @@ bus_driver_check_caller_is_privileged (DBusConnection *connection, { const char *method = dbus_message_get_member (message); - bus_context_log (bus_transaction_get_context (transaction), - DBUS_SYSTEM_LOG_SECURITY, - "rejected attempt to call %s by uid %lu", method, uid); - dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED, + bus_context_log_and_set_error (bus_transaction_get_context (transaction), + DBUS_SYSTEM_LOG_SECURITY, error, DBUS_ERROR_ACCESS_DENIED, "rejected attempt to call %s by uid %lu", method, uid); return FALSE; } @@ -150,10 +142,8 @@ bus_driver_check_caller_is_privileged (DBusConnection *connection, { const char *method = dbus_message_get_member (message); - bus_context_log (bus_transaction_get_context (transaction), - DBUS_SYSTEM_LOG_SECURITY, - "rejected attempt to call %s by unknown uid", method); - dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED, + bus_context_log_and_set_error (bus_transaction_get_context (transaction), + DBUS_SYSTEM_LOG_SECURITY, error, DBUS_ERROR_ACCESS_DENIED, "rejected attempt to call %s by unknown uid", method); goto out; } @@ -162,10 +152,8 @@ bus_driver_check_caller_is_privileged (DBusConnection *connection, { const char *method = dbus_message_get_member (message); - bus_context_log (bus_transaction_get_context (transaction), - DBUS_SYSTEM_LOG_SECURITY, - "rejected attempt to call %s by uid %s", method, windows_sid); - dbus_set_error (error, DBUS_ERROR_ACCESS_DENIED, + bus_context_log_and_set_error (bus_transaction_get_context (transaction), + DBUS_SYSTEM_LOG_SECURITY, error, DBUS_ERROR_ACCESS_DENIED, "rejected attempt to call %s by uid %s", method, windows_sid); goto out; } -- cgit v1.2.1