From 0b9caabf10688508385d4c02402d3ffd298f737a Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 7 Mar 2013 10:47:44 +0100 Subject: [PATCH 3/3] Make _dbus_credentials_add_pid() plattform independent. --- dbus/dbus-auth-script.c | 2 +- dbus/dbus-credentials-util.c | 2 +- dbus/dbus-credentials.c | 8 ++++---- dbus/dbus-credentials.h | 2 +- dbus/dbus-sysdeps-win.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c index 6285e3b..cbdd748 100644 --- a/dbus/dbus-auth-script.c +++ b/dbus/dbus-auth-script.c @@ -223,7 +223,7 @@ auth_set_unix_credentials(DBusAuth *auth, if (uid != DBUS_UID_UNSET) _dbus_credentials_add_unix_uid (credentials, uid); if (pid != DBUS_PID_UNSET) - _dbus_credentials_add_unix_pid (credentials, pid); + _dbus_credentials_add_pid (credentials, pid); _dbus_auth_set_credentials (auth, credentials); diff --git a/dbus/dbus-credentials-util.c b/dbus/dbus-credentials-util.c index 0277196..4a28a9a 100644 --- a/dbus/dbus-credentials-util.c +++ b/dbus/dbus-credentials-util.c @@ -58,7 +58,7 @@ make_credentials(dbus_uid_t unix_uid, if (unix_pid != DBUS_PID_UNSET) { - if (!_dbus_credentials_add_unix_pid (credentials, unix_pid)) + if (!_dbus_credentials_add_pid (credentials, unix_pid)) { _dbus_credentials_unref (credentials); return NULL; diff --git a/dbus/dbus-credentials.c b/dbus/dbus-credentials.c index ff69f3b..e37f678 100644 --- a/dbus/dbus-credentials.c +++ b/dbus/dbus-credentials.c @@ -139,15 +139,15 @@ _dbus_credentials_unref (DBusCredentials *credentials) } /** - * Add a UNIX process ID to the credentials. + * Add a UNIX or windows process ID to the credentials. * * @param credentials the object * @param pid the process ID * @returns #FALSE if no memory */ dbus_bool_t -_dbus_credentials_add_unix_pid (DBusCredentials *credentials, - dbus_pid_t pid) +_dbus_credentials_add_pid (DBusCredentials *credentials, + dbus_pid_t pid) { credentials->unix_pid = pid; return TRUE; @@ -412,7 +412,7 @@ _dbus_credentials_add_credential (DBusCredentials *credentials, if (which == DBUS_CREDENTIAL_UNIX_PROCESS_ID && other_credentials->unix_pid != DBUS_PID_UNSET) { - if (!_dbus_credentials_add_unix_pid (credentials, other_credentials->unix_pid)) + if (!_dbus_credentials_add_pid (credentials, other_credentials->unix_pid)) return FALSE; } else if (which == DBUS_CREDENTIAL_UNIX_USER_ID && diff --git a/dbus/dbus-credentials.h b/dbus/dbus-credentials.h index ef6124f..ccaec40 100644 --- a/dbus/dbus-credentials.h +++ b/dbus/dbus-credentials.h @@ -41,7 +41,7 @@ DBusCredentials* _dbus_credentials_new_from_current_process (void); DBusCredentials* _dbus_credentials_new (void); void _dbus_credentials_ref (DBusCredentials *credentials); void _dbus_credentials_unref (DBusCredentials *credentials); -dbus_bool_t _dbus_credentials_add_unix_pid (DBusCredentials *credentials, +dbus_bool_t _dbus_credentials_add_pid (DBusCredentials *credentials, dbus_pid_t pid); dbus_bool_t _dbus_credentials_add_unix_uid (DBusCredentials *credentials, dbus_uid_t uid); diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index c883560..db10a7b 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -1817,7 +1817,7 @@ _dbus_read_credentials_socket (int handle, if (pid == 0) return TRUE; - _dbus_credentials_add_unix_pid (credentials, pid); + _dbus_credentials_add_pid (credentials, pid); if (_dbus_getsid (&sid, pid)) { @@ -1928,7 +1928,7 @@ _dbus_credentials_add_from_current_process (DBusCredentials *credentials) if (!_dbus_getsid(&sid, _dbus_getpid())) goto failed; - if (!_dbus_credentials_add_unix_pid(credentials, _dbus_getpid())) + if (!_dbus_credentials_add_pid (credentials, _dbus_getpid())) goto failed; if (!_dbus_credentials_add_windows_sid (credentials,sid)) -- 1.7.4.msysgit.0