2005-06-15 Colin Walters <walters@verbum.org>

	* dbus/dbus-sysdeps.c <HAVE_CMSGCRED> (_dbus_read_credentials_unix_socket):
	Fix call to dbus_set_error.  (Patch from Michael Banck, #3461)

diff --git a/ChangeLog b/ChangeLog
index c60753638b1e92ab7b47e21e6422fcbe9e943773..6e6d639a1a715d0bf164fd497b781d4ad2e4819d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-15  Colin Walters  <walters@verbum.org>
+
+       * dbus/dbus-sysdeps.c <HAVE_CMSGCRED> (_dbus_read_credentials_unix_socket):
+       Fix call to dbus_set_error.  (Patch from Michael Banck, #3461)
+       
 2005-06-15  John (J5) Palmieri  <johnp@redhat.com>
 
        * NEWS: Update to 0.34

diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index fe747b8d58ae0f946034ce05a329a3f6ce5dfa4a..917a240c1446b957fb3df8a2145c0ffadc6c991a 100644 (file)
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -864,8 +864,8 @@ _dbus_read_credentials_unix_socket  (int              client_fd,
 #ifdef HAVE_CMSGCRED
   if (cmsg->cmsg_len < sizeof (cmsgmem) || cmsg->cmsg_type != SCM_CREDS)
     {
-      dbus_set_error (error, DBUS_ERROR_FAILED);
-      _dbus_verbose ("Message from recvmsg() was not SCM_CREDS\n");
+      dbus_set_error (error, DBUS_ERROR_FAILED,
+                      "Message from recvmsg() was not SCM_CREDS");
       return FALSE;
     }
 #endif