diff options
-rw-r--r-- | bus/connection.c | 1 | ||||
-rw-r--r-- | bus/cynara.c | 2 | ||||
-rwxr-xr-x | dbus/dbus-transport-kdbus.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/bus/connection.c b/bus/connection.c index 1939da73..2173ce98 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -41,6 +41,7 @@ #ifdef DBUS_ENABLE_CYNARA #include <stdlib.h> #include <cynara-session.h> +#include <stdio.h> #endif /* Trim executed commands to this length; we want to keep logs readable */ diff --git a/bus/cynara.c b/bus/cynara.c index aa54bc0b..8d4d50a1 100644 --- a/bus/cynara.c +++ b/bus/cynara.c @@ -156,7 +156,7 @@ bus_cynara_check_privilege (BusCynara *cynara, if (dbus_connection_get_unix_user(connection, &uid) == FALSE) return BUS_RESULT_FALSE; - if (_dbus_connection_get_linux_security_label (connection, &label) == FALSE) + if (_dbus_connection_get_linux_security_label (connection, (char **)&label) == FALSE) return BUS_RESULT_FALSE; session_id = bus_connection_get_cynara_session_id (connection); diff --git a/dbus/dbus-transport-kdbus.c b/dbus/dbus-transport-kdbus.c index 73ebc45a..1a1806d7 100755 --- a/dbus/dbus-transport-kdbus.c +++ b/dbus/dbus-transport-kdbus.c @@ -3751,8 +3751,8 @@ do_reading (DBusTransport *transport) again: /* See if we've exceeded max messages and need to disable reading */ - if (kdbus_transport->activator == NULL) - check_read_watch (kdbus_transport); + if (kdbus_transport->activator == NULL) + check_read_watch (kdbus_transport); if (total > kdbus_transport->max_bytes_read_per_iteration) { |