projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ea89a11
)
sd-bus: use -- when passing arguments to ssh (#6706)
author
Evgeny Vereshchagin
<evvers@ya.ru>
Thu, 31 Aug 2017 08:38:30 +0000
(11:38 +0300)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 31 Aug 2017 08:38:30 +0000
(10:38 +0200)
This prevents `systemctl` from runnning /bin/touch when the following
command is used:
```
systemctl -H '-oProxyCommand=/bin/touch i-shouldnt-be-here' show-environment
```
src/libsystemd/sd-bus/sd-bus.c
patch
|
blob
|
history
diff --git
a/src/libsystemd/sd-bus/sd-bus.c
b/src/libsystemd/sd-bus/sd-bus.c
index
261152b
..
aea050e
100644
(file)
--- a/
src/libsystemd/sd-bus/sd-bus.c
+++ b/
src/libsystemd/sd-bus/sd-bus.c
@@
-1186,7
+1186,7
@@
int bus_set_address_system_remote(sd_bus *b, const char *host) {
if (!e)
return -ENOMEM;
- c = strjoina(",argv
4
=--machine=", m);
+ c = strjoina(",argv
5
=--machine=", m);
}
}
@@
-1196,7
+1196,7
@@
int bus_set_address_system_remote(sd_bus *b, const char *host) {
return -ENOMEM;
}
- b->address = strjoin("unixexec:path=ssh,argv1=-xT,argv2=
", e, ",argv3
=systemd-stdio-bridge", c);
+ b->address = strjoin("unixexec:path=ssh,argv1=-xT,argv2=
--,argv3=", e, ",argv4
=systemd-stdio-bridge", c);
if (!b->address)
return -ENOMEM;