Fix another bug in IPv6 support. Bump version number to 1.0nb4.

3 files changed, 26 insertions, 24 deletions

diff --git a/news/knews/Makefile b/news/knews/Makefile
index 9fafe3280a8..0ac18cd54c9 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2001/02/24 22:40:39 tron Exp $
+# $NetBSD: Makefile,v 1.30 2001/02/25 11:10:12 tron Exp $
 
 DISTNAME=	knews-1.0b.1
-PKGNAME=	knews-1.0nb3
+PKGNAME=	knews-1.0nb4
 CATEGORIES=	news x11
 MASTER_SITES=	http://www.matematik.su.se/~kjj/
 
diff --git a/news/knews/files/patch-sum b/news/knews/files/patch-sum
index 8cb10e6594a..b2f211e6a53 100644
--- a/news/knews/files/patch-sum
+++ b/news/knews/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.6 2001/02/24 22:40:40 tron Exp $
+$NetBSD: patch-sum,v 1.7 2001/02/25 11:10:13 tron Exp $
 
 MD5 (patch-aa) = 95cd0655c3bc770d6450343e204ecf97
 MD5 (patch-ab) = a7803c0d155e79576a8f0d4e94933786
@@ -8,7 +8,7 @@ MD5 (patch-ae) = 166cf61034320c7f90c68f7db4bfad1c
 MD5 (patch-af) = f6f7662ff65939090971bf1cbbe1765b
 MD5 (patch-ag) = 81db2b27e60ee1b2a4900e82287387ee
 MD5 (patch-ah) = bcf7cb17cd26e3fb086726355748da55
-MD5 (patch-ai) = ee012afd5da8abba1a16b787fdbdd5c0
+MD5 (patch-ai) = 57e430776251a08ff279f8cdcf8f11e7
 MD5 (patch-aj) = 1728399cf60b4c9c1bda9d3790edf6e8
 MD5 (patch-ak) = 2d1dd4096bbbff6a4f75afda3a454537
 MD5 (patch-al) = d01ee21b4c0c6ca45c9b8ab8bd79bb43
diff --git a/news/knews/patches/patch-ai b/news/knews/patches/patch-ai
index ea5f798cea7..af1e2e71b40 100644
--- a/news/knews/patches/patch-ai
+++ b/news/knews/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.2 2001/02/24 22:40:40 tron Exp $
+$NetBSD: patch-ai,v 1.3 2001/02/25 11:10:13 tron Exp $
 
 --- src/server.c.orig	Fri Jan  9 18:16:22 1998
-+++ src/server.c	Sat Feb 24 23:24:45 2001
++++ src/server.c	Sun Feb 25 12:07:35 2001
 @@ -2,19 +2,21 @@
   *  Copyright (C) 1995, 1996  Karl-Johan Johnsson.
   */
@@ -26,7 +26,7 @@ $NetBSD: patch-ai,v 1.2 2001/02/24 22:40:40 tron Exp $
  struct SERVER {
      int		fd;
      char	*buffer;
-@@ -128,30 +130,35 @@
+@@ -128,30 +130,39 @@
   *  tell != 0   means tell about errors
   *  tell >  1   means say what you're doing
   */
@@ -41,12 +41,22 @@ $NetBSD: patch-ai,v 1.2 2001/02/24 22:40:40 tron Exp $
 -	set_message("Error: Failed to create socket!", True);
 -	return -1;
 -    }
--
++    while (addr) {
++	server_close(server);
++	server->fd = open_socket(addr);
++	if (server->fd < 0) {
++	    set_message("Error: Failed to create socket!", True);
++	    return -1;
++	}
+ 
 -    if (tell > 1)
 -	set_message("Server contacted, waiting for response...", False);
--
++	if (tell > 1)
++	    set_message("Server contacted, waiting for response...", False);
+ 
 -    tmp = connect_socket(server->fd, addr);
--
++	tmp = connect_socket(server->fd, addr);
+ 
 -    if (tmp < 0 && would_block(server->fd, errno)) {
 -	if (tell == 0)
 -	    return 0; /* don't block */
@@ -54,19 +64,7 @@ $NetBSD: patch-ai,v 1.2 2001/02/24 22:40:40 tron Exp $
 -	tmp = 0;
 -	do_wait(&server->fd, True, server->quit_func, server);
 -	if (server->fd < 0)
-+    while (addr) {
-+	server_close(server);
-+	server->fd = open_socket(addr);
-+	if (server->fd < 0) {
-+	    set_message("Error: Failed to create socket!", True);
- 	    return -1;
-+	}
-+
-+	if (tell > 1)
-+	    set_message("Server contacted, waiting for response...", False);
-+
-+	tmp = connect_socket(server->fd, addr);
-+
+-	    return -1;
 +	if (tmp < 0 && would_block(server->fd, errno)) {
 +	    if (tell == 0)
 +		return 0; /* don't block */
@@ -75,10 +73,14 @@ $NetBSD: patch-ai,v 1.2 2001/02/24 22:40:40 tron Exp $
 +	    do_wait(&server->fd, True, server->quit_func, server);
 +	    if (server->fd >= 0)
 +		break;
-+
 +	}
 +
 +	addr = next_addr(addr);
++    }
++
++    if (!addr) {
++	server_close(server);
++	return -1;
      }
  
      server->buffer[0] = '\0';