diff options
| author | Havoc Pennington <hp@redhat.com> | 2007-06-14 20:59:16 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2007-06-14 20:59:16 +0000 |
| commit | 48c6f1472dc315c9572cb1aebf8c7b68a66f5bef (patch) | |
| tree | 75c1b5a65141ac5a69ee11cf1d6354b5211bc45d /dbus/dbus-sysdeps.h | |
| parent | 323790705782bee0d54ea9a342718a49b4ee5be6 (diff) | |
2007-06-14 Havoc Pennington <hp@redhat.com>
* dbus/dbus-auth.c: adapt to keyring changes
* dbus/dbus-keyring.c: change to avoid using user ID and home
directory directly; instead use a
keyring-location-from-credentials function in dbus-sysdeps
* fix to use _dbus_append_user_from_current_process() instead of
_dbus_username_from_current_process() or _dbus_append_desired_identity().
Diffstat (limited to 'dbus/dbus-sysdeps.h')
| -rw-r--r-- | dbus/dbus-sysdeps.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index 0cb92c61..aebf50c6 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -165,15 +165,10 @@ dbus_bool_t _dbus_send_credentials_socket (int server_fd, dbus_bool_t _dbus_credentials_add_from_username (DBusCredentials *credentials, const DBusString *username); dbus_bool_t _dbus_credentials_add_from_current_process (DBusCredentials *credentials); -dbus_bool_t _dbus_credentials_parse_and_add_desired (DBusCredentials *credentials, +dbus_bool_t _dbus_credentials_parse_and_add_user (DBusCredentials *credentials, const DBusString *desired_identity); +dbus_bool_t _dbus_append_user_from_current_process (DBusString *str); -dbus_bool_t _dbus_username_from_current_process (const DBusString **username); -dbus_bool_t _dbus_append_desired_identity (DBusString *str); - -dbus_bool_t _dbus_homedir_from_current_process (const DBusString **homedir); -dbus_bool_t _dbus_homedir_from_username (const DBusString *username, - DBusString *homedir); dbus_bool_t _dbus_parse_unix_user_from_config (const DBusString *username, dbus_uid_t *uid_p); dbus_bool_t _dbus_parse_unix_group_from_config (const DBusString *groupname, @@ -186,6 +181,8 @@ dbus_bool_t _dbus_unix_user_is_at_console (dbus_uid_t uid, dbus_bool_t _dbus_unix_user_is_process_owner (dbus_uid_t uid); dbus_bool_t _dbus_windows_user_is_process_owner (const char *windows_sid); +dbus_bool_t _dbus_append_keyring_directory_for_credentials (DBusString *directory, + DBusCredentials *credentials); /** Opaque type representing an atomically-modifiable integer * that can be used from multiple threads. |