summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2015-07-31 18:56:38 +0200
committerDavid Herrmann <dh.herrmann@gmail.com>2015-07-31 18:56:38 +0200
commitb2a0ac5e5b29c73ca7c0da23369a4769d5a91ddd (patch)
treece5f40367e3dd1122ab0cb045080b4f1d3b3fb79
parent10fa421cd2abdc2ae1a07f7c13bfaa4ee6d6de4f (diff)
downloadsystemd-224.tar.gz
systemd-224.tar.bz2
systemd-224.zip
bus-proxy: allow empty arguments to UpdateActivationEnvironment()v224
There is no reason to prevent empty argument lists on UpdateActivationEnvironment(). Make sure we don't fail, but still skip the call to pid1.
-rw-r--r--src/bus-proxyd/driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c
index ad164a5e02..951f515808 100644
--- a/src/bus-proxyd/driver.c
+++ b/src/bus-proxyd/driver.c
@@ -707,8 +707,8 @@ int bus_proxy_process_driver(Proxy *p, sd_bus *a, sd_bus *b, sd_bus_message *m,
if (r < 0)
return synthetic_reply_method_errno(m, r, NULL);
- if (!args)
- return synthetic_reply_method_errno(m, -EINVAL, NULL);
+ if (strv_isempty(args)) /* nothing to do? */
+ return synthetic_reply_method_return(m, NULL);
r = sd_bus_message_new_method_call(
a,