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-keyring.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-keyring.h')
| -rw-r--r-- | dbus/dbus-keyring.h | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/dbus/dbus-keyring.h b/dbus/dbus-keyring.h index 5df0f793..d93d2b90 100644 --- a/dbus/dbus-keyring.h +++ b/dbus/dbus-keyring.h @@ -26,24 +26,26 @@ #include <dbus/dbus-macros.h> #include <dbus/dbus-errors.h> #include <dbus/dbus-string.h> +#include <dbus/dbus-credentials.h> DBUS_BEGIN_DECLS typedef struct DBusKeyring DBusKeyring; -DBusKeyring* _dbus_keyring_new_homedir (const DBusString *username, - const DBusString *context, - DBusError *error); -DBusKeyring* _dbus_keyring_ref (DBusKeyring *keyring); -void _dbus_keyring_unref (DBusKeyring *keyring); -dbus_bool_t _dbus_keyring_validate_context (const DBusString *context); -int _dbus_keyring_get_best_key (DBusKeyring *keyring, - DBusError *error); -dbus_bool_t _dbus_keyring_is_for_user (DBusKeyring *keyring, - const DBusString *username); -dbus_bool_t _dbus_keyring_get_hex_key (DBusKeyring *keyring, - int key_id, - DBusString *hex_key); +DBusKeyring* _dbus_keyring_new_for_credentials (DBusCredentials *credentials, + const DBusString *context, + DBusError *error); +DBusKeyring* _dbus_keyring_ref (DBusKeyring *keyring); +void _dbus_keyring_unref (DBusKeyring *keyring); +dbus_bool_t _dbus_keyring_validate_context (const DBusString *context); +int _dbus_keyring_get_best_key (DBusKeyring *keyring, + DBusError *error); +dbus_bool_t _dbus_keyring_is_for_credentials (DBusKeyring *keyring, + DBusCredentials *credentials); +dbus_bool_t _dbus_keyring_get_hex_key (DBusKeyring *keyring, + int key_id, + DBusString *hex_key); + DBUS_END_DECLS |