platform/upstream/dbus.git
10 years agoMerge branch 'dbus-1.8'
Simon McVittie [Wed, 2 Jul 2014 17:33:51 +0000 (18:33 +0100)]
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac

10 years agostart 1.8.7
Simon McVittie [Wed, 2 Jul 2014 17:24:44 +0000 (18:24 +0100)]
start 1.8.7

10 years agoPrepare 1.8.6 in advance
Simon McVittie [Mon, 30 Jun 2014 13:18:03 +0000 (14:18 +0100)]
Prepare 1.8.6 in advance

10 years agoHandle ETOOMANYREFS when sending recursive fds (SCM_RIGHTS)
Alban Crequy [Tue, 24 Jun 2014 16:57:14 +0000 (17:57 +0100)]
Handle ETOOMANYREFS when sending recursive fds (SCM_RIGHTS)

Since Linux commit 25888e (from 2.6.37-rc4, Nov 2010), sendmsg() on Unix
sockets returns -1 errno=ETOOMANYREFS ("Too many references: cannot splice")
when the passfd mechanism (SCM_RIGHTS) is "abusively" used recursively by
applications. A malicious client could use this to force a victim system
service to be disconnected from the system bus; the victim would likely
respond by exiting. This is a denial of service (fd.o #80163,
CVE-2014-3532).

This patch silently drops the D-Bus message on ETOOMANYREFS and does not close
the connection.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=80163
Reviewed-by: Thiago Macieira <thiago@kde.org>
[altered commit message to explain DoS significance -smcv]
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoIf loader contains two messages with fds, don't corrupt the second
Simon McVittie [Wed, 11 Jun 2014 11:24:20 +0000 (12:24 +0100)]
If loader contains two messages with fds, don't corrupt the second

There were two bugs here: we would previously overwrite the unused
fds with the already-used fds instead of the other way round, and
we would copy n bytes where we should have copied n ints.

Additionally, sending crafted messages in a chosen sequence to a victim
system service could cause an invalid file descriptor to be present
when dbus-daemon tries to forward one of those crafted messages to the
victim, causing sendmsg() to fail with EBADF, which resulted in
disconnecting the victim service, which would likely respond to that
by exiting. This is a denial of service (fd.o #80469, CVE-2014-3533).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=79694
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=80469
Reviewed-by: Alban Crequy <alban.crequy@collabora.co.uk>
10 years agoNEWS
Simon McVittie [Wed, 11 Jun 2014 10:56:00 +0000 (11:56 +0100)]
NEWS

10 years agobus_set_watched_dirs: portability patch for systems which lack O_CLOEXEC
Patrick Welche [Fri, 6 Jun 2014 13:03:39 +0000 (14:03 +0100)]
bus_set_watched_dirs: portability patch for systems which lack O_CLOEXEC

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77032
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoMerge branch 'dbus-1.8'
Simon McVittie [Wed, 11 Jun 2014 10:46:27 +0000 (11:46 +0100)]
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac

10 years agoNEWS
Simon McVittie [Wed, 11 Jun 2014 10:45:42 +0000 (11:45 +0100)]
NEWS

10 years agoNEWS
Simon McVittie [Wed, 11 Jun 2014 10:45:28 +0000 (11:45 +0100)]
NEWS

10 years agoconfigure.ac: backtrace() may be in libexecinfo
Patrick Welche [Wed, 4 Jun 2014 15:44:19 +0000 (16:44 +0100)]
configure.ac: backtrace() may be in libexecinfo

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69702
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agodbus-launch: kill bus if we can't attach to a session when requested
Роман Донченко [Wed, 11 Jun 2014 10:38:24 +0000 (11:38 +0100)]
dbus-launch: kill bus if we can't attach to a session when requested

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=74698
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoDon't call poll(2) with timeout < -1
Jaap Boender [Wed, 11 Jun 2014 10:14:10 +0000 (11:14 +0100)]
Don't call poll(2) with timeout < -1

On Linux, poll accepts any negative value as infinity.
On at least FreeBSD and NetBSD, only -1 is acceptable.

[adjusted whitespace for correct coding style -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=78480
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years ago.gitignore: ignore incoming-limit.conf file
Lukasz Skalski [Tue, 20 May 2014 15:27:51 +0000 (17:27 +0200)]
.gitignore: ignore incoming-limit.conf file

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=78977
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoreset version
Simon McVittie [Tue, 10 Jun 2014 17:43:40 +0000 (18:43 +0100)]
reset version

10 years agoMerge branch 'dbus-1.8'
Simon McVittie [Tue, 10 Jun 2014 17:36:00 +0000 (18:36 +0100)]
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac

10 years agoPrepare embargoed security release
Simon McVittie [Thu, 5 Jun 2014 13:54:36 +0000 (14:54 +0100)]
Prepare embargoed security release

10 years agoCVE-2014-3477: deliver activation errors correctly, fixing Denial of Service
Alban Crequy [Tue, 20 May 2014 13:37:37 +0000 (14:37 +0100)]
CVE-2014-3477: deliver activation errors correctly, fixing Denial of Service

How it should work:

When a D-Bus message activates a service, LSMs (SELinux or AppArmor) check
whether the message can be delivered after the service has been activated. The
service is considered activated when its well-known name is requested with
org.freedesktop.DBus.RequestName. When the message delivery is denied, the
service stays activated but should not receive the activating message (the
message which triggered the activation). dbus-daemon is supposed to drop the
activating message and reply to the sender with a D-Bus error message.

However, it does not work as expected:

1. The error message is delivered to the service instead of being delivered to
   the sender. As an example, the error message could be something like:

     An SELinux policy prevents this sender from sending this
     message to this recipient, [...] member="MaliciousMethod"

   If the sender and the service are malicious confederates and agree on a
   protocol to insert information in the member name, the sender can leak
   information to the service, even though the LSM attempted to block the
   communication between the sender and the service.

2. The error message is delivered as a reply to the RequestName call from
   service. It means the activated service will believe it cannot request the
   name and might exit. The sender could activate the service frequently and
   systemd will give up activating it. Thus the denial of service.

The following changes fix the bug:
- bus_activation_send_pending_auto_activation_messages() only returns an error
  in case of OOM. The prototype is changed to return TRUE, or FALSE on OOM
  (and its only caller sets the OOM error).
- When a client is not allowed to talk to the service, a D-Bus error message
  is pre-allocated to be delivered to the client as part of the transaction.
  The error is not propagated to the caller so RequestName will not fail
  (except on OOM).

[fixed a misleading comment -smcv]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=78979
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Colin Walters <walters@verbum.org>
10 years agoMerge branch 'dbus-1.8'
Simon McVittie [Wed, 30 Apr 2014 20:05:46 +0000 (21:05 +0100)]
Merge branch 'dbus-1.8'

Conflicts:
NEWS
configure.ac

10 years agodevelopment version
Simon McVittie [Wed, 30 Apr 2014 19:58:39 +0000 (20:58 +0100)]
development version

10 years ago1.8.2 sandbox/pohly/upstream dbus-1.8.2
Simon McVittie [Wed, 30 Apr 2014 19:14:51 +0000 (20:14 +0100)]
1.8.2

10 years agoHandle 0x0d0a EOLs in spawn_dbus_daemon()
Руслан Ижбулатов [Sat, 8 Mar 2014 04:18:43 +0000 (04:18 +0000)]
Handle 0x0d0a EOLs in spawn_dbus_daemon()

On W32 dbus daemon will print output in text mode, with 0x0d0a EOLs instead
of just 0x0a. Be able to handle that.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75863
Reviewed-by: Simon McVittie
10 years agoNEWS
Simon McVittie [Wed, 30 Apr 2014 18:21:47 +0000 (19:21 +0100)]
NEWS

10 years agoAvoid killing all available processes if an X error arrives early on
Роман Донченко [Wed, 30 Apr 2014 18:11:56 +0000 (19:11 +0100)]
Avoid killing all available processes if an X error arrives early on

The timeline of events in dbus-launch's main process goes something like this:

* do initial X calls
[1]
* do some other stuff
* fork
    (child process starts doing some other stuff)
* return "intermediate parent" pid from fork()
* obtain bus daemon pid from bus_pid_to_launcher_pipe
[2]
* do things that might include X11 calls or killing the dbus-daemon

Meanwhile, the "babysitter" child goes like this:

* return 0 from fork()
[3]
* obtain bus daemon pid from parent process via bus_pid_to_babysitter_pipe
[4]
* do things that might include X11 calls or killing the bus daemon

Before [1] or [3], the right thing to do about an X error is to just
exit. The current implementation called kill(-1) first, which is
undesirable: it kills unrelated processes. With this change, we
just exit.

After [2] or [4], the right thing to do is to kill the dbus-daemon,
and that's what the existing code did.

Between [1] and [2], or between [3] and [4], there is no correct thing
that we can do immediately: we would have to wait for the end of the
"critical section", *then* kill the dbus-daemon. This has not yet been
implemented, so this patch relies for its correctness on the fact that
there are no libX11 calls between those points, so we cannot receive
an X error between them.

dbus-launch deserves more comments, or a reimplementation that is easier to
understand, but this change is certainly better than nothing.

[Commit message added, summarizing reviewers' comments -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=74698
Reviewed-by: Simon McVittie
Reviewed-by: Thiago Macieira
10 years agoNEWS
Simon McVittie [Mon, 28 Apr 2014 15:01:24 +0000 (16:01 +0100)]
NEWS

10 years agoSet argv[0] to dbus-launch to avoid misleading info from /proc
Chengwei Yang [Sat, 18 Jan 2014 04:17:43 +0000 (12:17 +0800)]
Set argv[0] to dbus-launch to avoid misleading info from /proc

At previous, argv[0] is the full-qualified path of program, however, if
start dbus-launch failed, it will fall back to find one from $PATH,
while keep the argv[0] as the full-qualified path. So we'll get
misleading info from /proc or ps(1) about dbus-launch process.

One simple solution is just hard-code argv[0] to dbus-launch.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69716
Reviewed-by: Simon McVittie
10 years agomore NEWS for 1.9
Simon McVittie [Mon, 28 Apr 2014 14:48:40 +0000 (15:48 +0100)]
more NEWS for 1.9

10 years agoMerge branch 'dbus-1.8'
Simon McVittie [Mon, 28 Apr 2014 14:46:53 +0000 (15:46 +0100)]
Merge branch 'dbus-1.8'

Conflicts:
NEWS

10 years agoNEWS for 1.8
Simon McVittie [Mon, 28 Apr 2014 14:45:22 +0000 (15:45 +0100)]
NEWS for 1.8

10 years agoAdd "Documentation=man:dbus-daemon(1)" line to systemd service
Cameron Norman [Mon, 28 Apr 2014 14:42:11 +0000 (15:42 +0100)]
Add "Documentation=man:dbus-daemon(1)" line to systemd service

Enhances usability under systemd by making the documentation available
with systemctl status or systemctl help.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77447
Reviewed-by: Simon McVittie
10 years agoTry to read /etc/machine-id before inventing a new /var/lib/dbus/machine-id
Simon McVittie [Fri, 25 Apr 2014 17:51:26 +0000 (18:51 +0100)]
Try to read /etc/machine-id before inventing a new /var/lib/dbus/machine-id

It's least confusing if the two files have the same contents. systemd
already knows how to pick up our /var/lib/dbus/machine-id if it exists
and /etc/machine-id doesn't, but the converse is not currently true.
We should make it true, so that it doesn't matter what order
systemd-machine-id-setup and "dbus-uuidgen --ensure" were
invoked in.

In Debian, systemd currently Recommends dbus, so "dbus-uuidgen --ensure"
will *usually* - but not always! - run first, and the two files will
match. However, if you install systemd without dbus, and then install
dbus later, there will be a mismatch. With this change, it doesn't
matter which one is installed first: whichever one happens to come
first, it will generate the machine ID, and then the other one will
copy it.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77941
Reviewed-by: Lennart Poettering
10 years ago_dbus_write_uuid_file: factor out function to write a known UUID
Simon McVittie [Fri, 25 Apr 2014 17:30:19 +0000 (18:30 +0100)]
_dbus_write_uuid_file: factor out function to write a known UUID

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77941
Reviewed-by: Lennart Poettering
10 years agoMake documentation generating MSYS/MSYS2-compatible
Руслан Ижбулатов [Thu, 6 Mar 2014 23:17:13 +0000 (23:17 +0000)]
Make documentation generating MSYS/MSYS2-compatible

xmlto is a shell script, it needs to be fed MSYSsy filenames.
This patch adds a cygpath invocation for filename conversion (autotools do
that automatically, for CMake you have to spell it out). Cygwpath is available
in MSYS2 (and Cygwin, obviously).
When cygpath is not available, use MSYS-specific pwd extension to get W32 path.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75860
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
10 years agoMerge branch 'dbus-1.8'
Simon McVittie [Thu, 13 Mar 2014 12:15:26 +0000 (12:15 +0000)]
Merge branch 'dbus-1.8'

10 years agoUpdate email-address for David Zeuthen.
David Zeuthen [Thu, 20 Feb 2014 23:42:13 +0000 (15:42 -0800)]
Update email-address for David Zeuthen.

I no longer have the email address davidz@redhat.com so update it to
my current address.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75288

10 years agoMerge branch 'dbus-1.8'
Simon McVittie [Thu, 6 Mar 2014 13:11:09 +0000 (13:11 +0000)]
Merge branch 'dbus-1.8'

10 years agoUpdate .gitignore files
Lukasz Skalski [Thu, 6 Mar 2014 11:39:20 +0000 (12:39 +0100)]
Update .gitignore files

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75833
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years ago.gitignore: ignore /test-driver, generated by recent Automake
Simon McVittie [Mon, 3 Mar 2014 15:59:10 +0000 (15:59 +0000)]
.gitignore: ignore /test-driver, generated by recent Automake

10 years agoNEWS for 1.9
Simon McVittie [Mon, 3 Mar 2014 15:58:42 +0000 (15:58 +0000)]
NEWS for 1.9

10 years agoMerge branch 'dbus-1.8'
Simon McVittie [Mon, 3 Mar 2014 15:44:51 +0000 (15:44 +0000)]
Merge branch 'dbus-1.8'

10 years agoNEWS for dbus-1.8
Simon McVittie [Mon, 3 Mar 2014 15:44:44 +0000 (15:44 +0000)]
NEWS for dbus-1.8

10 years agoDisable slow-start on TCP sockets
Matt Hoosier [Wed, 26 Feb 2014 14:29:09 +0000 (08:29 -0600)]
Disable slow-start on TCP sockets

Leaving Nagle's algorithm enabled on the TCP transport leads to some
really long latencies (at least, during the first several messages).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75544
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoFix error message.
Antoine Jacoutot [Tue, 21 Jan 2014 18:00:14 +0000 (19:00 +0100)]
Fix error message.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73887
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoOnly support systemd: transport if we have systemd libraries
Simon McVittie [Mon, 6 Jan 2014 16:53:26 +0000 (16:53 +0000)]
Only support systemd: transport if we have systemd libraries

This means we can drop our convenience copy of sd-daemon.[ch]. We're
checking for libsd-daemon anyway, to support journald and logind
integration.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71818
Reviewed-by: Lennart Poettering <lennart@poettering.net>
10 years agoKeep cmake generated shared dbus-1 library file name in sync with autotools.
Ralf Habacker [Mon, 27 Jan 2014 07:54:27 +0000 (08:54 +0100)]
Keep cmake generated shared dbus-1 library file name in sync with autotools.

Autotools uses a versioned shared library name derived from libtool.
This patch adds a versioned shared library name to cmake builds for all
supported platforms. Binary compatibility for clients build against older
cmake generated binary packages of dbus is provided; on unix like os
with symbolic links and on Windows with a copy of the shared library.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=74117
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoMerge branch 'dbus-1.8'
Ralf Habacker [Mon, 27 Jan 2014 18:33:32 +0000 (19:33 +0100)]
Merge branch 'dbus-1.8'

10 years agoFix of 'dbus-daemon can only handle 64 simultaneous connections on Windows'.
Cristian Onet [Mon, 27 Jan 2014 10:58:37 +0000 (11:58 +0100)]
Fix of 'dbus-daemon can only handle 64 simultaneous connections on Windows'.

[Slightly modified by -rh]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71297
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoMerge branch 'dbus-1.8'
Ralf Habacker [Tue, 21 Jan 2014 20:11:25 +0000 (21:11 +0100)]
Merge branch 'dbus-1.8'

10 years agoGive cmake users some hints/requirements when cross compiling for Windows on Linux.
Ralf Habacker [Tue, 14 Jan 2014 19:12:36 +0000 (20:12 +0100)]
Give cmake users some hints/requirements when cross compiling for Windows on Linux.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agostart spec 0.24
Simon McVittie [Mon, 6 Jan 2014 20:17:11 +0000 (20:17 +0000)]
start spec 0.24

10 years agostart towards 1.9
Simon McVittie [Mon, 20 Jan 2014 16:12:45 +0000 (16:12 +0000)]
start towards 1.9

10 years ago1.8.1
Simon McVittie [Mon, 20 Jan 2014 16:11:58 +0000 (16:11 +0000)]
1.8.1

10 years agoD-Bus 1.8.0
Simon McVittie [Mon, 20 Jan 2014 14:25:48 +0000 (14:25 +0000)]
D-Bus 1.8.0

10 years agoRevert "start spec 0.24"
Simon McVittie [Mon, 20 Jan 2014 13:40:30 +0000 (13:40 +0000)]
Revert "start spec 0.24"

It hasn't otherwise changed since 1.7.10.

This reverts commit fb16f80d457a66610f615b44158330bf7ba68697.

10 years agoLet cmake 'make check' run test applications as test group.
Ralf Habacker [Fri, 10 Jan 2014 01:20:10 +0000 (02:20 +0100)]
Let cmake 'make check' run test applications as test group.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoRename bus-test-launch-helper to test-bus-launch_helper to match common test applicat...
Ralf Habacker [Tue, 14 Jan 2014 17:52:22 +0000 (18:52 +0100)]
Rename bus-test-launch-helper to test-bus-launch_helper to match common test application naming scheme.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoRename bus-test-system to test-bus-system to match common test application naming...
Ralf Habacker [Tue, 14 Jan 2014 17:45:39 +0000 (18:45 +0100)]
Rename bus-test-system to test-bus-system to match common test application naming scheme.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoRename bus-test to test-bus to match common test application naming scheme.
Ralf Habacker [Mon, 13 Jan 2014 19:45:37 +0000 (20:45 +0100)]
Rename bus-test to test-bus to match common test application naming scheme.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoRename spawn-test to test-spawn to match common test application naming scheme.
Ralf Habacker [Sat, 11 Jan 2014 09:07:21 +0000 (10:07 +0100)]
Rename spawn-test to test-spawn to match common test application naming scheme.

[Same change as for shell-test in the previous commit. -smcv]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoRename shell-test to test-shell to match common test application naming scheme.
Ralf Habacker [Fri, 10 Jan 2014 01:17:22 +0000 (02:17 +0100)]
Rename shell-test to test-shell to match common test application naming scheme.

[Add its source file to SOURCES: this test was previously relying on the
Automake feature that the default value of foo_bar_SOURCES is foo-bar.c. -smcv]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoRename dbus-test to test-dbus to match common test application naming scheme.
Ralf Habacker [Sat, 11 Jan 2014 19:51:27 +0000 (20:51 +0100)]
Rename dbus-test to test-dbus to match common test application naming scheme.

[reverted the dbus-specification part -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73495
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoCorrect test for LIBTOOLIZE by quoting it
Simon McVittie [Fri, 17 Jan 2014 15:58:43 +0000 (15:58 +0000)]
Correct test for LIBTOOLIZE by quoting it

Based on a patch from Roland <blueburn85 gmail com>.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73278

10 years agoCMake warning--.
Ralf Habacker [Tue, 14 Jan 2014 19:58:28 +0000 (20:58 +0100)]
CMake warning--.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoNEWS
Simon McVittie [Tue, 14 Jan 2014 11:07:39 +0000 (11:07 +0000)]
NEWS

10 years agoDon't forget allow_anonymous when merging configs
Matt Hoosier [Thu, 9 Jan 2014 22:15:31 +0000 (16:15 -0600)]
Don't forget allow_anonymous when merging configs

The algorithm to collapse a subsidiary config file's data into the
master data structure forgot to examine this flag.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73475
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoFix compile error on opensuse 12.2 with systemd 44 and glibc-2.15.
Ralf Habacker [Fri, 10 Jan 2014 13:46:40 +0000 (14:46 +0100)]
Fix compile error on opensuse 12.2 with systemd 44 and glibc-2.15.

The specific systemd/glibc version do not include syslog.h by default.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73455
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agotests: don't block and wait for a debugger on abort
Simon McVittie [Tue, 7 Jan 2014 12:23:10 +0000 (12:23 +0000)]
tests: don't block and wait for a debugger on abort

In general, I think developers running the tests would expect
them to terminate rather than hanging. Developers who want to debug
such an abort by attaching a debugger to a live process can still set
DBUS_BLOCK_ON_ABORT in the environment.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
10 years agoUse macros for test and helper executable targets on cmake build system.
Ralf Habacker [Thu, 10 Oct 2013 21:42:57 +0000 (23:42 +0200)]
Use macros for test and helper executable targets on cmake build system.

The new macros add_test_executables and add helper_executables provides a
platform independent way for specifing dbus test and service applications.

On native Windows and Linux/UNIX systems the test applications are
directly runable.

When cross compiling for Windows on Linux test applications could be
executed on the Linux host system with the help of wine and activated
binfmt_misc support for wine.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoAdd 'check' cmake target to keep in sync with autotools.
Ralf Habacker [Fri, 10 Jan 2014 00:07:28 +0000 (01:07 +0100)]
Add 'check' cmake target to keep in sync with autotools.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoFix mentioned files in Building section.
Ralf Habacker [Fri, 10 Jan 2014 00:03:44 +0000 (01:03 +0100)]
Fix mentioned files in Building section.

10 years agoCreate session.conf and system.conf for test/data/valid-config-files from *.in files...
Ralf Habacker [Wed, 8 Jan 2014 01:03:14 +0000 (02:03 +0100)]
Create session.conf and system.conf for test/data/valid-config-files from *.in files on cmake.

We need to patch the listen address.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoDefine TEST_BUS_LAUNCH_BINARY for cmake to keep in sync with autotools.
Ralf Habacker [Wed, 8 Jan 2014 00:45:56 +0000 (01:45 +0100)]
Define TEST_BUS_LAUNCH_BINARY for cmake to keep in sync with autotools.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoUse cmake build in executable suffix.
Ralf Habacker [Thu, 10 Oct 2013 21:42:57 +0000 (23:42 +0200)]
Use cmake build in executable suffix.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoRemove obsolete cmake project tags in sub directories; we only have one project.
Ralf Habacker [Wed, 8 Jan 2014 00:32:58 +0000 (01:32 +0100)]
Remove obsolete cmake project tags in sub directories; we only have one project.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68506
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agotest/dbus-daemon, test/dbus-daemon-eavesdrop: allow external dbus-daemon
Simon McVittie [Mon, 2 Sep 2013 15:36:46 +0000 (16:36 +0100)]
test/dbus-daemon, test/dbus-daemon-eavesdrop: allow external dbus-daemon

It's easier to automate these tests if they launch their own
dbus-daemon, but easier to debug them if they don't: you can launch
a dbus-daemon separately, under gdb. However, tests that need a
specially-configured dbus-daemon will have to be skipped.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
10 years agoAdd glib support to cmake buildsystem.
Ralf Habacker [Sat, 24 Aug 2013 13:00:14 +0000 (15:00 +0200)]
Add glib support to cmake buildsystem.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68506
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoMSVC compile fix.
Ralf Habacker [Tue, 7 Jan 2014 07:13:43 +0000 (08:13 +0100)]
MSVC compile fix.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73345
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoUse dbus provided version of va_copy().
Ralf Habacker [Mon, 6 Jan 2014 22:30:55 +0000 (23:30 +0100)]
Use dbus provided version of va_copy().

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72840
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoSkip unix only syslog test.
Ralf Habacker [Fri, 11 Oct 2013 22:59:22 +0000 (00:59 +0200)]
Skip unix only syslog test.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41252
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agostart spec 0.24
Simon McVittie [Mon, 6 Jan 2014 20:17:11 +0000 (20:17 +0000)]
start spec 0.24

10 years agostart 1.7.11
Simon McVittie [Mon, 6 Jan 2014 20:17:05 +0000 (20:17 +0000)]
start 1.7.11

10 years ago1.7.10
Simon McVittie [Mon, 6 Jan 2014 18:40:26 +0000 (18:40 +0000)]
1.7.10

10 years agoDo not install systemd unit files if build without systemd
Chengwei Yang [Wed, 20 Nov 2013 03:30:59 +0000 (11:30 +0800)]
Do not install systemd unit files if build without systemd

If dbus buid without systemd (--disable-systemd or no systemd libs
available when building), we expect not to install dbus systemd unit
files because they're only for systemd environment.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71818
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoMerge remote-tracking branch 'origin/master'
Simon McVittie [Mon, 6 Jan 2014 16:30:34 +0000 (16:30 +0000)]
Merge remote-tracking branch 'origin/master'

10 years agoDefine WIN32_LEAN_AND_MEAN in Windows port
Matt Fischer [Fri, 8 Nov 2013 22:08:39 +0000 (16:08 -0600)]
Define WIN32_LEAN_AND_MEAN in Windows port

<windows.h> somewhat cloyingly attempts to include <winsock.h>
by default, which causes problems if the rest of the program
is trying to use the incompatible <winsock2.h>.  The Windows
sysdep header attempts to prevent this by forcibly defining
the winsock header guard macro, so that it will not be included.
However, this does not work on MinGW because it uses a different
guard macro name.

This patch changes the code to instead define WIN32_LEAN_AND_MEAN,
which is a more portable way to ensure that <winsock.h> will not
be included.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71405
Reviewed-By: Ralf Habacker <ralf.habacker@freenet.de>
10 years agodbus-daemon(1): align document about "bind" with DBus Spec
Chengwei Yang [Tue, 10 Dec 2013 02:06:23 +0000 (10:06 +0800)]
dbus-daemon(1): align document about "bind" with DBus Spec

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72301
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoDBus Spec: add document of bind for tcp/nonce-tcp transport
Chengwei Yang [Tue, 10 Dec 2013 02:02:27 +0000 (10:02 +0800)]
DBus Spec: add document of bind for tcp/nonce-tcp transport

tcp/nonce-tcp transport has a "bind" key, which can be specified a
hostname and will override hostname specified in "host" key.

"bind" has a special value "*" which means ip address 0.0.0.0 and will
cause dbus-daemon listen on all interfaces.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72301
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoDBus Spec: replace tab with 8 spaces
Chengwei Yang [Fri, 6 Dec 2013 03:15:12 +0000 (11:15 +0800)]
DBus Spec: replace tab with 8 spaces

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72301
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoEnsure DBusError is set if _dbus_read_nonce() fail
Chengwei Yang [Fri, 6 Dec 2013 02:53:28 +0000 (10:53 +0800)]
Ensure DBusError is set if _dbus_read_nonce() fail

In _dbus_send_nonce() which call in _dbus_read_nonce() and assert on an
error is set if _dbus_read_nonce() fail. However, in _dbus_read_nonce(),
it may fail on fopen() and left error is unset. This will crash us if
assertions hasn't been disabled.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72298
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agokqueue: open watched directories with close-on-exec flag
Chengwei Yang [Mon, 2 Dec 2013 04:47:47 +0000 (12:47 +0800)]
kqueue: open watched directories with close-on-exec flag

[FreeBSD and OpenBSD contributors clarified that O_CLOEXEC has been
supported for ~ 2 years on both, so for the moment we're assuming
that every platform with kqueue also has working O_CLOEXEC. Please reopen
the bug, with a tested patch that uses _dbus_fd_set_close_on_exec() instead,
if this assumption turns out to be false. -smcv]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=72213
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoBusTransaction: remove confusing getter of connections
Chengwei Yang [Thu, 28 Nov 2013 01:17:38 +0000 (09:17 +0800)]
BusTransaction: remove confusing getter of connections

There is a DBusList* member of BusTransaction named "connections", while
its getter function bus_transaction_get_connections() returns
context->connections which in fact is a BusConnections pointer, this is
quite confusing. Because this is what bus_context_get_connections()
returns.

This patch call out to bus_context_get_connections() directly and remove
the then unused bus_transaction_get_connections().

https://bugs.freedesktop.org/show_bug.cgi?id=71597
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years ago_dbus_auth_return_buffer(): remove unused argument
Chengwei Yang [Mon, 11 Nov 2013 09:52:26 +0000 (17:52 +0800)]
_dbus_auth_return_buffer(): remove unused argument

The argument bytes_read of _dbus_auth_return_buffer() function isn't
used at all, so remove it.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71477
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years ago_dbus_listen_unix_socket: don't try to set SO_REUSEADDR
Simon McVittie [Fri, 1 Nov 2013 13:51:13 +0000 (13:51 +0000)]
_dbus_listen_unix_socket: don't try to set SO_REUSEADDR

On Hurd, the setsockopt() fails. Svante Signell confirmed that on
at least Linux and kFreeBSD, SO_REUSEADDR "succeeds" on Unix sockets,
but doesn't have any practical effect; so rather than making the
failure not issue a warning, we might as well not bother with the
syscall at all.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69492
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years ago_dbus_read_credentials_socket: look at all cmsg headers, not just the first
Simon McVittie [Mon, 6 Jan 2014 15:55:35 +0000 (15:55 +0000)]
_dbus_read_credentials_socket: look at all cmsg headers, not just the first

If there are no cmsg headers, don't fail: this fixes receiving credentials
on TCP sockets under at least GNU/kFreeBSD, and probably FreeBSD too.

If there's more than one cmsg header, ignore any that don't look like
valid SCM_CREDS.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69492
Tested-by: Svante Signell
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
[added break, altered indentation in response to review -smcv]
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoIf sendmsg() with SCM_CREDS fails with EINVAL, retry with send()
Simon McVittie [Wed, 18 Sep 2013 16:51:53 +0000 (17:51 +0100)]
If sendmsg() with SCM_CREDS fails with EINVAL, retry with send()

Perhaps some OSs accept and ignore attempts to send a SCM_CREDS
message on a non-Unix socket, but GNU/kFreeBSD doesn't (and presumably
FreeBSD doesn't either).

Based on a patch by Svante Signell.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69492
Tested-by: Svante Signell
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
10 years agoFix memory leak for kqueue: shutdown kqueue correctly
Chengwei Yang [Tue, 3 Dec 2013 12:47:54 +0000 (20:47 +0800)]
Fix memory leak for kqueue: shutdown kqueue correctly

There are memory blocks leak when doing bus-test, both dispatch-sha1 and
dispatch test cases complain memory blocks leak.

This patch also fix fd leaks.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69332
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agokqueue: replace tab with space
Chengwei Yang [Sun, 1 Dec 2013 11:40:21 +0000 (19:40 +0800)]
kqueue: replace tab with space

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69332
[altered commit message to not say it fixes memory leaks -smcv]
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoMake sure tests run with a temporary XDG_RUNTIME_DIR
Simon McVittie [Tue, 19 Feb 2013 16:39:38 +0000 (16:39 +0000)]
Make sure tests run with a temporary XDG_RUNTIME_DIR

We don't want the regression tests' "session" getting mixed up in
system-wide "sessions". This doesn't actually matter yet, but it is
likely to matter in future.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61301
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
[merged with earlier line-wrapping of TESTS_ENVIRONMENT -smcv]
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years agoReload policy rules for completed connections
Chengwei Yang [Tue, 10 Dec 2013 09:11:25 +0000 (17:11 +0800)]
Reload policy rules for completed connections

The message bus which can monitor its conf dirs for changes and reload
confs immediately if dir monitor enabled, for example, inotify in Linux,
kqueue in *BSD.

However, it doesn't apply policy rules change for completed connections,
so to apply policy rules change, the client connection has to disconnect
first and then re-connect to message bus.

For imcomplete connections, it always has the latest review of policy
rules.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39463
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10 years ago_dbus_check_dir_is_private_to_user: check that we own it
Simon McVittie [Tue, 19 Feb 2013 15:40:06 +0000 (15:40 +0000)]
_dbus_check_dir_is_private_to_user: check that we own it

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61303
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>