commit 84349e2492d315fc25c137f659c46ad76a415e3e
Author:     Jacob Welsh <jfw>
AuthorDate: Fri Nov 25 01:21:04 2022 +0000
Commit:     Jacob Welsh <jfw>
CommitDate: Fri Nov 25 01:21:04 2022 +0000
Type: portability fix

    lib-program-client: trim test that breaks on no-ipv6 kernels; correct function name in error message
    
    http://fixpoint.welshcomputing.com/2022/jwrd-logs-for-Nov-2022/#5538

diff --git a/src/lib-program-client/program-client-remote.c b/src/lib-program-client/program-client-remote.c
index 858abe6569..3f2b587004 100644
--- a/src/lib-program-client/program-client-remote.c
+++ b/src/lib-program-client/program-client-remote.c
@@ -434,7 +434,7 @@ program_client_net_connect_real(struct program_client_remote *prclient)
 	if ((fd = net_connect_ip(prclient->ips, prclient->port,
 				 (prclient->ips->family == AF_INET ?
 				  &net_ip4_any : &net_ip6_any))) < 0) {
-		e_error(pclient->event, "connect(%s) failed: %m", address);
+		e_error(pclient->event, "net_connect_ip(%s) failed: %m", address);
 		prclient->to_retry = timeout_add_short(
 			0, program_client_net_connect_again, prclient);
 		return;
diff --git a/src/lib-program-client/test-program-client-net.c b/src/lib-program-client/test-program-client-net.c
index ed7d68db79..10c0b0d604 100644
--- a/src/lib-program-client/test-program-client-net.c
+++ b/src/lib-program-client/test-program-client-net.c
@@ -478,7 +478,7 @@ static void test_program_noreply(void)
 static void test_program_refused(void)
 {
 	struct program_client *pc;
-	struct ip_addr ips[4];
+	struct ip_addr ips[3];
 	int ret = -2;
 
 	const char *const args[] = {
@@ -487,10 +487,9 @@ static void test_program_refused(void)
 
 	test_begin("test_program_refused");
 
-	if (net_addr2ip("::1", &ips[0]) < 0 ||
-	    net_addr2ip("127.0.0.3", &ips[1]) < 0 ||
-	    net_addr2ip("127.0.0.2", &ips[2]) < 0 ||
-	    net_addr2ip("127.0.0.1", &ips[3]) < 0) {
+	if (net_addr2ip("127.0.0.3", &ips[0]) < 0 ||
+	    net_addr2ip("127.0.0.2", &ips[1]) < 0 ||
+	    net_addr2ip("127.0.0.1", &ips[2]) < 0) {
 		i_fatal("Cannot convert addresses");
 	}
 	
@@ -498,6 +497,7 @@ static void test_program_refused(void)
 					   test_globals.port, args,
 					   &pc_set, TRUE);
 
+	/* the first IPs are expected to fail and the last (127.0.0.1) to succeed, hence N-1 */
 	test_expect_errors(N_ELEMENTS(ips)-1);
 	program_client_run_async(pc, test_program_async_callback, &ret);