From: Colin Walters <walters@verbum.org>
Date: Wed, 15 Jun 2005 19:33:04 +0000 (+0000)
Subject: 2005-06-15  Colin Walters  <walters@verbum.org>
X-Git-Tag: dbus-0.35~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cd4c9ac5fb269a413f58d188b214b1ee4f6a5a6;p=thirdparty%2Fdbus.git

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 c60753638..6e6d639a1 100644
--- 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 fe747b8d5..917a240c1 100644
--- 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