Chengwei Yang [Wed, 4 Sep 2013 06:52:21 +0000 (14:52 +0800)]
Fix dbus-daemon document about servicedir
In dbus-daemon implementation, the servicedir are searched in order in
which they appear in the config file.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66994
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Chengwei Yang [Wed, 11 Sep 2013 07:27:38 +0000 (15:27 +0800)]
Remove DBUS_COMPILATION from test source code
DBUS_COMPILATION definition was moved to test/Makefile.am static_cppflags,
so remove it from test source code.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Chengwei Yang [Fri, 6 Sep 2013 03:26:44 +0000 (11:26 +0800)]
Fix pass wrong type of argument to function
The last argument of function _dbus_transport_new_for_socket() is
declared as const DBusString *. However, it is passed as a bool value.
Although the value of FALSE equals NULL in fact, this is an incorrect
use of function.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69165
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Chengwei Yang [Thu, 27 Jun 2013 01:13:57 +0000 (09:13 +0800)]
dbus-launch: unconditionally use SIGHUP and free memory on OOM
In a previous patch, it check SIGHUP for windows, however, in fact there
is dbus-launch-win.c supposed to be used on windows. So just use SIGHUP
unconditionally.
Also free memory on OOM, although this doesn't make much sense since
this is a oneshort program, rather than a daemon.
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
[fixed whitespace -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66068
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Thu, 5 Sep 2013 12:57:53 +0000 (13:57 +0100)]
NEWS
Simon McVittie [Wed, 26 Jun 2013 11:33:29 +0000 (12:33 +0100)]
Use GNU make features to reduce repetition
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48277
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
Simon McVittie [Wed, 26 Jun 2013 11:27:09 +0000 (12:27 +0100)]
Document that GNU make is required
In theory the Autotools build system supports any "make" implementation,
but there are no regular contributors who test with BSD make, so the
inevitable result is that only GNU make actually works (fd.o #48277).
Apparently there's only one GNUism at the moment, which is fixable,
but that means repeating ourselves a bit more. If we instead document
that GNU make is required, we can simplify the Makefiles over time
by using extensions like $(patsubst), leading to a less error-prone
build system.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48277
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
Simon McVittie [Thu, 5 Sep 2013 12:12:36 +0000 (13:12 +0100)]
Merge branch 'dbus-1.6'
Conflicts:
NEWS
tools/run-with-tmp-session-bus.sh
Simon McVittie [Thu, 5 Sep 2013 12:11:45 +0000 (13:11 +0100)]
NEWS
Simon McVittie [Thu, 5 Sep 2013 12:11:31 +0000 (13:11 +0100)]
NEWS for 1.6
Ivan Romanov [Thu, 22 Aug 2013 18:11:23 +0000 (19:11 +0100)]
Use iface instead of interface in function parameters
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66493
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
(cherry picked from commit
0928169cf80bf767f7246ecaa52cc01e198bb15a)
Simon McVittie [Thu, 5 Sep 2013 12:05:21 +0000 (13:05 +0100)]
run-with-tmp-session-bus.sh: create a unique temporary file per process
This makes the regression tests OK to run in parallel.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
(cherry picked from commit
9d80d46a794e0770494aa517d1b94e7e6ea9e21d)
Simon McVittie [Thu, 22 Aug 2013 17:03:24 +0000 (18:03 +0100)]
NEWS for 1.6
Simon McVittie [Tue, 3 Sep 2013 11:16:32 +0000 (12:16 +0100)]
Add CPPFLAGS to "shared if possible" test binaries
In principle we ought to define DBUS_STATIC_BUILD in anything that's
using libdbus-internal.la (to avoid linking failures on
statically-linked mingw builds), and DBUS_TEST_USE_INTERNAL in any
test that's using the non-dbus-glib code paths of test-utils.[ch]
(to avoid the GLib requirement, although in practice, everything
"shared if possible" requires GLib at the moment anyway).
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Tue, 3 Sep 2013 11:25:31 +0000 (12:25 +0100)]
run-with-tmp-session-bus.sh: create a unique temporary file per process
This makes the regression tests OK to run in parallel.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Mon, 2 Sep 2013 15:32:31 +0000 (16:32 +0100)]
Tests: allow dbus-glib to be replaced with use of libdbus-internal
We only use dbus-glib for its main loop; within dbus, DBusLoop is
available as an alternative, although it isn't thread-safe and
isn't public API.
For tests that otherwise only use libdbus public API, it's desirable to
be able to avoid DBusLoop, so we can run them against an installed
libdbus as an integration test. However, if we don't have dbus-glib,
we're going to have to use an in-tree main loop, which might as well
be DBusLoop.
The major disadvantage of using dbus-glib is that it isn't safe to
link both dbus-1 and dbus-internal at the same time. This is awkward
for a future test case that wants to use _dbus_getsid() in dbus-daemon.c,
but only on Windows (fd.o #54445). If we use the same API wrapper around
both dbus-glib and DBusLoop, we can compile that test against dbus-glib
or against DBusLoop, depending on the platform.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Fri, 30 Aug 2013 16:45:52 +0000 (17:45 +0100)]
Define DBUS_COMPILATION externally for all tests that use internal stuff
It might as well go in the AM_CPPFLAGS rather than in the source code.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Mon, 2 Sep 2013 16:14:38 +0000 (17:14 +0100)]
corrupt test: close connection before releasing GSocket
GSocket takes responsibility for closing the fd, and there doesn't
seem to be any way to tell it not to. When this test is adapted to run
under DBusLoop as an alternative to dbus-glib, that becomes a problem,
because DBusLoop/DBusSocketSetEpoll do not tolerate that. Work around it.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Thu, 29 Aug 2013 10:51:45 +0000 (11:51 +0100)]
_dbus_become_daemon: don't pretend it worked
This function is meaningless (and possibly unimplementable) on Windows.
We shouldn't call it; if we do, it should raise an error.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Thu, 29 Aug 2013 10:49:00 +0000 (11:49 +0100)]
Allow dbus-daemon --nofork on Windows
On Windows, the dbus-daemon is not able to fork (daemonize). If someone
explicitly requests forking, it should fail, but if someone
explicitly requests *not* forking, there seems no harm in allowing it.
A few of the regression tests specifically require a dbus-daemon that
will not fork, so allowing this option on Windows means those tests
don't need an extra OS condition.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Mon, 2 Sep 2013 16:31:56 +0000 (17:31 +0100)]
Fix declaration of _dbus_win_startup_winsock
This regressed in commit
b7a91bfd.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68610
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Fri, 30 Aug 2013 15:23:22 +0000 (16:23 +0100)]
Fix unused function when SELinux is not enabled
It must be one of the "only smcv tests this" configurations...
Simon McVittie [Thu, 29 Aug 2013 12:16:14 +0000 (13:16 +0100)]
Move some sysdeps stuff only used by the dbus-daemon outside libdbus
This means we don't need to worry about whether it's thread-safe,
and makes libdbus a little smaller.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68610
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Thu, 29 Aug 2013 11:51:26 +0000 (12:51 +0100)]
_dbus_check_setuid: comment on thread-safety
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68610
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Thu, 29 Aug 2013 11:51:14 +0000 (12:51 +0100)]
_dbus_win_startup_winsock: be thread-safe
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68610
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Thu, 29 Aug 2013 11:50:39 +0000 (12:50 +0100)]
Comment some suspicious uses of static variables
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68610
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Thu, 29 Aug 2013 11:50:16 +0000 (12:50 +0100)]
_dbus_get_autolaunch_address: don't make argv static
This function could be accessed from any thread, which would mean it
scribbles on argv twice.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68610
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Thu, 29 Aug 2013 11:49:35 +0000 (12:49 +0100)]
_dbus_file_path_extract_elements_from_tail: don't misuse static variable
If we _dbus_verbose() from more than one thread at the same time,
we don't want to get into trouble with static variables (and I don't
think micro-optimizing this function is really worth it anyway).
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68610
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Fri, 30 Aug 2013 16:24:20 +0000 (17:24 +0100)]
Revert "Add a statically-initialized implementation of _dbus_lock() on glibc systems"
This reverts commit
83aaa9f359e90d3b8cae5d17f6d9ba4600cff68b.
This wasn't right: because it looked for a symbol from pthread.h,
modules could end up disagreeing about whether threading was enabled or
not.
Simon McVittie [Tue, 27 Aug 2013 13:35:47 +0000 (14:35 +0100)]
_dbus_get_tmpdir: be thread-safe
Sharing a static variable between threads is not safe in general,
and this function is used in the shared libdbus (for nonce files),
so it can't rely on being single-threaded.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68610
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Tue, 27 Aug 2013 12:53:42 +0000 (13:53 +0100)]
libdbus-1.la: have proper dependencies on Windows
Assigning to libdbus_1_la_DEPENDENCIES defeats Automake's normal
dependency logic, which makes libdbus-1.la depend on all the
static libraries that will go into it (it still had a corrct dependency
on the other objects, which go through a separate variable).
This meant libdbus-init-win wasn't necessarily built first.
Use EXTRA_libdbus_1_la_DEPENDENCIES to avoid that problem.
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68505
Acked-by: Ralf Habacker <ralf.habacker@freenet.de>
Ralf Habacker [Wed, 28 Aug 2013 12:16:21 +0000 (14:16 +0200)]
Generate autotools provided PACKAGE_.. and VERSION defines by a cmake macro.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=67072
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Sat, 29 Jun 2013 10:45:22 +0000 (12:45 +0200)]
Fixed mingw gcc 4.8.1 complains about double defined macros.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=67072
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Tue, 27 Aug 2013 15:32:56 +0000 (17:32 +0200)]
Fixed gcc 4.8.1 -Wformat warnings on windows.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=67072
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Chengwei Yang [Fri, 23 Aug 2013 09:19:51 +0000 (17:19 +0800)]
Fix debug output about dbus server ref count
dbus_server_disconnect() invokes dbus_server_unref() at the end of
function, the latter will print a trace about server ref count decrease
1. However, it doesn't invoke dbus_server_ref(), so there isn't a trace
about server ref count increase in debug output.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68303
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Chengwei Yang [Fri, 23 Aug 2013 09:13:46 +0000 (17:13 +0800)]
Fix comment about atomic operations
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68303
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Chengwei Yang [Fri, 23 Aug 2013 08:57:30 +0000 (16:57 +0800)]
Cleanup: simplify assertion check
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68303
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Fri, 23 Aug 2013 10:54:01 +0000 (11:54 +0100)]
fix whitespace
Chengwei Yang [Fri, 23 Aug 2013 08:52:38 +0000 (16:52 +0800)]
Cleanup: polish inotify backend
At previous, it will do get pid and print a verbose string per inotify
event, and then do send signal to the daemon.
This patch changes the behavior to get pid and print a verbose string
one time.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68303
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Chengwei Yang [Fri, 23 Aug 2013 08:49:39 +0000 (16:49 +0800)]
Cleanup: polish verbose mode checking
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Fri, 23 Aug 2013 10:46:36 +0000 (11:46 +0100)]
NEWS
Also belatedly mention dbus-run-session in 1.7.4.
Chengwei Yang [Fri, 23 Aug 2013 07:52:18 +0000 (15:52 +0800)]
DBus Spec: fix examples namespace to com.example
There are a lot of examples in DBus Spec, and some of them just use the
namespace org.freedesktop, and so as object namespace org/freedesktop.
However, this is quite confusing.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66481
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Wed, 5 Jun 2013 18:58:33 +0000 (19:58 +0100)]
dbus-run-session: remove various extra variables from the environment
DBUS_SESSION_BUS_PID is not mandatory to set, but we should unset it
if present, since it points to a different session's bus. Likewise for
DBUS_SESSION_BUS_WINDOWID.
Similarly, if DBUS_STARTER_BUS_TYPE and DBUS_STARTER_ADDRESS
are set (as they would be under GNOME Terminal 3.8, see
<https://bugs.freedesktop.org/show_bug.cgi?id=63119>) then they
are likely to point to a different session's bus.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39196
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Colin Walters <walters@verbum.org>
Simon McVittie [Wed, 5 Jun 2013 18:58:22 +0000 (19:58 +0100)]
Export dbus_setenv() as a utility function
It's sufficiently portable that GLib has an equivalent, and I really
don't want to have to either open-code it in dbus-run-session or
link dbus-run-session statically. We have enough statically-linked
rubbish already.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39196
Reviewed-by: Colin Walters <walters@verbum.org>
Simon McVittie [Fri, 23 Aug 2013 10:09:35 +0000 (11:09 +0100)]
Revert "Factor out DBusAuthorization from DBusTransport"
This reverts commit
600621dbc8073527a958091316eddfbb490c1032.
Simon McVittie [Fri, 23 Aug 2013 10:09:34 +0000 (11:09 +0100)]
Revert "Actually use DBusAuthorization in DBusAuth EXTERNAL mech"
This reverts commit
d5d25b5efd35d8d9bbb9d58cae441debf8f7ded6.
Simon McVittie [Fri, 23 Aug 2013 10:09:33 +0000 (11:09 +0100)]
Revert "Add new files really."
This reverts commit
78c447173dfba167ac8082652c02e453e4b519ce.
Simon McVittie [Fri, 23 Aug 2013 10:09:32 +0000 (11:09 +0100)]
Revert "Rename authorized_identity in authenticated_identity for clarity sake."
This reverts commit
ef82b381524d30684a30b32b3b9016ed4229290c.
Simon McVittie [Fri, 23 Aug 2013 10:09:31 +0000 (11:09 +0100)]
Revert "Fixed rejected hunk complete."
This reverts commit
541063a3ab568db8302fbce3c15b22cdff154517.
Simon McVittie [Fri, 23 Aug 2013 10:09:31 +0000 (11:09 +0100)]
Revert "Enable anonymous authorization for tests"
This reverts commit
22fc03d274f186a788efbdbe6b6dfcff1ad474df.
Simon McVittie [Fri, 23 Aug 2013 10:09:30 +0000 (11:09 +0100)]
Revert "Remove refcounting from DBusAuth and DBusAuthorization"
This reverts commit
7f6d7229d8812d985d544cf5dd3636865c5abc81.
Simon McVittie [Fri, 23 Aug 2013 10:09:29 +0000 (11:09 +0100)]
Revert "dbus_connection_set_allow_anonymous(): fix doc"
This reverts commit
a4722d4480de77af6a0c8201882731dc35777d36.
Simon McVittie [Fri, 23 Aug 2013 10:09:28 +0000 (11:09 +0100)]
Revert "trivial: re-word authorization failure message"
This reverts commit
65cd1208e0559fffe4ba82ef10c6491744869b09.
Simon McVittie [Fri, 23 Aug 2013 10:09:21 +0000 (11:09 +0100)]
Revert "Remove transport's call to _dbus_authorization_do_authorization()."
This reverts commit
64e50dd167993fb2344d2d3be18bb0d5820b5b26.
Cosimo Alfarano [Thu, 22 Aug 2013 23:56:48 +0000 (01:56 +0200)]
Remove transport's call to _dbus_authorization_do_authorization().
All mechs do authorization before answering OK/REJECT.
There is no reason to run a second round of authorization which will
return the same answer of the first time (when OK) or will never be
reched (if REJECTed).
Bug: http://bugs.freedesktop.org/show_bug.cgi?id=39720
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Fri, 23 Aug 2013 01:10:15 +0000 (03:10 +0200)]
Manual rebase fix.
Simon McVittie [Mon, 12 Mar 2012 13:13:55 +0000 (13:13 +0000)]
Add a test-case for trying to connect with the wrong GUID
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39720
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Fri, 23 Aug 2013 01:01:53 +0000 (03:01 +0200)]
trivial: re-word authorization failure message
Bug: http://bugs.freedesktop.org/show_bug.cgi?id=39720
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Fri, 23 Aug 2013 00:57:27 +0000 (02:57 +0200)]
Add a simple manual test for authentication/authorization.
Bug: http://bugs.freedesktop.org/show_bug.cgi?id=39720
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Cosimo Alfarano [Tue, 18 Oct 2011 11:08:00 +0000 (12:08 +0100)]
dbus_connection_set_allow_anonymous(): fix doc
Bug: http://bugs.freedesktop.org/show_bug.cgi?id=39720
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Cosimo Alfarano [Fri, 23 Aug 2013 00:12:46 +0000 (02:12 +0200)]
Remove refcounting from DBusAuth and DBusAuthorization
Those structs are for DBusTransport internal use, they should not be
referenced outside it.
The transport needs only to allocate memory on initialization and free
it on finalization.
The lifecycle for the two allocated structs is DBusTransport lifecycle
and at DBusTransport's finalization its connection is already
disconnected.
The assumption is that the transport owns a reference for any object the
two structs holds a reference for (particularly DBusConnection)
Bug: http://bugs.freedesktop.org/show_bug.cgi?id=39720
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Cosimo Alfarano [Fri, 7 Oct 2011 10:25:00 +0000 (11:25 +0100)]
Enable anonymous authorization for tests
Now that authorization is in SASL mechs, enable anonymous authorizations
when we are testing anonymous mechs functionality
Bug: http://bugs.freedesktop.org/show_bug.cgi?id=39720
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Thu, 22 Aug 2013 23:46:56 +0000 (01:46 +0200)]
Fixed rejected hunk complete.
Cosimo Alfarano [Thu, 22 Aug 2013 23:42:54 +0000 (01:42 +0200)]
Rename authorized_identity in authenticated_identity for clarity sake.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39720
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Thu, 22 Aug 2013 23:36:31 +0000 (01:36 +0200)]
Add new files really.
Cosimo Alfarano [Thu, 22 Aug 2013 23:30:55 +0000 (01:30 +0200)]
Actually use DBusAuthorization in DBusAuth EXTERNAL mech
Also update the authentication script so that DBusAuthorization default
rules are used during testing.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39720
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Cosimo Alfarano [Thu, 22 Aug 2013 23:11:10 +0000 (01:11 +0200)]
Factor out DBusAuthorization from DBusTransport
In order to authorize/reject a connection in a polite way, instead of
cutting it off after authentication succeed and Hello() is
sent, because authorization failed, we need to factor out some
authorization bits from DBusTransport and pass them to DBusAuth.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39720
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Thu, 22 Aug 2013 22:43:02 +0000 (00:43 +0200)]
Fix confusion between "is it authenticated?" and "try to authenticate"
Historically, _dbus_transport_get_is_authenticated() has had the
side-effect of trying to advance the authentication state machine (if
there's enough buffered input to do so). This seems an inappropriate
activity for what looks like a simple getter.
Split it into _dbus_transport_try_to_authenticate (which does what it
always used to do) and _dbus_transport_peek_is_authenticated (which
is the simple getter version).
To minimize the difference in behaviour for the stable branch of D-Bus,
I've only used _dbus_transport_peek_is_authenticated where it was used
in an assertion, which should clearly not have side effects (and I've
checked that the asserting function cannot be called until both
authentication and authorization have completed). Replacing most of the
calls to get_is_authenticated with try_to_authenticate is a possible
piece of future work.
Based on patches from Cosimo Alfarano, who noticed this
assertion-with-side-effects.
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
https://bugs.freedesktop.org/show_bug.cgi?id=39720
Reviewed-by: Cosimo Alfarano <cosimo.alfarano@collabora.com>
Cosimo Alfarano [Tue, 11 Oct 2011 15:41:31 +0000 (16:41 +0100)]
Unset/free also windows user function, finalizing the connection
It's currently not used, but it's safer to unset it and free user's
data for avoiding future head-aches
https://bugs.freedesktop.org/show_bug.cgi?id=39720
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Thu, 22 Aug 2013 19:46:51 +0000 (20:46 +0100)]
More NEWS
Chengwei Yang [Tue, 16 Jul 2013 06:34:59 +0000 (14:34 +0800)]
Fix reference doc in comments
Chengwei Yang [Fri, 12 Jul 2013 03:34:31 +0000 (11:34 +0800)]
Move function to the right place where it supposed to be used
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Chengwei Yang [Tue, 2 Jul 2013 05:31:38 +0000 (13:31 +0800)]
DBus Spec: Fix sample service file
There are two errors in the sample service file.
First, a typo, Names should be Name.
Second, can not specify multiple names.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66481
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Chengwei Yang [Thu, 27 Jun 2013 04:56:20 +0000 (12:56 +0800)]
Ignore more unused staff if build with tests but without asserts
https://bugs.freedesktop.org/show_bug.cgi?id=66069
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Chengwei Yang [Thu, 20 Jun 2013 14:03:49 +0000 (22:03 +0800)]
Doc: fix incorrect param names, missing params, non-exist params
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65755
Ivan Romanov [Thu, 22 Aug 2013 18:11:23 +0000 (19:11 +0100)]
Use iface instead of interface in function parameters
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66493
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Wed, 27 Feb 2013 19:22:30 +0000 (19:22 +0000)]
Document GetAdtAuditSessionData and GetConnectionSELinuxSecurityContext
These are only part of the DBus interface because dbus-daemon didn't
previously support multiple interfaces. I don't know enough about
either of these security frameworks to know what they return, but
perhaps one day someone who knows about Solaris or SELinux will tell
us...
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54445
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Simon McVittie [Thu, 22 Aug 2013 17:21:58 +0000 (18:21 +0100)]
GetConnectionCredentials: add
The initial set of credentials is just UnixUserID and ProcessID.
The rest can follow when someone is sufficiently interested to actually
test them.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54445
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
[rename a function that Ralf found unclear -smcv]
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Chengwei Yang [Fri, 19 Jul 2013 02:04:40 +0000 (10:04 +0800)]
Fix build with "--enable-stats"
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54445
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Thu, 22 Aug 2013 17:03:59 +0000 (18:03 +0100)]
Merge branch 'dbus-1.6'
Conflicts:
NEWS
Simon McVittie [Thu, 22 Aug 2013 17:03:24 +0000 (18:03 +0100)]
NEWS for 1.6
Simon McVittie [Thu, 22 Aug 2013 17:02:42 +0000 (18:02 +0100)]
NEWS
Ralf Habacker [Mon, 19 Aug 2013 19:29:18 +0000 (21:29 +0200)]
Fixed compiler warning on windows.
https://bugs.freedesktop.org/show_bug.cgi?id=61874
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Mon, 12 Aug 2013 15:46:48 +0000 (17:46 +0200)]
Documentation fix.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=29666
Reviewed-by: Chengwei Yang <chengwei.yang.cn@gmail.com>
Ralf Habacker [Fri, 9 Aug 2013 14:14:35 +0000 (16:14 +0200)]
Fixed remaining issues.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66060
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Thu, 8 Aug 2013 21:23:11 +0000 (23:23 +0200)]
Add debug messages to load_ex_ip_helper_procedures().
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66060
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Thu, 8 Aug 2013 20:53:40 +0000 (22:53 +0200)]
Refactored get_pid_from_extended_tcp_table() and get_pid_from_tcp_ex_table() to be more equal.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66060
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Thu, 8 Aug 2013 20:42:35 +0000 (22:42 +0200)]
Fix for broken wine AllocateAndGetTcpExTableFromStack() implementation.
On wine (tested with 1.5.6) the mentioned function could not be located in
iphlpapi.dll using LoadLibrary()/GetProcAddress(), which is the prefered
method to get a tcp peer pid on WinXP <= SP2.
To workaround this limitation we use GetExtendedTcpTable() first to get the peer pid.
If this fails (which happens at least on real WinXP SP2) we then use
AllocateAndGetTcpExTableFromStack() to get the pid.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66060
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Thu, 8 Aug 2013 14:52:54 +0000 (16:52 +0200)]
Add doc to load_ex_ip_helper_procedures().
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66060
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Thu, 8 Aug 2013 14:48:04 +0000 (16:48 +0200)]
Only take process id of localhost client connection entries.
This patch makes sure, that the process id is fetched only from localhost
client address connections fetched from the tcp table.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66060
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Wed, 7 Aug 2013 18:47:55 +0000 (20:47 +0200)]
Fixed bug of unsupported GetExtendTcpTable() on Windows XP SP2 and earlier.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66060
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Sat, 29 Jun 2013 11:46:53 +0000 (13:46 +0200)]
Dump fetched sid on return of _dbus_getsid().
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66060
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Ralf Habacker [Sat, 29 Jun 2013 11:45:41 +0000 (13:45 +0200)]
Add WINXP <= SP3 support to _dbus_getsid().
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66060
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Colin Walters [Wed, 24 Jul 2013 20:48:58 +0000 (21:48 +0100)]
test/marshal: Ensure we use suitably aligned buffers
This test was failing on s390; though it could fail
on other platforms too. Basically we need to be sure
we're passing at least word-aligned buffers to the
demarshalling code. malloc() will do that for us.
https://bugs.freedesktop.org/show_bug.cgi?id=67279
Colin Walters [Wed, 24 Jul 2013 20:48:58 +0000 (21:48 +0100)]
test/marshal: Ensure we use suitably aligned buffers
This test was failing on s390; though it could fail
on other platforms too. Basically we need to be sure
we're passing at least word-aligned buffers to the
demarshalling code. malloc() will do that for us.
https://bugs.freedesktop.org/show_bug.cgi?id=67279
Simon McVittie [Mon, 1 Jul 2013 11:24:53 +0000 (12:24 +0100)]
NEWS for 1.7.x
Chengwei Yang [Fri, 28 Jun 2013 12:26:28 +0000 (20:26 +0800)]
cmake: do not bind to any particular POSIX C standard
This caused build failures on FreeBSD. Defining _POSIX_C_SOURCE to
a particular version will disable common non-POSIX extensions like
PF_UNIX, and on some systems will also disable features of later
POSIX versions, like IPv6. If we don't ask for a specific version,
we'll get some sort of sensible default.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66257
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
[made the commit message more concise -smcv]
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Simon McVittie [Mon, 1 Jul 2013 11:16:05 +0000 (12:16 +0100)]
Merge branch 'dbus-1.6'
Conflicts:
NEWS
Simon McVittie [Mon, 1 Jul 2013 11:15:04 +0000 (12:15 +0100)]
NEWS for 1.6.x
Simon McVittie [Mon, 1 Jul 2013 11:14:02 +0000 (12:14 +0100)]
Make the test for #53499 more obviously correct