From 6b40feaff4114ab3498ad06e13063fceff4d48e9 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 20 Feb 2003 03:43:18 +0000 Subject: 2003-02-19 Havoc Pennington * Doxyfile.in (PREDEFINED): put DOXYGEN_SHOULD_SKIP_THIS in Doxyfile.in, not Doxyfile * dbus/dbus-keyring.c: do some hacking on this * dbus/dbus-sysdeps.c (_dbus_delete_file): new * dbus/dbus-errors.c (dbus_set_error_const): do not call dbus_error_init (dbus_set_error): remove dbus_error_init, check for message == NULL *before* we sprintf into it, and add @todo about including system headers in this file * dbus/dbus-sysdeps.c (_dbus_create_file_exclusively): new * dbus/dbus-errors.h (DBUS_ERROR_FAILED): add * dbus/dbus-sysdeps.c (get_user_info): break this function out to get various bits of user information based on either username or user ID (_dbus_homedir_from_username): new function --- dbus/dbus-keyring.h | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'dbus/dbus-keyring.h') diff --git a/dbus/dbus-keyring.h b/dbus/dbus-keyring.h index c60c64ef..7ff4fdc4 100644 --- a/dbus/dbus-keyring.h +++ b/dbus/dbus-keyring.h @@ -30,19 +30,23 @@ DBUS_BEGIN_DECLS; typedef struct DBusKeyring DBusKeyring; - -DBusKeyring* _dbus_keyring_load (const char *context, - DBusResultCode *result); -void _dbus_keyring_ref (DBusKeyring *keyring); -void _dbus_keyring_unref (DBusKeyring *keyring); -dbus_bool_t _dbus_keyring_create_challenge (DBusKeyring *keyring, - DBusString *challenge); -dbus_bool_t _dbus_keyring_compute_response (DBusKeyring *keyring, - const DBusString *challenge, - DBusString *response); -dbus_bool_t _dbus_keyring_check_response (DBusKeyring *keyring, - const DBusString *challenge, - const DBusString *response); +DBusKeyring* _dbus_keyring_new_homedir (const DBusString *username, + const DBusString *context, + DBusError *error); +void _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_create_challenge (DBusString *challenge); +dbus_bool_t _dbus_keyring_compute_response (DBusKeyring *keyring, + int key_id, + const DBusString *challenge, + DBusString *response); +dbus_bool_t _dbus_keyring_check_response (DBusKeyring *keyring, + int key_id, + const DBusString *challenge, + const DBusString *response); DBUS_END_DECLS; -- cgit