Commit graph

3406 commits

Author SHA1 Message Date
Simon McVittie
eaa1f25746 bus_registry_acquire_service: remove unnecessary variable 2011-09-19 13:50:38 +01:00
Simon McVittie
0f309ae984 Don't refcount TimeoutCallback
It turns out that timeout_callback_ref() is no longer called anywhere.
2011-09-19 13:50:38 +01:00
Simon McVittie
e91bbcbcb4 Remove a never-used callback 2011-09-19 13:50:37 +01:00
Simon McVittie
bf2a1b169f Remove more never-used variables 2011-09-19 13:50:37 +01:00
Simon McVittie
775f77c719 Merge branch 'dbus-1.4' 2011-08-26 15:07:41 +01:00
Simon McVittie
2f183ac576 Don't build any of the reload-pipe code on non-Unix
In commit ab7b3f9, Ralf notes that handle_reload_watch() is (in principle)
cross-platform. However, there's no way to trigger it on Windows, because
nothing ever writes to the pipe. Make the entire pipe-to-self trick
Unix-specific instead.

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40002
2011-08-26 15:02:30 +01:00
Simon McVittie
2eddc3265c Merge branch 'dbus-1.4' 2011-08-24 11:26:13 +01:00
Simon McVittie
8c2ab410fb NEWS 2011-08-24 11:26:01 +01:00
Simon McVittie
584d4f60b9 Add missing inclusion of inttypes.h
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40313
Reviewed-by: Thiago Macieira <thiago@kde.org>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-08-24 11:01:45 +01:00
Ralf Habacker
3d170cc4ff Merge branch 'dbus-1.4' 2011-08-15 17:33:42 +02:00
Simon McVittie
8c83422b5f Fix compilation of (no-op) alignment assertions on non-gcc
do {} while (0) isn't valid at file scope, so the non-gcc code path
was broken; in particular, this affected MSVC.

Reviewed-by:Ralf Habacker <ralf.habacker@freenet.de>
2011-08-15 17:31:50 +02:00
Simon McVittie
6d4fe188e5 Merge branch 'dbus-1.4' 2011-08-15 10:26:48 +01:00
Simon McVittie
9929df06bf NEWS 2011-08-15 10:26:42 +01:00
Chris Mayo
c82a83fb1b Install diagrams in htmldir
diagram.png and diagram.svg are linked from dbus-tutorial.html but recent
changes to doc/Makefile.am mean that if htmldir is set with configure they are
installed such that the relative link from dbus-tutorial.html does not work.

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-08-15 10:23:04 +01:00
Simon McVittie
0f72713e5a Merge branch 'dbus-1.4' 2011-08-15 09:56:03 +01:00
Ralf Habacker
4a3e5b0af4 Fix compilation on MSVC, which doesn't understand "inline" with its C99 meaning.
This fix is limited to msvc compilers only.

Reviewed-by:Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-08-13 22:08:26 +02:00
Simon McVittie
21947eb371 NEWS 2011-08-12 10:45:24 +01:00
Simon McVittie
74868224e4 dbus-daemon-eavesdrop test: apply the same Windows fixes as dbus-daemon test
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40003
2011-08-12 10:45:15 +01:00
Simon McVittie
39e3866c0a Fix linking of libdbus-testutils.la with Automake targeting Windows
This regressed in commit 9875480ed - libdbus-testutils.la needs static
linking too.
2011-08-12 10:26:26 +01:00
Simon McVittie
c99a3df254 Merge branch 'dbus-1.4' 2011-08-12 10:26:13 +01:00
Simon McVittie
486c0373f1 NEWS 2011-08-12 10:26:04 +01:00
Simon McVittie
bc643f81a5 Fix compiler warnings when cross-compiling dbus-daemon test for mingw32
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40003
Reviewed-by: Colin Walters <walters@verbum.org>
2011-08-12 10:21:50 +01:00
Simon McVittie
0611a71c67 Merge branch 'dbus-1.4'
Conflicts:
	NEWS
2011-08-11 11:54:52 +01:00
Simon McVittie
0b9e2b8b49 NEWS for 1.4.x 2011-08-11 11:53:45 +01:00
Simon McVittie
6327adafe2 dbus-marshal-basic: assert that the size and (on gcc) alignment of all types is as expected
The __alignof__() checks here will fail if compiling for an architecture
where more-than-natural alignment is needed.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39636
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-08-11 11:51:55 +01:00
Simon McVittie
213acdb71c Add _DBUS_STATIC_ASSERT (based on GLib's G_STATIC_ASSERT) and use it
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39636
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-08-11 11:51:43 +01:00
Simon McVittie
513f137912 Merge branch 'dbus-1.4', omitting the DBUS_INLINE stuff
fd.o #40000 had effectively already been fixed (slightly differently)
on master.

Conflicts:
	cmake/config.h.cmake
2011-08-11 11:26:58 +01:00
Steve Grubb
70fb675a10 capng: Drop supplemental groups when switching to daemon user
This patch ensures the daemon process doesn't inherit any supplemental
groups for the root user from an administrator login via an init
script.

This is only an issue for pre-systemd systems.

https://bugzilla.redhat.com/show_bug.cgi?id=726953
2011-08-11 10:54:45 +01:00
Colin Walters
93731e6c9c autogen.sh: Don't run configure if NOCONFIGURE is set
See http://people.gnome.org/~walters/docs/build-api.txt
2011-08-11 10:54:45 +01:00
Ralf Habacker
995bfef416 Clean up cygwin readme 2011-08-06 00:37:39 +02:00
Ralf Habacker
0631b30cea Clean up cygwin readme 2011-08-06 00:36:42 +02:00
Ralf Habacker
8d55ab4224 Clean author list 2011-08-06 00:15:01 +02:00
Ralf Habacker
7c19592a9b Reduce duplicates from authors list
Some duplicates are there by accident mostly because of the git
learning curve (as in my case). Other duplicates could be outdated
and may be candidates for additional mappings.
2011-08-06 00:11:11 +02:00
Ralf Habacker
75014fc2f7 Reduce duplicates from authors list
Some duplicates are there by accident mostly because of the git
learning curve (as in my case). Other duplicates could be outdated
and may be candidates for additional mappings.
2011-08-06 00:08:22 +02:00
Ralf Habacker
f3ac2c2b3e Clean author list 2011-08-05 23:26:41 +02:00
Ralf Habacker
b0b5f9b134 Win32 compile fix.
msvc compilers define 'inline' only for c++ code, so wrap it
with a platform independent DBUS_INLINE define in cmake
generated config.h.
2011-08-05 23:01:10 +02:00
Ralf Habacker
ab7b3f92bf Win32 compile fix.
Do not limit ACTION_RELOAD to unix only because it is used in the
crossplattform function handle_reload_watch().
2011-08-05 22:37:06 +02:00
Simon McVittie
82495f4b40 Merge branch 'dbus-1.4' and update NEWS further 2011-08-05 15:07:24 +01:00
Simon McVittie
2a6c14cd2e NEWS 2011-08-05 15:03:39 +01:00
Simon McVittie
a1c90cacfa Merge branch 'dbus-1.4'
Conflicts:
	bus/main.c
2011-08-05 14:52:37 +01:00
Simon McVittie
6c6ae1efcd Add a regression test for fd.o #38005
(The dbus-1.4 version.)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39836
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-08-05 14:46:31 +01:00
Simon McVittie
9f64c1930a relay test: don't leak the server's address
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39836
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-08-05 14:46:09 +01:00
Simon McVittie
20e2dc7c74 _dbus_server_new_for_domain_socket: don't try to unlink abstract sockets
Our abstract socket names look like filenames (/tmp/dbus-MwozdykBNK or
whatever), so if we incorrectly unlink the abstract socket name, in
highly unlikely circumstances we could accidentally unlink a non-abstract
socket belonging to another process!

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38656
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-08-05 14:39:52 +01:00
Simon McVittie
ba2892396a bus signal_handler: call _exit in the unlikely event that the pipe is full or invalid
On OSs with abstract sockets, this is close enough. On OSs without
abstract sockets, this results in failing to clean up Unix sockets
in /tmp if someone has sent us thousands of SIGHUP signals since we
last entered the main loop - I think that's acceptable.

The reload pipe should never get closed, but if it is for some reason,
we want a SIGTERM after that to cause an exit too.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38656
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-08-05 14:39:34 +01:00
Simon McVittie
05389054bd bus signal_handler: comment why it's OK if the reload pipe gets full
Backported to dbus-1.4, originally part of commit c7ef3ead55.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33336
Reviewed-by: Thiago Macieira <thiago@kde.org>
2011-08-05 14:39:27 +01:00
Simon McVittie
e90e7e9e71 bus signal_handler: don't pretend to be portable away from Unix
Signals are POSIX but not ISO C, so guard it with DBUS_UNIX.

dbus-sysdeps-util-win doesn't actually implement _dbus_set_signal_handler
anyway, so not compiling this code on non-Unix seems more honest.

Backported to dbus-1.4, originally part of commit c7ef3ead55.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33336
Reviewed-by: Thiago Macieira <thiago@kde.org>
2011-08-05 14:39:24 +01:00
Simon McVittie
3cf9fa4dc7 Conditionalize inclusion of unistd.h
Windows doesn't have it, for instance.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38656
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-08-05 14:39:04 +01:00
Brian Cameron
94e7a1df3e Handle SIGTERM again, to avoid leaving /tmp/dbus-XXX sockets on Solaris
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38656
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2011-08-05 14:38:55 +01:00
Simon McVittie
d6ad37c304 Merge branch 'dbus-1.4' 2011-08-05 14:18:27 +01:00
Simon McVittie
c1bcd2269c cmake: always enable GNU and recent-POSIX extensions, like autoconf does
If the C library is (e)glibc, this allows use of POSIX, BSD, SVID, GNU,
etc., extensions to ISO C, regardless of using -ansi or not.

Not doing this broke the cmake build on Linux since commit 18b08180,
which added AC_USE_SYSTEM_EXTENSIONS to configure.ac (and removed
_GNU_SOURCE from files that use it) without also updating the cmake
build system. SO_PEERCRED is defined unconditionally, but struct ucred
is considered to be a GNU extension, so can't be used under _GNU_SOURCE.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29228
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
2011-08-05 14:17:51 +01:00