[PATCH] Resolve PROTOREMOTEHOST or PROTOLOCALHOST when only one is specified

From: George Matsumura <gorg_at_gorgnet.net>
Date: Tue, 30 Jul 2024 01:11:13 -0600

Previously, specification of PROTOLOCALHOST on the command line with the -l
option would lead to PROTOREMOTEHOST not being resolved. This did not seem to
be the intended behaviour, especially as the call to s6dns_resolven_parse_g
works with any combination of the state of previous hostname definitions. This
change alters the conditional to conduct the necessary resolutions in all
cases. I apologize if I misinterpreted or was mistaken about anything.

---
 src/conn-tools/s6-tcpserver-access.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/conn-tools/s6-tcpserver-access.c b/src/conn-tools/s6-tcpserver-access.c
index 0bb1764..d528bd0 100644
--- a/src/conn-tools/s6-tcpserver-access.c
+++ b/src/conn-tools/s6-tcpserver-access.c
_at__at_ -318,7 +318,7 _at__at_ int main (int argc, char const *const *argv)
       blob[1].options = S6DNS_O_RECURSIVE ;
       data[1].rtype = S6DNS_T_PTR ;
     }
-    if (!localname && !remotelen && !s6dns_resolven_parse_g(blob + !!localname, !localname + !remotelen, &infinite))
+    if (!localname || !remotelen && !s6dns_resolven_parse_g(blob + !!localname, !localname + !remotelen, &infinite))
     {
       if (verbosity >= 3) strerr_warnwu2x("resolve IP addresses: ", s6dns_constants_error_str(errno)) ;
       if (flagfatal)
-- 
2.45.2

Received on Tue Jul 30 2024 - 09:11:13 CEST