* dbus/dbus-auth.c (handle_client_initial_response_cookie_sha1_mech): fixed usage...

* dbus/dbus-sysdeps.h (_dbus_username_from_current_process): removed prototype

diff --git a/ChangeLog b/ChangeLog
index b22d6204c95815cc5ae28af9fa78cb04e62d2c8f..1ac3d8d1e3f9404963fed44eac5c9ce1f1f32ccc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,17 @@
+2007-06-14  Ralf Habacker  <ralf.habacker@freenet.de>
+    
+       * dbus/dbus-auth.c (handle_client_initial_response_cookie_sha1_mech): 
+       fixed usage of _dbus_append_desired_identity()
+
+       * dbus/dbus-sysdeps.h (_dbus_username_from_current_process): removed prototype
+
 2007-06-14  Ralf Habacker  <ralf.habacker@freenet.de>
     
        * dbus/dbus-sysdeps.c: moved global lock system_users from dbus-userdb.c
 
 2007-06-14  Ralf Habacker  <ralf.habacker@freenet.de>
     
-       * global rename of function dbus_username_from_current_process
+       * global rename of function _dbus_username_from_current_process
        to _dbus_append_desired_identity. 
        Approved by Havoc Pennington
 

diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index 7fe9671a40a62b7efd8da2ca88f619fcd320d2bf..9651df74a10a12b8e708709442f1fba7a6c31e40 100644 (file)
--- 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))
     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,6 +796,7 @@ handle_client_initial_response_cookie_sha1_mech (DBusAuth   *auth,
   retval = TRUE;
   
  out_0:
+  _dbus_string_free(&username);
   return retval;
 }