From owner-freebsd-hackers  Wed Apr  2 17:35:13 1997
Return-Path: <owner-hackers>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id RAA15258
          for hackers-outgoing; Wed, 2 Apr 1997 17:35:13 -0800 (PST)
Received: from colin.Muc.DE (root@colin.muc.de [193.174.4.1])
          by freefall.freebsd.org (8.8.5/8.8.5) with SMTP id RAA15253
          for <freebsd-hackers@freebsd.org>; Wed, 2 Apr 1997 17:35:09 -0800 (PST)
Received: from tor by colin.muc.de with UUCP id <86045-1>; Thu, 3 Apr 1997 03:34:49 +0200
Received: from odin.muc.de (odin.muc.de [193.31.20.18]) by tor.muc.de (8.8.5/8.6.6) with SMTP id QAA03730 for <freebsd-hackers@freebsd.org>; Wed, 2 Apr 1997 16:16:50 +0200 (CEST)
Received: (from eilts@localhost) by odin.muc.de (8.6.8/8.6.6) id QAA00255 for freebsd-hackers@freebsd.org; Wed, 2 Apr 1997 16:16:46 +0200
Date: Wed, 2 Apr 1997 16:16:46 +0200
From: Hinrich Eilts <eilts@tor.muc.de>
Message-Id: <199704021416.QAA00255@odin.muc.de>
Received: by NeXT.Mailer (1.100)
Received: by NeXT Mailer (1.100)
To: freebsd-hackers@freebsd.org
Subject: Server-site patch for nn-current
Sender: owner-hackers@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

Hello,

if I tried to use nn (6.5.0) from ports on the same 2.2-FreeBSD PC as the NNTP server (INN-1.4sec)
is located, it doesn't work (-> bug report in freebsd-bugs). The nn-current from ports will not
use NNTP if running on the server what is unwanted in some cases (e.g. statistics). A small patch
which is to be applied after the ports-patches "patch-a[abc]' add the ability to switch this behavior
off, i.e. NNTP will be used regardless from nn running on NNTP server or remote. The nn-current will
run on FreeBSD-2.2.

Hinrich

*** config.h.orig       Wed Apr  2 15:43:55 1997
--- config.h    Wed Apr  2 15:47:40 1997
***************
*** 56,61 ****
--- 56,68 ----
  #define NNTP_SERVER     "/usr/local/lib/news/nntp_server"
  

  /*
+  *    Define USE_NNTP_ON_SERVER if NNTP shall be used if nn is running on the
+  *    nntp server itself. Else it will use direct access to files.
+ */
+ 

+ #define USE_NNTP_ON_SERVER
+ 

+ /*
   *
   *      Defining NO_NNTP_SERVER_READ causes NNTP to ignore the NNTP_SERVER
   *      file for reading news but still allows the -R command to specify
*** nntp.c.orig Wed Apr  2 15:43:40 1997
--- nntp.c      Wed Apr  2 15:40:01 1997
***************
*** 175,180 ****
--- 175,181 ----
       * the rope. If he wants to hang himself, then let him! :-)
       * Let the user worry about keeping his .newsrc straight.
       */
+ fprintf(stderr,"NNTP Server\n");
      if ((cp = getenv("NNTPSERVER")) != NULL) {
        strncpy(nntp_server, cp, sizeof nntp_server);
        return 1;
***************
*** 706,712 ****
        || find_server()
  #endif
        ) {
!     nn_gethostname(host, sizeof host);
        tmp = gethostbyname(host);
        if (tmp) {
            strncpy(host, tmp->h_name, sizeof host);
--- 707,716 ----
        || find_server()
  #endif
        ) {
! #ifdef USE_NNTP_ON_SERVER
!         use_nntp = 1;
! #else
!       nn_gethostname(host, sizeof host);
        tmp = gethostbyname(host);
        if (tmp) {
            strncpy(host, tmp->h_name, sizeof host);
***************
*** 718,724 ****
        } else {
            server_real_name = nntp_server;
        }
!     use_nntp = (strcmp(host, server_real_name) != 0);
      } else {
        use_nntp = 0;
      }
--- 722,729 ----
        } else {
            server_real_name = nntp_server;
        }
!         use_nntp = (strcmp(host, server_real_name) != 0);
! #endif
      } else {
        use_nntp = 0;
      }