diff options
| author | Radoslaw Pajak <r.pajak@samsung.com> | 2013-11-07 11:24:39 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-02-11 11:55:09 +0100 |
| commit | ebfc410de55df8712c99064a71973049fc544f32 (patch) | |
| tree | 14f04e35dfb9a2f4cf7412e11a72c77ec8d1c466 /dbus | |
| parent | d9bb3c6b4b5d41a423a3c18546ac2eab4870a537 (diff) | |
[daemon-fix] fixed getting uid and pid when transport is not kdbus
Fixed getting uid and pid when damoen is compiled with kdbus transport, but sockets are used as transport.
Change-Id: I038920b03a352c44639d09284baa07f336dfd216
Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-connection.c | 14 | ||||
| -rw-r--r-- | dbus/dbus-connection.h | 8 |
2 files changed, 20 insertions, 2 deletions
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index cb6421cf..cc27c371 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -5259,7 +5259,6 @@ dbus_connection_get_socket(DBusConnection *connection, return retval; } -#ifndef ENABLE_KDBUS_TRANSPORT /** * Gets the UNIX user ID of the connection if known. Returns #TRUE if * the uid is filled in. Always returns #FALSE on non-UNIX platforms @@ -5282,9 +5281,15 @@ dbus_connection_get_socket(DBusConnection *connection, * @param uid return location for the user ID * @returns #TRUE if uid is filled in with a valid user ID */ +#ifdef ENABLE_KDBUS_TRANSPORT +dbus_bool_t +dbus_connection_get_unix_user_dbus (DBusConnection *connection, + unsigned long *uid) +#else dbus_bool_t dbus_connection_get_unix_user (DBusConnection *connection, unsigned long *uid) +#endif { dbus_bool_t result; @@ -5318,9 +5323,15 @@ dbus_connection_get_unix_user (DBusConnection *connection, * @param pid return location for the process ID * @returns #TRUE if uid is filled in with a valid process ID */ +#ifdef ENABLE_KDBUS_TRANSPORT +dbus_bool_t +dbus_connection_get_unix_process_id_dbus (DBusConnection *connection, + unsigned long *pid) +#else dbus_bool_t dbus_connection_get_unix_process_id (DBusConnection *connection, unsigned long *pid) +#endif { dbus_bool_t result; @@ -5339,7 +5350,6 @@ dbus_connection_get_unix_process_id (DBusConnection *connection, return result; } -#endif /** * Gets the ADT audit data of the connection if any. diff --git a/dbus/dbus-connection.h b/dbus/dbus-connection.h index faabc887..c83d4352 100644 --- a/dbus/dbus-connection.h +++ b/dbus/dbus-connection.h @@ -277,6 +277,14 @@ dbus_bool_t dbus_connection_get_unix_user (DBusConnection DBUS_EXPORT dbus_bool_t dbus_connection_get_unix_process_id (DBusConnection *connection, unsigned long *pid); +#ifdef ENABLE_KDBUS_TRANSPORT +DBUS_EXPORT +dbus_bool_t dbus_connection_get_unix_user_dbus (DBusConnection *connection, + unsigned long *uid); +DBUS_EXPORT +dbus_bool_t dbus_connection_get_unix_process_id_dbus (DBusConnection *connection, + unsigned long *pid); +#endif DBUS_EXPORT dbus_bool_t dbus_connection_get_adt_audit_session_data (DBusConnection *connection, void **data, |