aboutgitcodebugslistschat
path: root/passt.1
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-08-26 14:58:33 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-08-30 19:42:52 +0200
commitaae2a9bbf7d1c5144702be4b1a3e496ae24d12aa (patch)
tree7020e7739819cf35519ccc12587cecfaa1fa0bc7 /passt.1
parentbf95322fc1ef2d0d7a21cb0e6a9bf01902024859 (diff)
downloadpasst-aae2a9bbf7d1c5144702be4b1a3e496ae24d12aa.tar
passt-aae2a9bbf7d1c5144702be4b1a3e496ae24d12aa.tar.gz
passt-aae2a9bbf7d1c5144702be4b1a3e496ae24d12aa.tar.bz2
passt-aae2a9bbf7d1c5144702be4b1a3e496ae24d12aa.tar.lz
passt-aae2a9bbf7d1c5144702be4b1a3e496ae24d12aa.tar.xz
passt-aae2a9bbf7d1c5144702be4b1a3e496ae24d12aa.tar.zst
passt-aae2a9bbf7d1c5144702be4b1a3e496ae24d12aa.zip
conf: Use "-D none" and "-S none" instead of missing empty option arguments
Both the -D (--dns) and -S (--search) options take an optional argument. If the argument is omitted the option is disabled entirely. However, handling the optional argument requires some ugly special case handling if it's the last option on the command line, and has potential ambiguity with non-option arguments used with pasta. It can also make it more confusing to read command lines. Simplify the logic here by replacing the non-argument versions with an explicit "-D none" or "-S none". Signed-off-by: David Gibson <david@gibson.dropbear.id.au> [sbrivio: Reworked logic to exclude redundant/conflicting options] Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'passt.1')
-rw-r--r--passt.17
1 files changed, 4 insertions, 3 deletions
diff --git a/passt.1 b/passt.1
index 9bed946..14b01b2 100644
--- a/passt.1
+++ b/passt.1
@@ -171,7 +171,7 @@ version.
Use \fIaddr\fR (IPv4 or IPv6) for DHCP, DHCPv6, NDP or DNS forwarding, as
configured (see options \fB--no-dhcp-dns\fR, \fB--dhcp-dns\fR,
\fB--dns-forward\fR) instead of reading addresses from \fI/etc/resolv.conf\fR.
-This option can be specified multiple times, and a single, empty option disables
+This option can be specified multiple times. Specifying \fB-D none\fR disables
usage of DNS addresses altogether.
.TP
@@ -186,8 +186,9 @@ This option can be specified zero to two times (once for IPv4, once for IPv6).
.BR \-S ", " \-\-search " " \fIlist
Use space-separated \fIlist\fR for DHCP, DHCPv6, and NDP purposes, instead of
reading entries from \fI/etc/resolv.conf\fR. See options \fB--no-dhcp-search\fR
-and \fB--dhcp-search\fR. A single, empty option disables the DNS domain search
-list altogether.
+and \fB--dhcp-search\fR. \fB--search none\fR disables the DNS domain search
+list altogether (if you need to search a domain called "none" you can use
+\fB--search none.\fR).
.TP
.BR \-\-no-dhcp-dns " " \fIaddr