summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2005-06-15 19:33:04 +0000
committerColin Walters <walters@verbum.org>2005-06-15 19:33:04 +0000
commit5cd4c9ac5fb269a413f58d188b214b1ee4f6a5a6 (patch)
tree2237f21eb60103fde202e96906c14993fb3934b0
parentb28bbb092b26549883d00d8e4e855267f9bfff3a (diff)
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)
-rw-r--r--ChangeLog5
-rw-r--r--dbus/dbus-sysdeps.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c6075363..6e6d639a 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 fe747b8d..917a240c 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