From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 3 Feb 2022 14:57:00 +0000 (+0100)
Subject: man: systemd-stdio-bridge doesn't connect "two busses"
X-Git-Tag: v251-rc1~349
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2012854f511c31504c52e9c90669c09ea5eb572;p=thirdparty%2Fsystemd.git

man: systemd-stdio-bridge doesn't connect "two busses"

In D-Bus, clients connect to a bus (the usual case), or use direct
questions to each other (the unusual case). A bus is a program one can
connect to and implemented by dbus-daemon or dbus-broker. HOwever,
busses never connect between each other, that doesn't exist. Hence don't
claim so.

This is probably confusion about the fact that sd-bus calls D-Bus
connection objects just "sd_bus" for simplicity, given they are used in
99% of the cases to connect to a bus — only in exceptional cases they
are used for direct connections between peers without involving a bus.

Follow-up for b7bb58ef70b0c876941a1c31ed4e2f5f1dc5ed0e
---

diff --git a/man/systemd-stdio-bridge.xml b/man/systemd-stdio-bridge.xml
index 002a91b1299..0dce5659d7c 100644
--- a/man/systemd-stdio-bridge.xml
+++ b/man/systemd-stdio-bridge.xml
@@ -31,12 +31,11 @@
   <refsect1>
     <title>Description</title>
 
-    <para><command>systemd-stdio-bridge</command> implements a proxy for a D-Bus endpoint. It expects to
-    receive an open connection to a bus when started, and will also connect to a (different) bus as a
-    client. It will then act as a server on the first connection, and forward messages between the two
-    busses. This program is suitable for socket activation: the first connection may be a pipe or a socket
-    and must be passed as either standard input, or as an open file descriptor according to the protocol
-    described in
+    <para><command>systemd-stdio-bridge</command> implements a proxy between STDIN/STDOUT and a D-Bus bus. It
+    expects to receive an open connection via STDIN/STDOUT when started, and will create a new connection to
+    the specified bus. It will then forward messages between the two connections. This program is suitable
+    for socket activation: the first connection may be a pipe or a socket and must be passed as either
+    standard input, or as an open file descriptor according to the protocol described in
     <citerefentry><refentrytitle>sd_listen_fds</refentrytitle><manvolnum>3</manvolnum></citerefentry>. The
     second connection will be made by default to the local system bus, but this can be influenced by the
     <option>--user</option>, <option>--system</option>, <option>--machine=</option>, and
diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
index 33701e775ea..c851059a095 100644
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -27,7 +27,7 @@ static bool arg_user = false;
 
 static int help(void) {
         printf("%s [OPTIONS...]\n\n"
-               "Forward messages between two D-Bus busses via a pipe or socket.\n\n"
+               "Forward messages between a pipe or socket and a D-Bus bus.\n\n"
                "  -h --help              Show this help\n"
                "     --version           Show package version\n"
                "  -p --bus-path=PATH     Path to the bus address (default: %s)\n"