From 323790705782bee0d54ea9a342718a49b4ee5be6 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 14 Jun 2007 20:08:48 +0000 Subject: * reverted global rename of function _dbus_username_from_current_process. It needs to much tests to verify that the change does not break anything. I had overseen that the signatures are different (** to *) which requires non trivial changes. This is one *major* disadvantage of elumating oop functionality with c. You are responsible for cleaning every object on every function return point, which could be a nightmare if you are not working with dbus all the days. --- dbus/dbus-auth.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'dbus/dbus-auth.c') diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c index 9651df74..e47f6e36 100644 --- a/dbus/dbus-auth.c +++ b/dbus/dbus-auth.c @@ -780,15 +780,15 @@ static dbus_bool_t handle_client_initial_response_cookie_sha1_mech (DBusAuth *auth, DBusString *response) { - const DBusString username; + const DBusString *username; dbus_bool_t retval; + retval = FALSE; - _dbus_string_init(&username); - if (!_dbus_append_desired_identity (&username)) + if (!_dbus_username_from_current_process (&username)) goto out_0; - if (!_dbus_string_hex_encode (&username, 0, + if (!_dbus_string_hex_encode (username, 0, response, _dbus_string_get_length (response))) goto out_0; @@ -796,7 +796,6 @@ handle_client_initial_response_cookie_sha1_mech (DBusAuth *auth, retval = TRUE; out_0: - _dbus_string_free(&username); return retval; } -- cgit