Use NNTP even if we run on the NNTP server because modern news systems

e.g. INN using its Storage API might not support the acient spool
directory structure.

3 files changed, 19 insertions, 10 deletions

diff --git a/news/nn/files/patch-sum b/news/nn/files/patch-sum
index c4b5f729242..5aedf1a757a 100644
--- a/news/nn/files/patch-sum
+++ b/news/nn/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/07/26 21:19:22 tron Exp $
+$NetBSD: patch-sum,v 1.3 1999/07/26 21:49:49 tron Exp $
 
 MD5 (patch-aa) = 3214454b138209e9cc3cd60c81fb4c63
 MD5 (patch-ab) = 3e7292c6537e28b538fd1c9c42cc6ebc
@@ -8,7 +8,7 @@ MD5 (patch-ae) = c34f531bda131227034abc77f7566462
 MD5 (patch-af) = fb864926d9c7a1901a8b7faaa04e80a6
 MD5 (patch-ag) = bdf9d3dc7322b1e019f4d5715e659831
 MD5 (patch-ah) = b7c53a69e5eb9c06ff709f1eadc31e85
-MD5 (patch-ai) = 8103d8e7c5caca49acf312c1f87384c5
+MD5 (patch-ai) = f23b1637e9cff9a013136488be3c808c
 MD5 (patch-aj) = d92f7105e0d3e0f8968e69da8437d8e6
 MD5 (patch-ak) = 6f163207434d3dbc64381c326becbddc
 MD5 (patch-al) = 90d15ac44ae2b6efd1e316ff45f00bf5
@@ -23,7 +23,7 @@ MD5 (patch-at) = 0e0ffa9b1fcbd8b78a00e38e12cae4de
 MD5 (patch-au) = 39974ff21adc6214cf81e44e02298b0e
 MD5 (patch-av) = 49f2bc72bf16fbe492f79bfcfe5b6e61
 MD5 (patch-aw) = 4c12bb192bd4851af86ed761d0480cff
-MD5 (patch-ax) = 896e54475e26bae7b5ce1e3647a5b9b6
+MD5 (patch-ax) = 8f64236d16fd5c16d9a91fe981df6c1a
 MD5 (patch-ay) = b7bfb52b31aa3440749252a29ce4391c
 MD5 (patch-az) = 9539751382afdcc1154ecc2af121ede4
 MD5 (patch-ba) = b08d6881ed3f7aa55781c45cb20cbdae
diff --git a/news/nn/patches/patch-ai b/news/nn/patches/patch-ai
index 85704ce9001..353141cd7ac 100644
--- a/news/nn/patches/patch-ai
+++ b/news/nn/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 1999/07/26 21:19:27 tron Exp $
+$NetBSD: patch-ai,v 1.2 1999/07/26 21:49:50 tron Exp $
 
 --- config.h.orig	Fri Feb 18 03:15:47 1994
-+++ config.h	Mon Jul 26 23:11:39 1999
++++ config.h	Mon Jul 26 23:21:24 1999
 @@ -32,7 +32,7 @@
  #define NOV
  
  /* Optional */
 -#define NOV_DIRECTORY "/usr/spool/news"
-+#define NOV_DIRECTORY "/var/news/spool/over.view"
++#define NOV_DIRECTORY "/var/news/spool/overview"
  
  /*********************** NETWORK DEPENDENT DEFINITIONS **********************
   *
@@ -97,8 +97,8 @@ $NetBSD: patch-ai,v 1.1 1999/07/26 21:19:27 tron Exp $
  
 -#define NEWS_DIRECTORY		"/usr/spool/news"
 -#define NEWS_LIB_DIRECTORY	"/usr/lib/news"
-+#define NEWS_DIRECTORY		"/var/news/spool"
-+#define NEWS_LIB_DIRECTORY	"/var/news/etc"
++#define NEWS_DIRECTORY		"/var/news/spool/articles"
++#define NEWS_LIB_DIRECTORY	"/var/news/db"
  
 -/* #define INEWS_PATH		"/usr/lib/news/inews"	*/
 +#define INEWS_PATH		BIN_DIRECTORY "/inews"
diff --git a/news/nn/patches/patch-ax b/news/nn/patches/patch-ax
index cda512bb35a..9532af74439 100644
--- a/news/nn/patches/patch-ax
+++ b/news/nn/patches/patch-ax
@@ -1,7 +1,7 @@
-$NetBSD: patch-ax,v 1.1 1999/07/26 21:19:33 tron Exp $
+$NetBSD: patch-ax,v 1.2 1999/07/26 21:49:50 tron Exp $
 
 --- nntp.c.orig	Thu Nov 25 10:39:37 1993
-+++ nntp.c	Mon Jul 26 23:11:38 1999
++++ nntp.c	Mon Jul 26 23:20:32 1999
 @@ -85,7 +85,9 @@
  import int silent, no_update;
  
@@ -12,6 +12,15 @@ $NetBSD: patch-ax,v 1.1 1999/07/26 21:19:33 tron Exp $
  extern void nn_exitmsg();
  extern void sys_error();
  extern int sys_warning();
+@@ -759,7 +761,7 @@
+     strncpy(host, (gethostbyname(host))->h_name, sizeof host);
+ 
+     server_real_name = (gethostbyname(nntp_server))->h_name;
+-    use_nntp = (strcmp(host, server_real_name) != 0);
++    use_nntp = 1;
+ 
+     if (use_nntp) {
+ 	freeobj(news_active);
 @@ -1098,7 +1100,7 @@
  
       case OK_BODY: