From aae2a9bbf7d1c5144702be4b1a3e496ae24d12aa Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 26 Aug 2022 14:58:33 +1000 Subject: 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 [sbrivio: Reworked logic to exclude redundant/conflicting options] Signed-off-by: Stefano Brivio --- passt.1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'passt.1') 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 -- cgit v1.2.3