fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-02-18 03:40:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-1.6'

Browse source 
Conflicts:
	NEWS
	bus/activation-helper.c
	configure.ac
This commit is contained in:
Simon McVittie 2012-10-04 08:54:58 +01:00
commit 9fafead23d
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -23,6 +23,10 @@ Enhancements:
Fixes:
• CVE-2012-3524: Don't access environment variables (fd.o #52202)
Thanks to work and input from Colin Walters, Simon McVittie,
Geoffrey Thomas, and others.
• Unix-specific:
· Fix compilation on Solaris (fd.o #53286, Jonathan Perkin)
· Work around interdependent headers on OpenBSD by including sys/types.h

2
bus/activation-helper.c
View file

@ -154,11 +154,11 @@ clear_environment (DBusError *error)
"could not clear environment\n");
return FALSE;
}
#endif
/* Ensure the bus is set to system */
_dbus_setenv ("DBUS_STARTER_ADDRESS", DBUS_SYSTEM_BUS_DEFAULT_ADDRESS);
_dbus_setenv ("DBUS_STARTER_BUS_TYPE", "system");
#endif
return TRUE;
}