summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-11-01Imported Upstream version 1.7.8upstream/1.7.8Simon McVittie28-2901/+2007
2013-11-011.7.8Simon McVittie2-3/+27
2013-11-01bus/selinux: Fix previous commit for CAP_AUDIT_WRITE retentionColin Walters1-1/+7
As soon as capng_clear() is called, we won't appear to have CAP_AUDIT_WRITE. Fix this by checking for it before resetting the libcap state. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49062 Tested-by: Laurent Bigonville <bigon@debian.org> Reviewed-by: Laurent Bigonville <bigon@debian.org> Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Lennart Poettering <lennart@poettering.net>
2013-11-01Revert "start dbus-specification 0.23"Simon McVittie1-10/+2
This reverts commit c8bc5f24b721bc03679c44669cf5e655c1e99b5f. Nothing changed since 0.22.
2013-11-01Merge branch 'dbus-1.6'Simon McVittie1-1/+4
Conflicts: NEWS configure.ac
2013-11-01Start on 1.6.20Simon McVittie2-1/+4
2013-11-011.6.18Simon McVittie2-3/+10
2013-11-01Close unused inherited file descriptorChengwei Yang1-0/+2
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68559 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-11-01Add comments describing how "compile with journald, run without" worksSimon McVittie1-2/+5
2013-11-01Handle activated child stdout/stderr correctly in systemd environmentChengwei Yang2-2/+36
In systemd environment, dbus-daemon will run as no-fork mode since this is the recommended practice of systemd. In that scenario, child activated by dbus-daemon will inherit dbus-daemon standard streams, includes stdin/stdout/stderr. stdin will be redirected to /dev/null by systemd and stdout/stderr will be catched by systemd log subsystem. Since the child inherit stdout/stderr from dbus-daemon, so from systemd journal log, the child log output will be identified with dbus-daemon identifier. So it's a little confusing. This patch redirects the child stdout/stderr to systemd journal stream, and with its owned service name as identifier. However, thing not fixed perfectly due to the socket ucred of the child is owned by dbus-daemon, so the pid isn't the real pid of the chile. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68559 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-11-01DBusBabysitter: change executable to log_nameChengwei Yang5-31/+57
DBusBabysitter->executable is defined as executable name to use in error messages. However, if servicehelper used, then the executable name is servicehelper. It's not much help because we couldn't figure out which service we're trying to activated if error happens. In the following patch, we'll use service name to be activated as the child log identifier and add a parameter to _dbus_spawn_async_with_babysitter() to pass the log identifier. Since this is not the case in test, so executable changed to log_name. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68559 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-11-01Update configurable elements for dbus-daemon manualChengwei Yang1-0/+31
Update three configurable elements for dbus-daemon manual, <syslog>, <pidfile> and <allow_anonymous>, all of them are undocumented so far. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69125 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-11-01Remove unnecessary dbus_setenv()Chengwei Yang1-6/+0
DBUS_ACTIVATION_ADDRESS changed to DBUS_STARTER_ADDRESS and DBUS_ACTIVATION_BUS_TYPE changed to DBUS_STARTER_BUS_TYPE since 2005 by this commit - 8873c90 So the dbus_setenv() which used to unset the above two wrong environment variables has no effect in fact. And giving that setenv(3) and putenv(3) are not threadsafe, so it's better to remove them. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68308 Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de> Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Acked-by: Colin Walters <walters@verbum.org>
2013-11-01transaction_free: factor outSimon McVittie1-10/+12
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=60859 Reviewed-by: Chengwei Yang [removed unused variable based on review -smcv]
2013-11-01dbus-spawn: draw a diagramSimon McVittie1-0/+42
There are enough pipes, fds and processes here that it's important to keep track of them. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=60859
2013-11-01Use SIGHUP without check in UNIX environmentChengwei Yang1-4/+0
As Simon's comment https://bugs.freedesktop.org/show_bug.cgi?id=66068#c8 we can do this in UNIX environment. Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-11-01Test: add test cases for message parsingChengwei Yang1-0/+205
Add test cases for testing: * If more arguments than requested are present, the requested arguments are returned and the extra arguments are ignored. * If arguments parse failed, ensure we didn't leak any memory or unix fd Bug: https://bugs.freedesktop.org/show_bug.cgi?id=21259 [added a check for fd leaks around verify_test_message_args_ignored() -smcv] Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-11-01Fix memory or unix fd may leak in dbus_message_iter_get_args_valistChengwei Yang1-4/+67
This is an aged bug since 2009, so let's fix it. Say if a previous parsing for unix fd or array of string successfully but then a later element parsing fail, then the unix fd or array of string leaked. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=21259 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-11-01Correctly set number of arguments already handledChengwei Yang1-3/+4
At privous, which increments the number of arguments already handled in the last of loop, however, if there is any invalid argument, then it will "goto out" and the number of arguments already handled is now incorrect. A following patch will use the number of arguments already handled as a loop terminate condition, so it's good to fix it before. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=21259 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-23dbus-spawn: correct a comment that falsely claimed thread-safetySimon McVittie1-3/+8
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=60859 Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
2013-10-23_dbus_spawn_async_with_babysitter: correct documentationSimon McVittie1-1/+1
env is used as you'd expect now. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=60859 Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
2013-10-23Merge branch 'dbus-1.6'Simon McVittie1-1/+29
2013-10-23path_namespace='/' should match everythingSimon McVittie1-1/+29
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=70799 Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk> Reviewed-by: Ryan Lortie <desrt@desrt.ca>
2013-10-10$(in_data) is meant to contain the .in filesSimon McVittie1-1/+1
Reviewed-by: Colin Walters
2013-10-10test: Update build for previous commitColin Walters1-1/+1
It should now be in in_data so we find it in $(srcdir).
2013-10-10Use TEST_LISTEN in incoming-listen.conf.in instead of unix only hardcoded ↵Ralf Habacker2-1/+2
address Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68506 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-10start dbus-specification 0.23Simon McVittie1-2/+10
2013-10-09start 1.7.8Simon McVittie2-1/+6
2013-10-09Imported Upstream version 1.7.6upstream/1.7.6Simon McVittie159-3310/+4966
2013-10-09D-Bus 1.7.6, spec 0.22Simon McVittie3-5/+10
2013-10-09yet more NEWSSimon McVittie1-3/+15
2013-10-09dbus-monitor: keep backwards compatibilityChengwei Yang1-6/+25
eavesdropping as a match rule key introduced in DBus 1.5.6, and the privous implementation doesn't keep backwards compatibility with older dbus-daemon. And the reference dbus-daemon implementation just fail if unknwon key found in match rule, this is undefined hehavior in DBus Sepcification. Also there is a feature request for change this hehavior to "ignore unknown key in match rule", See https://bugs.freedesktop.org/show_bug.cgi?id=66114 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66107 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-09dbus-send: replace --address with --peer and --bus.Andrey Mazo1-6/+31
--peer is a direct substitute for --address. With --bus dbus-send registers on bus given by ADDRESS, thus allowing messages to be sent to the bus. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48816 [adjusted to apply to current master -smcv] Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-09Revert "dbus-send: replace --address"... to fix attributionSimon McVittie1-31/+6
This reverts commit 5b74af796c8f1d9f3f60594f22c6bfd4c097ad8b.
2013-10-09Remove unused key-word of DBus .service fileChengwei Yang1-1/+0
Key-word "Group" of DBus .service file hasn't been used since it was introduced in 2007, so it's fine to remove it. https://bugs.freedesktop.org/show_bug.cgi?id=19158 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-09launch-helper: fix error code parsingChengwei Yang3-2/+10
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66728 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-08Merge branch 'dbus-1.6'Simon McVittie0-0/+0
Conflicts: NEWS configure.ac
2013-10-081.6.17Simon McVittie2-1/+4
2013-10-08Spec: document multiple .service files own the same well known nameChengwei Yang1-3/+22
In current dbus-daemon(1) implement, system .serivce must named after its owned name, but this is not the case for session .service. For session service, the result of multiple .service files own the same well known name is undefined since readdir(3) doesn't return dirent in a defined sequence. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66608 [added some </para><para> -smcv] Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-08Unify the way to find dbus-daemon test binaryChengwei Yang4-36/+34
There are two ways to find the dbus-daemon for testing. The first one is defined as string at compile stage and the second one is export it from test environment. The first way has limitation that after defined, it's static string, so it's impossible to run installable check. So let's unify to the second way. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37849 [added missing "}" -smcv] Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-08dbus-send: replace --address with --peer and --bus.Simon McVittie1-6/+31
--peer is a direct substitute for --address. With --bus dbus-send registers on bus given by ADDRESS, thus allowing messages to be sent to the bus. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48816 [adjusted to apply to current master -smcv] Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-081.6.14Simon McVittie2-3/+3
2013-10-08fix off by one error message (#13305)Chengwei Yang1-10/+10
This patch is based on the patch created by John (J5) Palmieri <johnp@redhat.com> plus to fix array of string assignment. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=13305 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-08dbus-message.c: unused variable bytes_read in _dbus_message_loader_get_bufferVasiliy Balyasnyy5-28/+14
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=70218 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-08dbus-monitor: remove redundant match rulesChengwei Yang1-16/+1
Currently, DBus Specification only consists of four message types, so to monitor all the types of message, no need to match all of them but just left it empty is OK. Signed-off-by: Chengwei Yang <chengwei.yang@intel.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66107 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-08NEWSSimon McVittie1-0/+8
2013-10-08spec: briefly describe Name, Exec and User keysSimon McVittie1-0/+13
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66608 Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
2013-10-08spec: system services' service description files have constrained namesSimon McVittie1-0/+13
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66608 Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>
2013-10-08Do not suggest user the next step after executed autogen.shChengwei Yang1-7/+1
We assume that user/developer who building dbus from source code are familiar with the standard 'autogen.sh, configure, make, make install' build process, so print such a notice doesn't make a lot of sense. In addition, on *BSD platform, the pre-installed 'make' doesn't work at all since gnu make is required. However, it named to 'gmake' on *BSD platform. So the notice will makes new comer confused. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65415 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
2013-10-08Add support for configuring --with-valgrind=autoSimon McVittie1-0/+4
This is the configuration I'd like to use for the "debug build" of dbus on Debian - if we use --with-valgrind=yes, we have to hard-code knowledge of which architectures do and don't have Valgrind in two places instead of just one. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=56925 Reviewed-by: Chengwei Yang <chengwei.yang@intel.com>