fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-04-21 08:50:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-1.10'

Browse source
This commit is contained in:
Simon McVittie 2017-08-15 12:23:15 -04:00
commit d82378fd31
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -39,6 +39,9 @@ Fixes:
out) on entropy-starved embedded systems.
(fd.o #101858, Simon McVittie)
• Avoid a -Werror=declaration-after-statement build failure on Solaris
(fd.o #102145, Alan Coopersmith)
D-Bus 1.11.16 (2017-07-27)
==

9
dbus/dbus-sysdeps-unix.c
View file

@ -2054,13 +2054,13 @@ _dbus_read_credentials_socket (DBusSocket client_fd,
ucred_t * ucred = NULL;
if (getpeerucred (client_fd.fd, &ucred) == 0)
{
#ifdef HAVE_ADT
adt_session_data_t *adth = NULL;
#endif
pid_read = ucred_getpid (ucred);
uid_read = ucred_geteuid (ucred);
#ifdef HAVE_ADT
/* generate audit session data based on socket ucred */
adt_session_data_t *adth = NULL;
adt_export_data_t *data = NULL;
size_t size = 0;
if (adt_start_session (&adth, NULL, 0) || (adth == NULL))
{
_dbus_verbose ("Failed to adt_start_session(): %s\n", _dbus_strerror (errno));
@ -2073,7 +2073,8 @@ _dbus_read_credentials_socket (DBusSocket client_fd,
}
else
{
size = adt_export_session_data (adth, &data);
adt_export_data_t *data = NULL;
size_t size = adt_export_session_data (adth, &data);
if (size <= 0)
{
_dbus_verbose ("Failed to adt_export_session_data(): %s\n", _dbus_strerror (errno));