diff -Nacr inn-2.2.1/ChangeLog inn-2.2.2/ChangeLog
*** inn-2.2.1/ChangeLog	Wed Aug 25 14:50:18 1999
--- inn-2.2.2/ChangeLog	Mon Dec 13 13:18:37 1999
***************
*** 1,2029 ****
! Wed Aug 25 12:58:47 1999  <kondou>
! 
!   * nnrpd/newnews.c (1.9.2.3):
!     nnrpd/newnews.c:
! 	    - comparing dist was incorrect
! 
! Wed Aug 25 08:57:02 1999 James Brister <brister>
! 
!   * ChangeLog (1.1.2.4):
!     Removed all entries prior to 1999. File was way too big
! 
! Wed Aug 25 07:50:40 1999 Russ Allbery <rra>
! 
!   * samples/cnfsstat.in (1.3.2.7):
!     Protect the shell against special characters in the message ID when
!     running
!     grephistory.  Reported by Mike Bird <mgb@yosemite.net>.
! 
! Wed Aug 25 04:14:33 1999  <kondou>
! 
!   * samples/cnfsstat.in (1.3.2.6):
!     samples/cnfsstat.in:
! 	    - From: Mike Bird <mgb@yosemite.net>
! 	    - In INN 2.2, the last loop in the cnfsstat file, which scans
!     for
! 	      oldest article, revises $update if a more recent time is
!     found.
! 	      However, this has no effect as $nupdate_str and $nago_str
!     have
! 	      already been created from $update.  The line which does this
!     should
! 	      be moved after the loop, e.g.  just before the close(BUFF).
! 	    - If two articles with identical timestamps are found the same
!     loop
! 	      incorrectly treats the latter as the oldest timestamp ... a
!     "<"
! 	      should be changed to a "<=".  NOTE: This necessarily slows
!     cnfsstat
! 	      considerably for cycbuffs containing very large articles.
! 	    - do not claim if the same class is multiply defined
! 
! Tue Aug 24 21:49:51 1999 James Brister <brister>
! 
!   * ChangeLog (1.1.2.3):
!     Completely regenerated the contents to try and remove non-STABLE
!     log messages.
! 
! Tue Aug 24 00:23:48 1999 David C Lawrence <tale>
! 
!   * nnrpd/misc.c (1.28.2.5):
!     Made 2 digit years in NEWGROUPS/NEWNEWS compatible with the draft NNTP
!     standard.
! 
! Mon Aug 23 23:13:19 1999 David C Lawrence <tale>
! 
!   * samples/mod-active.in (1.1.2.2):
!     made the flag for a short diff listing more portable
! 
! Sun Aug 22 06:25:10 1999 Russ Allbery <rra>
! 
!   * frontends/inews.c (1.15.2.5):
!     Fixes for several potential buffer overflows, some more likely than
!     others.
!     Various sanity checks added to ensure strings aren't longer than
!     working
!     buffers.  I *think* all strcpy() and sprintf() calls are now okay, but
!     the
!     code should really be rewritten to make better use of dynamic buffers.
! 
! Sat Aug 21 04:35:18 1999 Russ Allbery <rra>
! 
!   * frontends/inews.c (1.15.2.4):
!     Jeff King <peff@dbd.com>:
!     There is no bounds-checking on "from" headers given on the command
!     line;
!     when copied into SMBUF-sized buffers, an overflow can occur and
!     arbitrary
!     code can be executed.
! 
! Wed Aug 11 12:06:09 1999  <kondou>
! 
!   * nnrpd/newnews.c (1.9.2.2):
!     nnrpd/newnews.c:
! 	    - reported by Markus Stumpf <maex@Space.Net>
! 	    - the result of newnews includes trailing '\t' for traditional
! 
! Sun Aug 08 21:56:53 1999  <kondou>
! 
!   * innd/art.c (1.90.2.9):
!     innd/art.c:
! 	    - reported by news@hammer.msfc.nasa.gov
! 	    - 'AC' for junk didn't work
! 
! Wed Aug 04 03:22:12 1999  <kondou>
! 
!   * samples/parsecontrol.in (1.18.2.2):
!     samples/parsecontrol.in:
! 	    - checkgroups failed for non-controlchan
! 
! Wed Jul 14 13:27:07 1999  <kondou>
! 
!   * nnrpd/post.c (1.28.2.8):
!     nnrpd/post.c
! 	    - don't append fromhost for X-Complaints-To, if NEWSMASTER
!     includes '@'
! 
! Tue Jul 13 01:42:59 1999  <kondou>
! 
!   * samples/control.ctl (1.10.2.3):
!     samples/control.ctl:
! 	    - reported by Alexander Koch <efraim@argh.org>
! 	    - fixed typo
! 
! Thu Jul 08 21:18:34 1999  <kondou>
! 
!   * innd/cc.c (1.47.2.6):
!   * innd/innd.c (1.40.2.3):
!     innd/cc.c:
!     innd/innd.c:
! 	    - invalid string was showed at syslog()
! 
! Wed Jul 07 21:37:47 1999  <kondou>
! 
!   * samples/newsfeeds.in (1.3.2.3):
!     samples/newsfeeds.in:
! 	    - From: Robert Kiessling <robert@easynet.de>
! 	    - Update the flag description in file newsfeeds
! 
! Wed Jul 07 18:50:38 1999 David C Lawrence <tale>
! 
!   * lib/makedir.c (1.3.2.1):
!     MakeDir() should have its errno determined by mkdir().  Cases where
!     mkdir() failed resulted in errno having the value of a subsequent
!     stat().  This fix was made earlier to the CURRENT branch by someone
!     else (I did not check who) and I am just applying it in 2.2's STABLE
!     as a bug fix.
! 
! Tue Jul 06 13:38:41 1999  <kondou>
! 
!   * backends/inndf.c (1.4.2.1):
!     backends/inndf.c:
! 	    - written by Uwe Ohse <uwe-nsn19990706@ohse.de>
! 	    - patch for glibc 2.1
! 
! Wed Jun 30 03:53:36 1999  <kondou>
! 
!   * samples/control.ctl (1.10.2.2):
!     samples/control.ctl:
! 	    - replaced with ftp://ftp.isc.org/pub/usenet/CONFIG/control.ctl
! 
! Wed Jun 30 02:01:43 1999  <kondou>
! 
!   * samples/innreport_inn.pm (1.5.2.5):
!     samples/innreport_inn.pm:
! 	    - From: Fabien Tassin <fta@oleane.net>
! 	    - innreport failed to run for Perl 5.005_57
! 
! Mon Jun 28 09:32:31 1999  <kondou>
! 
!   * samples/nntpsend.in (1.11.2.1):
!     samples/nntpsend.in:
! 	    - From: Russell Vincent <russellv@uk.uu.net>
! 	    - don't sort the batch file if using the storageapi. It doesn't
! 	      necessarily help and causes out-of-order articles when using
! 	      master-slave mode. The sorting is legacy from trad spool.
! 
! Sat Jun 26 00:35:07 1999  <kondou>
! 
!   * storage/interface.c (1.35.2.3):
!     storage/interface.c:
! 	    - From: George Lindholm <lindholm@ucs.ubc.ca>
! 	    - trailing ',' in storage.conf would cause SIGSEGV
! 
! Sat Jun 26 00:33:19 1999  <kondou>
! 
!   * doc/cycbuff.conf.5 (1.1.2.2):
!     doc/cycbuff.conf.5
! 	    - From: George Lindholm <lindholm@ucs.ubc.ca>
! 	    - some grammer were wrong
! 
! Sat Jun 26 00:31:25 1999  <kondou>
! 
!   * README.perl_hook (1.9.2.3):
!     README.perl_hook:
! 	    - From: George Lindholm <lindholm@ucs.ubc.ca>
! 	    - typo fixed
! 
! Fri Jun 25 07:57:16 1999  <kondou>
! 
!   * samples/parsecontrol.in (1.18.2.1):
!     samples/parsecontrol.in:
! 	    - From: Benedict Lofstedt <benedict@daimi.au.dk>
! 	    - there is no input, so the grep will always fail
! 
! Fri Jun 25 05:52:45 1999  <kondou>
! 
!   * innd/perl.c (1.7.2.2):
!     innd/perl.c:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - Let 2.2 STABLE compile against the current development Perl
!     and the
! 	      forthcoming Perl 5.006.
! 
! Fri Jun 25 03:16:09 1999  <kondou>
! 
!   * nnrpd/perl.c (1.8.2.1):
!     nnrpd/perl.c:
! 	    - From: "Edward S. Marshall" <emarshal@xnet.com>
! 	    - Here's a patch that fixes up innd and nnrpd as well. This
!     gives a
! 	      working INN installation for me, using Perl 5.005_57, the
!     latest CVS
! 	      version of INN, Solaris 7, egcs 1.1.2, largefile support in
!     both INN
! 	      and Perl.
! 
! Fri Jun 25 03:16:00 1999  <kondou>
! 
!   * lib/perl.c (1.7.2.1):
!     lib/perl.c:
! 	    - From: "Edward S. Marshall" <emarshal@xnet.com>
! 	    - Here's a patch that fixes up innd and nnrpd as well. This
!     gives a
! 	      working INN installation for me, using Perl 5.005_57, the
!     latest CVS
! 	      version of INN, Solaris 7, egcs 1.1.2, largefile support in
!     both INN
! 	      and Perl.
! 
! Fri Jun 25 03:15:51 1999  <kondou>
! 
!   * innd/cc.c (1.47.2.5):
!     innd/cc.c:
! 	    - From: "Edward S. Marshall" <emarshal@xnet.com>
! 	    - Here's a patch that fixes up innd and nnrpd as well. This
!     gives a
! 	      working INN installation for me, using Perl 5.005_57, the
!     latest CVS
! 	      version of INN, Solaris 7, egcs 1.1.2, largefile support in
!     both INN
! 	      and Perl.
! 
! Thu Jun 24 22:06:41 1999  <kondou>
! 
!   * nnrpd/nnrpd.c (1.49.2.8):
!     nnrpd/nnrpd.c:
! 	    - From: Robert Kiessling <robert@easynet.de>
! 	    - On some combinations of IRIX and gcc, inet_ntoa does not work
! 	      properly. Squid therefore integrated a test for a working
!     inet_ntoa,
! 	      which would be a good idea to also include in INN.
! 
! Tue Jun 22 19:59:14 1999 James Brister <brister>
! 
!   * ChangeLog (1.1.2.2):
!     Updates for post Oct 21 1998
! 
! Tue Jun 22 01:01:49 1999  <kondou>
! 
!   * nnrpd/group.c (1.32.2.3):
!     nnrpd/group.c:
! 	    - reported by Kjetil Torgrim Homme <kjetilho@ifi.uio.no>
! 	    - aliased group name was not showed correctly
! 
! Mon Jun 21 22:02:35 1999  <kondou>
! 
!   * ltconfig (1.2.2.2):
!     ltconfig:
! 	    - reported by Matus fantomas Uhlar <uhlar@fantomas.sk>
! 	    - fix for FreeBSD4
! 
! Mon Jun 21 00:58:42 1999 David C Lawrence <tale>
! 
!   * samples/innmail.in (1.9.2.1):
!     trimming trailing newlines off of the subject; the controlchan
!     handler scripts variously send the subject with or without a
!     newline, so this clears it all up in one place.
! 
! Sun Jun 20 21:56:36 1999  <kondou>
! 
!   * innd/status.c (1.12.2.1):
!     innd/status.c:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - typo fixed
! 
! Tue Jun 15 21:54:23 1999  <kondou>
! 
!   * samples/cnfsstat.in (1.3.2.5):
!     samples/cnfsstat.in:
! 	    - From: Marg Suarez <marg@columbia.edu>
! 	    - fixed the bug in cnfsstat where it printed the wrong date in
!     the case
! 	      when a msgid was missing from the history file.
! 
!   * doc/wildmat.3 (1.1.2.1):
!   * doc/writelog.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/wildmat.3 (1.1):
!     file wildmat.3 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:23:10 1999  <kondou>
! 
!   * doc/writelog.8 (1.1):
!     file writelog.8 was initially added on branch STABLE-2_2.
! 
!   * doc/tally.control.8 (1.1.2.1):
!   * doc/tally.unwanted.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:23:09 1999  <kondou>
! 
!   * doc/tally.unwanted.8 (1.1):
!     file tally.unwanted.8 was initially added on branch STABLE-2_2.
! 
!   * doc/strcasecmp.3 (1.1.2.1):
!   * doc/subst.1 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/subst.1 (1.1):
!     file subst.1 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:23:08 1999  <kondou>
! 
!   * doc/tally.control.8 (1.1):
!     file tally.control.8 was initially added on branch STABLE-2_2.
! 
!   * doc/storage.ctl.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/storage.ctl.5 (1.1):
!     file storage.ctl.5 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:23:07 1999  <kondou>
! 
!   * doc/strcasecmp.3 (1.1):
!     file strcasecmp.3 was initially added on branch STABLE-2_2.
! 
!   * doc/startinnfeed.1 (1.1.2.1):
!   * doc/storage.conf.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/startinnfeed.1 (1.1):
!     file startinnfeed.1 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:23:06 1999  <kondou>
! 
!   * doc/storage.conf.5 (1.1):
!     file storage.conf.5 was initially added on branch STABLE-2_2.
! 
!   * doc/simpleftp.1 (1.1.2.1):
!   * doc/sm.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:23:05 1999  <kondou>
! 
!   * doc/sm.8 (1.1):
!     file sm.8 was initially added on branch STABLE-2_2.
! 
!   * doc/shlock.1 (1.1.2.1):
!   * doc/shrinkfile.1 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/shrinkfile.1 (1.1):
!     file shrinkfile.1 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:23:04 1999  <kondou>
! 
!   * doc/simpleftp.1 (1.1):
!     file simpleftp.1 was initially added on branch STABLE-2_2.
! 
!   * doc/send-uucp.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/send-uucp.8 (1.1):
!     file send-uucp.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:23:03 1999  <kondou>
! 
!   * doc/shlock.1 (1.1):
!     file shlock.1 was initially added on branch STABLE-2_2.
! 
!   * doc/rnews.1 (1.1.2.1):
!   * doc/scanlogs.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:23:02 1999  <kondou>
! 
!   * doc/scanlogs.8 (1.1):
!     file scanlogs.8 was initially added on branch STABLE-2_2.
! 
!   * doc/pullnews.8 (1.1.2.1):
!   * doc/qio.3 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/qio.3 (1.1):
!     file qio.3 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:23:01 1999  <kondou>
! 
!   * doc/rnews.1 (1.1):
!     file rnews.1 was initially added on branch STABLE-2_2.
! 
!   * doc/prunehistory.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/prunehistory.8 (1.1):
!     file prunehistory.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:23:00 1999  <kondou>
! 
!   * doc/pullnews.8 (1.1):
!     file pullnews.8 was initially added on branch STABLE-2_2.
! 
!   * doc/passwd.nntp.5 (1.1.2.1):
!   * doc/pgpverify.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/passwd.nntp.5 (1.1):
!     file passwd.nntp.5 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:59 1999  <kondou>
! 
!   * doc/pgpverify.8 (1.1):
!     file pgpverify.8 was initially added on branch STABLE-2_2.
! 
!   * doc/overview.fmt.5 (1.1.2.1):
!   * doc/parsedate.3 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:58 1999  <kondou>
! 
!   * doc/parsedate.3 (1.1):
!     file parsedate.3 was initially added on branch STABLE-2_2.
! 
!   * doc/overchan.8 (1.1.2.1):
!   * doc/overview.ctl.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/overview.ctl.5 (1.1):
!     file overview.ctl.5 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:57 1999  <kondou>
! 
!   * doc/overview.fmt.5 (1.1):
!     file overview.fmt.5 was initially added on branch STABLE-2_2.
! 
!   * doc/nntpsend.ctl.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:56 1999  <kondou>
! 
!   * doc/overchan.8 (1.1):
!     file overchan.8 was initially added on branch STABLE-2_2.
! 
!   * doc/nntpsend.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/nntpsend.8 (1.1):
!     file nntpsend.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:55 1999  <kondou>
! 
!   * doc/nntpsend.ctl.5 (1.1):
!     file nntpsend.ctl.5 was initially added on branch STABLE-2_2.
! 
!   * doc/nnrpd.track.5 (1.1.2.1):
!   * doc/nntpget.1 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/nnrpd.track.5 (1.1):
!     file nnrpd.track.5 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:54 1999  <kondou>
! 
!   * doc/nntpget.1 (1.1):
!     file nntpget.1 was initially added on branch STABLE-2_2.
! 
!   * doc/nnrp.access.5 (1.1.2.1):
!   * doc/nnrpd.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:53 1999  <kondou>
! 
!   * doc/nnrpd.8 (1.1):
!     file nnrpd.8 was initially added on branch STABLE-2_2.
! 
!   * doc/newsrequeue.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/newsrequeue.8 (1.1):
!     file newsrequeue.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:52 1999  <kondou>
! 
!   * doc/nnrp.access.5 (1.1):
!     file nnrp.access.5 was initially added on branch STABLE-2_2.
! 
!   * doc/newslog.5 (1.1.2.1):
!   * doc/newslog.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/newslog.5 (1.1):
!     file newslog.5 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:51 1999  <kondou>
! 
!   * doc/newslog.8 (1.1):
!     file newslog.8 was initially added on branch STABLE-2_2.
! 
!   * doc/news2mail.8 (1.1.2.1):
!   * doc/newsfeeds.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:50 1999  <kondou>
! 
!   * doc/newsfeeds.5 (1.1):
!     file newsfeeds.5 was initially added on branch STABLE-2_2.
! 
!   * doc/news.daily.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/news.daily.8 (1.1):
!     file news.daily.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:49 1999  <kondou>
! 
!   * doc/news2mail.8 (1.1):
!     file news2mail.8 was initially added on branch STABLE-2_2.
! 
!   * doc/motd.news.5 (1.1.2.1):
!   * doc/news-recovery.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/motd.news.5 (1.1):
!     file motd.news.5 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:48 1999  <kondou>
! 
!   * doc/news-recovery.8 (1.1):
!     file news-recovery.8 was initially added on branch STABLE-2_2.
! 
!   * doc/mod-active.8 (1.1.2.1):
!   * doc/moderators.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:47 1999  <kondou>
! 
!   * doc/moderators.5 (1.1):
!     file moderators.5 was initially added on branch STABLE-2_2.
! 
!   * doc/makehistory.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/makehistory.8 (1.1):
!     file makehistory.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:46 1999  <kondou>
! 
!   * doc/mod-active.8 (1.1):
!     file mod-active.8 was initially added on branch STABLE-2_2.
! 
!   * doc/mailpost.8 (1.1.2.1):
!   * doc/makeactive.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/mailpost.8 (1.1):
!     file mailpost.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:45 1999  <kondou>
! 
!   * doc/makeactive.8 (1.1):
!     file makeactive.8 was initially added on branch STABLE-2_2.
! 
!   * doc/libinn.3 (1.1.2.1):
!   * doc/libstorage.3 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:44 1999  <kondou>
! 
!   * doc/libstorage.3 (1.1):
!     file libstorage.3 was initially added on branch STABLE-2_2.
! 
!   * doc/installit.1 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/installit.1 (1.1):
!     file installit.1 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:43 1999  <kondou>
! 
!   * doc/libinn.3 (1.1):
!     file libinn.3 was initially added on branch STABLE-2_2.
! 
!   * doc/innxbatch.8 (1.1.2.1):
!   * doc/innxmit.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/innxbatch.8 (1.1):
!     file innxbatch.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:42 1999  <kondou>
! 
!   * doc/innxmit.8 (1.1):
!     file innxmit.8 was initially added on branch STABLE-2_2.
! 
!   * doc/innwatch.8 (1.1.2.1):
!   * doc/innwatch.ctl.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:41 1999  <kondou>
! 
!   * doc/innwatch.ctl.5 (1.1):
!     file innwatch.ctl.5 was initially added on branch STABLE-2_2.
! 
!   * doc/innstat.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/innstat.8 (1.1):
!     file innstat.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:40 1999  <kondou>
! 
!   * doc/innwatch.8 (1.1):
!     file innwatch.8 was initially added on branch STABLE-2_2.
! 
!   * doc/innlog.pl.8 (1.1.2.1):
!   * doc/innreport.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/innlog.pl.8 (1.1):
!     file innlog.pl.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:39 1999  <kondou>
! 
!   * doc/innreport.8 (1.1):
!     file innreport.8 was initially added on branch STABLE-2_2.
! 
!   * doc/innfeed.conf.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:38 1999  <kondou>
! 
!   * doc/innfeed.conf.5 (1.1):
!     file innfeed.conf.5 was initially added on branch STABLE-2_2.
! 
!   * doc/inndf.8 (1.1.2.1):
!   * doc/innfeed.1 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/inndf.8 (1.1):
!     file inndf.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:37 1999  <kondou>
! 
!   * doc/innfeed.1 (1.1):
!     file innfeed.1 was initially added on branch STABLE-2_2.
! 
!   * doc/innd.8 (1.1.2.1):
!   * doc/inndcomm.3 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:36 1999  <kondou>
! 
!   * doc/inndcomm.3 (1.1):
!     file inndcomm.3 was initially added on branch STABLE-2_2.
! 
!   * doc/innconfval.1 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/innconfval.1 (1.1):
!     file innconfval.1 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:35 1999  <kondou>
! 
!   * doc/innd.8 (1.1):
!     file innd.8 was initially added on branch STABLE-2_2.
! 
!   * doc/inn.conf.5 (1.1.2.1):
!   * doc/inncheck.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:34 1999  <kondou>
! 
!   * doc/inncheck.8 (1.1):
!     file inncheck.8 was initially added on branch STABLE-2_2.
! 
!   * doc/inews.1 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/inews.1 (1.1):
!     file inews.1 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:33 1999  <kondou>
! 
!   * doc/inn.conf.5 (1.1):
!     file inn.conf.5 was initially added on branch STABLE-2_2.
! 
!   * doc/history.5 (1.1.2.1):
!   * doc/incoming.conf.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/history.5 (1.1):
!     file history.5 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:32 1999  <kondou>
! 
!   * doc/incoming.conf.5 (1.1):
!     file incoming.conf.5 was initially added on branch STABLE-2_2.
! 
!   * doc/getlist.1 (1.1.2.1):
!   * doc/grephistory.1 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:31 1999  <kondou>
! 
!   * doc/grephistory.1 (1.1):
!     file grephistory.1 was initially added on branch STABLE-2_2.
! 
!   * doc/filechan.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/filechan.8 (1.1):
!     file filechan.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:30 1999  <kondou>
! 
!   * doc/getlist.1 (1.1):
!     file getlist.1 was initially added on branch STABLE-2_2.
! 
!   * doc/expirerm.8 (1.1.2.1):
!   * doc/fastrm.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/expirerm.8 (1.1):
!     file expirerm.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:29 1999  <kondou>
! 
!   * doc/fastrm.8 (1.1):
!     file fastrm.8 was initially added on branch STABLE-2_2.
! 
!   * doc/expireindex.8 (1.1.2.1):
!   * doc/expireover.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:28 1999  <kondou>
! 
!   * doc/expireover.8 (1.1):
!     file expireover.8 was initially added on branch STABLE-2_2.
! 
!   * doc/expire.ctl.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/expire.ctl.5 (1.1):
!     file expire.ctl.5 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:27 1999  <kondou>
! 
!   * doc/expireindex.8 (1.1):
!     file expireindex.8 was initially added on branch STABLE-2_2.
! 
!   * doc/distrib.pats.5 (1.1.2.1):
!   * doc/expire.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:26 1999  <kondou>
! 
!   * doc/expire.8 (1.1):
!     file expire.8 was initially added on branch STABLE-2_2.
! 
!   * doc/dbz.3 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/dbz.3 (1.1):
!     file dbz.3 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:25 1999  <kondou>
! 
!   * doc/distrib.pats.5 (1.1):
!     file distrib.pats.5 was initially added on branch STABLE-2_2.
! 
!   * doc/cycbuff.conf.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:24 1999  <kondou>
! 
!   * doc/cycbuff.conf.5 (1.1):
!     file cycbuff.conf.5 was initially added on branch STABLE-2_2.
! 
!   * doc/ctlinnd.8 (1.1.2.1):
!   * doc/cvtbatch.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:23 1999  <kondou>
! 
!   * doc/cvtbatch.8 (1.1):
!     file cvtbatch.8 was initially added on branch STABLE-2_2.
! 
!   * doc/convdate.1 (1.1.2.1):
!   * doc/crosspost.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/crosspost.8 (1.1):
!     file crosspost.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:22 1999  <kondou>
! 
!   * doc/ctlinnd.8 (1.1):
!     file ctlinnd.8 was initially added on branch STABLE-2_2.
! 
!   * doc/controlchan.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/controlchan.8 (1.1):
!     file controlchan.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:21 1999  <kondou>
! 
!   * doc/convdate.1 (1.1):
!     file convdate.1 was initially added on branch STABLE-2_2.
! 
!   * doc/cnfsstat.8 (1.1.2.1):
!   * doc/control.ctl.5 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:20 1999  <kondou>
! 
!   * doc/control.ctl.5 (1.1):
!     file control.ctl.5 was initially added on branch STABLE-2_2.
! 
!   * doc/clientlib.3 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/clientlib.3 (1.1):
!     file clientlib.3 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:19 1999  <kondou>
! 
!   * doc/cnfsstat.8 (1.1):
!     file cnfsstat.8 was initially added on branch STABLE-2_2.
! 
!   * doc/batcher.8 (1.1.2.1):
!   * doc/buffchan.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/batcher.8 (1.1):
!     file batcher.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:18 1999  <kondou>
! 
!   * doc/buffchan.8 (1.1):
!     file buffchan.8 was initially added on branch STABLE-2_2.
! 
!   * doc/actsyncd.8 (1.1.2.1):
!   * doc/archive.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:17 1999  <kondou>
! 
!   * doc/archive.8 (1.1):
!     file archive.8 was initially added on branch STABLE-2_2.
! 
!   * doc/actsync.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
!   * doc/actsync.8 (1.1):
!     file actsync.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:16 1999  <kondou>
! 
!   * doc/actsyncd.8 (1.1):
!     file actsyncd.8 was initially added on branch STABLE-2_2.
! 
!   * doc/active.5 (1.1.2.1):
!   * doc/actived.8 (1.1.2.1):
!     doc/*:
! 	    - all man pages are backed to original directory
! 
! Sat Jun 12 08:22:15 1999  <kondou>
! 
!   * doc/actived.8 (1.1):
!     file actived.8 was initially added on branch STABLE-2_2.
! 
! Sat Jun 12 08:22:14 1999  <kondou>
! 
!   * doc/active.5 (1.1):
!     file active.5 was initially added on branch STABLE-2_2.
! 
! Fri Jun 11 03:19:34 1999  <kondou>
! 
!   * innd/nc.c (1.37.2.5):
!     innd/nc.c:
! 	    - innd responds an illegal NNTP code for non streaming even if
!     the
! 	      article is accepted, after messageid filter rejects a messge
! 
! Wed Jun 02 02:48:49 1999  <kondou>
! 
!   * samples/inncheck.in (1.22.2.6):
!     samples/inncheck.in:
! 	    - checking inndstart mode was wrong
! 
! Mon May 31 03:30:56 1999  <kondou>
! 
!   * nnrpd/nnrpd.c (1.49.2.7):
!     nnrpd/nnrpd.c:
! 	    - NEWSGRP should be used for news group
! 
! Mon May 31 03:30:41 1999  <kondou>
! 
!   * innd/inndstart.c (1.16.2.2):
!     innd/inndstart.c:
! 	    - NEWSGRP should be used for news group
! 
! Thu May 20 14:59:02 1999 David C Lawrence <tale>
! 
!   * samples/pgpverify.in (1.19.2.3):
!     upgraded to pgpverify 1.12.  support for gnu pgp, more diddling with
!     syslogging
! 
! Tue May 18 21:45:30 1999  <kondou>
! 
!   * storage/overview.c (1.32.4.1):
!     storage/overview.c:
! 	    - reported by root@news.netmar.com
! 	    - If someone enters an empty word in the overview.ctl file,
! 	      (e.g. "1:alt*,biz*," or "1:,alt*" etc), you segfault.
! 
! Tue May 18 09:35:51 1999  <kondou>
! 
!   * samples/news2mail.in (1.1.2.2):
!     samples/news2mail.in:
! 	    - From: SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp>
! 	    - News2mail only preserve 'From', 'Subject', 'Date',
!     'Organization',
! 	      'Message-ID' headers, but when multipart/mixed article are
!     sent by
! 	      news2mail, 'MIME-Version', 'Content-Type' are disappeared and
!     the mail
! 	      received looks broken.
! 
! Thu May 13 22:05:50 1999  <kondou>
! 
!   * nnrpd/nnrpd.c (1.49.2.6):
!     nnrpd/nnrpd.c:
! 	    - pathrun must not be owned by root
! 	    - ensure pathrun owner is NEWSUSER
! 
! Thu May 13 22:05:38 1999  <kondou>
! 
!   * innd/inndstart.c (1.16.2.1):
!     innd/inndstart.c:
! 	    - pathrun must not be owned by root
! 	    - ensure pathrun owner is NEWSUSER
! 
! Wed May 12 21:22:44 1999  <kondou>
! 
!   * innd/cc.c (1.47.2.4):
!     innd/cc.c:
! 	    - From: "Igor Timkin" <ivt@gamma.ru>
! 	    - cleanup code
! 
! Wed May 12 00:56:34 1999  <kondou>
! 
!   * innd/cc.c (1.47.2.3):
!     innd/cc.c:
! 	    - From: Michael Schroeder
!     <Michael.Schroeder@informatik.uni-erlangen.de>
! 	    - CCaddhist() uses OVERsetoffset() instead of OVERmaketoken()
! 
! Wed May 12 00:51:15 1999  <kondou>
! 
!   * INSTALL (1.19.2.6):
!     INSTALL:
! 	    - From: Michael Schroeder
!     <Michael.Schroeder@informatik.uni-erlangen.de>
! 	    - INSTALL talks about a 'domainname' inn.conf parameter. It
!     should be
! 	      'domain'.
! 
! Wed May 12 00:49:18 1999  <kondou>
! 
!   * README (1.5.2.4):
!     README:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - INN's README has always struck me as extremely sparse.  One
!     of the
! 	      major things it feels like it lacks is some general overview
!     for
! 	      someone who may not be entirely sure what a news server is or
!     what
! 	      INN consists of.
! 
! Tue May 11 21:53:00 1999  <kondou>
! 
!   * samples/mailpost.in (1.1.2.3):
!     samples/mailpost.in:
! 	    - From: Vladimir Litovka <doka@triton.kiev.sovam.com>
! 	    - inews always rejects messages if there are duplicate headers
!     in
! 	      message and it's right. But this is often error due to errors
!     in
! 	      sender's setup or errors in mailing software. For avoiding
!     this
! 	      problem I've patched mailpost to remove duplicate headers
!     from
! 	      message before passing it to inews.
! 
! Tue May 11 03:15:57 1999  <kondou>
! 
!   * lib/getconfig.c (1.48.2.6):
!     lib/getconfig.c:
! 	    - argument of RENEW() which calls realloc() should not be null
!     for
! 	      SunOS4.1.4
! 
! Mon May 10 22:36:19 1999  <kondou>
! 
!   * nnrpd/commands.c (1.20.2.5):
!     nnrpd/commands.c:
! 	    - From: Sven Paulus <sven@karlsruhe.org>
! 	    - If there is a single dot on a line in the newsgroups file
!     etc., at
! 	      the moment INN's nnrpd happily sends it to the client. The
!     client on
! 	      the other hand gets confused because there is additional data
!     after
! 	      the single dot, violating the NNTP protocol.
! 
! Mon May 10 22:33:22 1999  <kondou>
! 
!   * lib/getconfig.c (1.48.2.5):
!     lib/getconfig.c:
! 	    - From: Sven Paulus <sven@karlsruhe.org>
! 	    - INN says "Must set 'domain' in inn.conf" even if the domain
!     is set,
! 	      but the FQDN of the machine does not resolve to a valid IP
!     address
! 	      (e.g. if you call your machine "foo" in domain "bar.com" and
!     fail to
! 	      add "foo" to your DNS zone or /etc/hosts file, there is no
!     use
! 	      setting "domain: bar.com" in inn.conf, the error message
!     given by INN
! 	      will stay the same). This is very confusing
! 
! Sun May 09 00:36:53 1999  <kondou>
! 
!   * samples/innreport.in (1.16.2.3):
!     samples/innreport.in:
! 	    - From: Fabien Tassin <fta@oleane.net>
! 	    - I prefer to 'localize' $/ instead.  I've also changed '' to
!     undef.
! 
! Sat May 08 05:16:53 1999  <kondou>
! 
!   * README.perl_hook (1.9.2.2):
!     README.perl_hook:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - a complete replacement for the current README.perl_hook. 
!     It's
! 	      expanded, clarified, and updated from the existing one and I
!     believe
! 	      it comes close to fully documenting the current interface. 
!     While I
! 	      was at it, I reformatted the text into roughly the same style
!     used in
! 	      README and INSTALL.
! 
! Sat May 08 05:03:35 1999  <kondou>
! 
!   * samples/innreport.in (1.16.2.2):
!     samples/innreport.in:
! 	    - From: Richard Michael Todd <rmtodd@mailhost.ecn.ou.edu>
! 	    - When the 'html_header' or 'html_footer' options are turned on
!     in
! 	      innreport.conf, innreport fails to update innreport.db and
!     the
! 	      index.html files correctly.  The problem is that the code to
!     read in
! 	      the html headers/footers sets $/ to '' to read in the
!     headers/footers
! 	      all at once, and fails to set $/ back to newline afterwards.
! 
! Fri May 07 23:47:27 1999  <kondou>
! 
!   * Makefile (1.18.2.4):
!     Makefile:
! 	    - The patchlevel of the stable code was set to 0.
! 
! Fri May 07 23:32:44 1999  <kondou>
! 
!   * CONTRIBUTORS (1.13.2.2):
!     CONTRIBUTORS:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - Clean up some typos, grammar problems, and wrapping
!     inconsistencies
! 	      in CONTRIBUTORS.
! 
! Fri May 07 23:29:40 1999  <kondou>
! 
!   * samples/checkgroups.pl.in (1.8.2.1):
!   * samples/controlchan.in (1.21.2.2):
!     samples/checkgroups.pl.in:
!     samples/controlchan.in:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - A doit (or a successful verify-*) action on a checkgroups
!     message is
! 	      fairly pointless unless the output goes somewhere.  The
!     logical place
! 	      to send the output if no log file or anything is specified is
!     a mail
! 	      message to the news administartor.  This patch implements
!     that for
! 	      the controlchan checkgroups.pl.
! 
! Tue May 04 00:02:09 1999  <kondou>
! 
!   * storage/interface.c (1.35.2.2):
!     storage/interface.c:
! 	    - break line was dropped for case '@' in MatchGroups()
! 
! Mon May 03 23:58:11 1999  <kondou>
! 
!   * innd/art.c (1.90.2.8):
!     innd/art.c:
! 	    - drop article with null character in it (to avoid EOF before
!     end of
! 	      post)
! 
! Wed Apr 28 01:12:55 1999  <kondou>
! 
!   * configure (1.104.2.6):
!   * configure.in (1.106.2.6):
!     configure.in:
!     configure:
! 	    - MANDIR should be set to same as mandir
! 
! Wed Apr 28 01:11:05 1999  <kondou>
! 
!   * innd/innd.c (1.40.2.2):
!     innd/innd.c:
! 	    - From: "Igor Timkin" <ivt@gamma.ru>
! 	    - Active has
! 	      misc.jobs 00'+,'/0)* 0000000001 y
! 	      after ``ctlinnd renumber'' if .overview.index is bad.
! 	      I know that misc.jobs is wrong newsgroup
! 
! Mon Apr 26 08:40:47 1999  <kondou>
! 
!   * frontends/inews.c (1.15.2.3):
!     frontends/inews.c
! 	    - previous patch includes unwanted line which led to
!     compilation error
! 
! Mon Apr 26 07:08:34 1999  <kondou>
! 
!   * frontends/inews.c (1.15.2.2):
!     frontends/inews.c:
! 	    - From: Christian Kurz <shorty@jupiter.rhein-neckar.de>
! 	    - It seems, as inews doesn't accept lines longer than 512
!     characters,
! 	      if I'm not missing something. I have here an article, with a
!     Reference
! 	      line of 660 chars and the standard inews from 1.7.2 gives the
! 	      following error:
!     
! 	      shorty@jupiter% inews -h < /home/shorty/dead.letter
! 	      "References" header is too long.
! 	      (Article not posted.)
!     
! 	      After I changed the inews source, the article will be
!     acceppted by
! 	      inews and posted.
! 
! Mon Apr 19 07:05:23 1999  <kondou>
! 
!   * ltconfig (1.2.2.1):
!     ltconfig:
! 	    - From: "Boyd Lynn Gerber (801) 250-O795 Work"
!     <gerberb@zenez.com>
! 	    - Here is a patch for your libtool when you use SCO OpenServer
!     5.0.X.  I
! 	      have tested this on inn-2.1 and 2.2.  I do not get any errors
!     once
! 	      this has been applied on both version of inn.
! 
! Mon Apr 19 06:56:47 1999  <kondou>
! 
!   * nnrpd/article.c (1.57.2.7):
!     nnrpd/article.c:
! 	    - article check was always done regardless of nnrpdcheckart
! 
! Mon Apr 19 06:54:46 1999  <kondou>
! 
!   * innd/site.c (1.22.2.1):
!     innd/site.c:
! 	    - drop 'DEBUG' message
! 
! Thu Apr 15 07:01:40 1999  <kondou>
! 
!   * innd/cc.c (1.47.2.2):
!     innd/cc.c:
! 	    - From: Russell Vincent <russellv@uk.uu.net>
! 	    - This fixes a logic bug when possibly setting/unsetting a
!     reason
! 	      for preventing readers. When we set/unset NNRPReason, we want
!     to
! 	      check that readerswhenstopped in _not_ set. NNRPReason being
! 	      set prevents readers connecting when innd is paused.
! 
! Thu Apr 15 07:00:40 1999  <kondou>
! 
!   * samples/mailpost.in (1.1.2.2):
!     samples/mailpost.in:
! 	    - From: Geoff Gibbs <ggibbs@hgmp.mrc.ac.uk>
! 	    - There is a bug in mailpost, which produces the error message
!     
! 	      "First line with leading whitespace!"
!     
! 	      when it is fed an e-mail, where the body of the message
!     starts with
! 	      a space. (i.e. headers,blank line,space ...)
!     
! 	      The bug is in the code for handling header continuation
!     lines. I
! 	      believe that the following patch fixes the problem, although
!     you may
! 	      well be able to improve the Perl ;-)
! 
! Mon Apr 12 16:14:24 1999  <kondou>
! 
!   * samples/inncheck.in (1.22.2.5):
!     samples/inncheck.in:
! 	    - checking inndstart mode was incorrect
! 
! Mon Apr 12 16:12:23 1999  <kondou>
! 
!   * innd/art.c (1.90.2.7):
!     innd/art.c:
! 	    - show meaningful message, if article is not stored because it
!     does not
! 	      match any entry in storage.conf
! 
! Wed Apr 07 08:05:00 1999  <kondou>
! 
!   * backends/actsyncd.sh.in (1.3.2.2):
!     backends/actsyncd.sh.in:
! 	    - tried to remove directory where actsyncd sits
! 
! Fri Mar 26 00:40:56 1999  <kondou>
! 
!   * lib/getconfig.c (1.48.2.4):
!     lib/getconfig.c:
! 	    - reported by "Matthew Emmerton" <mattemme@enoreo.on.ca>
! 	    - tmpdir should not be DISPOSED(), since handed area is used by
! 	      putenv() for some OSes
! 
! Thu Mar 18 04:17:23 1999  <kondou>
! 
!   * backends/actsync.c (1.18.2.1):
!     backends/actsync.c:
! 	    - From: Thomas Mike Michlmayr <mike@cosy.sbg.ac.at>
! 	    - fixes a problem when syncing to a collabra-server, who
!     returns
! 	      "yg" as flag for a newsgroup (at least secnews.netscape.com).
! 
! Tue Mar 16 02:30:25 1999  <kondou>
! 
!   * samples/moderators (1.2.4.1):
!     samples/moderators:
! 	    - From: "Igor Timkin" <ivt@gamma.ru>
! 	    - moderators.isc.org don't have all fido7.* aliases (at least).
! 	      I (as fido7.* supporter) have many question about it.
! 
! Mon Mar 15 05:29:02 1999  <kondou>
! 
!   * nnrpd/post.c (1.28.2.7):
!     nnrpd/post.c:
! 	    - reported by Pavel Gulchouck <gul@lucky.net>
! 	    - inews and nnrpd dumps core if size of posting article more
!     then
! 	      local size limit. It happans because in inews.c line 1316 and
! 	      in nnrpd/post.c line 955 pointer p is out of core. I think
! 	      atoi(p) should be changed to innconf->localmaxartsize in
! 	      these lines.
! 
! Mon Mar 15 05:28:40 1999  <kondou>
! 
!   * frontends/inews.c (1.15.2.1):
!     frontends/inews.c:
! 	    - reported by Pavel Gulchouck <gul@lucky.net>
! 	    - inews and nnrpd dumps core if size of posting article more
!     then
! 	      local size limit. It happans because in inews.c line 1316 and
! 	      in nnrpd/post.c line 955 pointer p is out of core. I think
! 	      atoi(p) should be changed to innconf->localmaxartsize in
! 	      these lines.
! 
! Sun Mar 07 14:59:12 1999  <kondou>
! 
!   * nnrpd/article.c (1.57.2.6):
!     nnrpd/article.c:
! 	    - From: "Igor Timkin" <ivt@gamma.ru>
! 	    - fixed core dump
! 
! Sun Mar 07 14:56:57 1999  <kondou>
! 
!   * innfeed/innlistener.c (1.11.2.1):
!     innfeed/innlistener.c:
! 	    - From: "Igor Timkin" <ivt@gamma.ru>
! 	    - innfeed -- memory leak. On heavy loaded server (FreeBSD-3.1)
! 	      I got many ``partial read'' from innd (and each time
! 	      innlistener expanded empty buffer):
! 
! Wed Mar 03 03:04:50 1999  <kondou>
! 
!   * innd/art.c (1.90.2.6):
!   * innd/perl.c (1.7.2.1):
!     innd/art.c:
!     innd/perl.c:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - This patch adds a special __LINES__ key to the %hdr hash
!     available to
! 	      the Perl filter, containing an accurate line count of the
!     article.
! 
! Wed Mar 03 03:04:33 1999  <kondou>
! 
!   * README.perl_hook (1.9.2.1):
!     README.perl_hook:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - This patch adds a special __LINES__ key to the %hdr hash
!     available to
! 	      the Perl filter, containing an accurate line count of the
!     article.
! 
! Tue Mar 02 03:10:47 1999  <kondou>
! 
!   * innd/innd.h (1.44.2.1):
!   * innd/cc.c (1.47.2.1):
!     innd/cc.c:
!     innd/innd.h:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - The INN::newsgroup() XS Perl function is supposed to return
!     the flags		for a given newsgroup (ngp->Rest).  Unfortunately,
!     whoever wrote it
! 	      originally was unaware that the Rest pointer in a NEWSGROUP
!     is just a
! 	      pointer into the in-memory copy of the active file, and
!     therefore
! 	      this field is *not* null-terminated.  As a result, whenever a
!     Perl
! 	      filter called INN::newsgroup, it would get not only the flags
!     for
! 	      that newsgroup but a complete copy of the active file from
!     that point
! 	      forward.
! 
! Tue Feb 23 18:43:26 1999 David C Lawrence <tale>
! 
!   * samples/sendsys.pl.in (1.7.2.1):
!   * samples/senduuname.pl.in (1.7.2.1):
!   * samples/version.pl.in (1.8.2.1):
!     fixed instances of @inn::mailcmd to $inn::mailcmd that prevented these
!     scripts from being properly loaded
! 
! Tue Feb 23 18:18:29 1999 David C Lawrence <tale>
! 
!   * samples/controlchan.in (1.21.2.1):
!     syslog to /dev/log on dec_osf
! 
! Wed Feb 17 05:02:37 1999 David C Lawrence <tale>
! 
!   * samples/rmgroup.in (1.11.2.1):
!     FIxed check for existing group to not use regular expression for
!     matching
!     (would bogey *.lang.c++).
!     
!     moved approval check earlier, before mailing news admin.
! 
! Mon Feb 15 21:09:46 1999 David C Lawrence <tale>
! 
!   * backends/actsyncd.sh.in (1.3.2.1):
!     the output file was not being created in the work directory, but in
!     whatever directory the program started from
!     
!     made syncing directly from a local file work again
! 
! Sun Feb 14 07:48:44 1999  <kondou>
! 
!   * INSTALL (1.19.2.5):
!     INSTALL:
! 	    - From: Richard Kettlewell <rjk@greenend.org.uk>
! 	    - Firstly the reference to a "pound sign" as the comment
!     character is
! 	      misleading to speakers of British English, where that phrase
!     does not
! 	      refer to the "#" sign at all.
!     
! 	      Secondly there is a complete absence of any reference to
!     nnrp.access
! 	      in the section on setting up config files.
! 
! Sat Feb 13 10:56:47 1999  <kondou>
! 
!   * samples/news.daily.in (1.28.2.2):
!     samples/news.daily.in:
! 	    - use ${SED} instead of sed
! 
! Fri Feb 12 00:48:42 1999  <kondou>
! 
!   * lib/getconfig.c (1.48.2.3):
!     lib/getconfig.c:
! 	    - From: "Igor Timkin" <ivt@gamma.ru>
! 	    - correct mistake in rev. 1.48.2.2
! 
! Mon Feb 08 07:56:59 1999  <kondou>
! 
!   * nnrpd/nnrpd.c (1.49.2.5):
!     nnrpd/nnrpd.c:
! 	    - From: Andrew Gierth <andrew@erlenstar.demon.co.uk>
! 	    - The original code was correct in this respect. This is why
!     accept()
! 	      et. al. have an additional size parameter for the address.
!     The cast
! 	      is something of a historical crock, but is nevertheless
!     correct.
! 
! Sat Feb 06 03:14:45 1999  <kondou>
! 
!   * samples/cnfsstat.in (1.3.2.4):
!     samples/cnfsstat.in:
! 	    - From: davidsen@tmr.com (bill davidsen)
! 	    - I don't see in the man pages that you can use continuation
!     lines in
! 	      the cycbufs.conf file, but there's code to handle it, and it
!     makes
! 	      the file a lot easier to read.
!     
! 	      The cnfsstat script doesn't know about this, here's how to
!     make it
! 	      work.  This is just the bugfix, I am not quite ready to
!     release my
! 	      enhancements yet, due to unexplained failure with raw
!     partitions
! 
! Sat Feb 06 03:13:28 1999  <kondou>
! 
!   * nnrpd/nnrpd.c (1.49.2.4):
!     nnrpd/nnrpd:
! 	    - From: davidsen@tmr.com (bill davidsen)
! 	    - This patch addresses one bug (wrong data type) and one
!     missing
! 	      feature (nicekids). The type was a struct defined as
!     sockaddr_in and
! 	      used with a case where sockaddr was required. Because I'm not
!     sure
! 	      all systems will have the same size for both, and my compiler
!     whines
! 	      about the original, I defined the value correctly and dropped
!     the
! 	      cast.
!     
! 	      When running from innd, a nice() value is gotten from the
!     nicekids
! 	      value in inn.conf. In daemon mode that wasn't being done, so
!     I added
! 	      the code here. Note: you do *not* want to just start the
!     daemon
! 	      niced, as it will then open sockets more slowly (I measured
!     with
! 	      NSLG). Nicekids is the way to go here.
! 
! Tue Feb 02 03:26:12 1999  <kondou>
! 
!   * samples/inncheck.in (1.22.2.4):
!     samples/inncheck.in:
! 	    - From: SAKAI Kiyotaka <ksakai@netwk.ntt-at.co.jp>
! 	    - warn if null line is included in active
! 	    - warn if eol is not ended with '\n' in active
! 
! Mon Feb 01 07:20:58 1999  <kondou>
! 
!   * samples/innreport.in (1.16.2.1):
!     samples/innreport.in:
! 	    - showed non-existent tag for html output
! 
! Mon Feb 01 07:20:01 1999  <kondou>
! 
!   * innd/newsfeeds.c (1.18.4.4):
!   * innd/art.c (1.90.2.5):
!     innd/art.c:
! 	    - couting Lines was incorrect for storageapi
! 	    - '@' was meaningless for groups with 'x' in active
!     innd/newsfeeds.c:
! 	    - '@' was meaningless for non existent groups
! 
! Sun Jan 31 03:56:13 1999  <kondou>
! 
!   * samples/inn.conf.in (1.24.2.2):
!     samples/inn.conf.in:
! 	    - reported by Uli Zappe <uli@tallowcross.uni-frankfurt.de>
! 	    - default for readerswhenstopped is false
! 
! Sun Jan 31 03:56:00 1999  <kondou>
! 
!   * lib/getconfig.c (1.48.2.2):
!     lib/getconfig.c:
! 	    - reported by Uli Zappe <uli@tallowcross.uni-frankfurt.de>
! 	    - default for readerswhenstopped is false
! 
! Sun Jan 31 03:55:45 1999  <kondou>
! 
!   * innd/innd.c (1.40.2.1):
!     innd/innd.c:
! 	    - reported by Uli Zappe <uli@tallowcross.uni-frankfurt.de>
! 	    - default for readerswhenstopped is false
! 
! Fri Jan 29 11:54:37 1999  <kondou>
! 
!   * storage/cnfs/cnfs.c (1.51.2.8):
!     storage/cnfs/cnfs.c:
! 	    - From: Thomas Mechtersheimer <thomasm@nrw.net>
! 	    - it should be removed like the htonl() on cah.class at a
!     different
! 	      source location
! 
! Wed Jan 27 21:48:12 1999  <kondou>
! 
!   * innd/newsfeeds.c (1.18.4.3):
!     innd/newsfeeds.c:
! 	    - From: smurf@noris.de (Matthias Urlichs)
! 	    - mischecking errors
! 
! Wed Jan 27 21:44:02 1999  <kondou>
! 
!   * storage/cnfs/cnfs.c (1.51.2.7):
!     storage/cnfs/cnfs.c:
! 	    - From: thomasm@csl33.csl-gmbh.net
! 	    - for articles with offset values beyond the cycbuff->free
!     pointer,
! 	      this should be cyclenum-1
! 	    - From: smurf@noris.de (Matthias Urlichs)
! 	    - CNFS next-article code is broken because it fails to clear
!     the offset
! 	      when it switches to the next buffer
! 	    - From the "while I'm at it" department: the following patch,
!     to the
! 	      same file, fixes reading of old-style CNFS buffers --
!     assuming there
! 	      is anybody out there who still has a 1.x CNFS-INN server...
! 
! Wed Jan 27 21:05:06 1999  <kondou>
! 
!   * samples/docheckgroups.in (1.10.2.1):
!     samples/docheckgroups.in:
! 	    - From: Philippe Michel <Philippe.Michel@syseca.fr>
! 	    - maybe it would be better to use ${1:-.}, for backwards
!     compatibility
! 	      at least.
! 
! Wed Jan 27 15:28:16 1999  <kondou>
! 
!   * nnrpd/post.c (1.28.2.6):
!     nnrpd/post.c:
! 	    - From: John Schmidt <js@saltmine.radix.net>
! 	    - It seemed more logical to skip the check entirely if the
!     total number
! 	      of lines is less than 40.
! 
! Wed Jan 27 15:27:29 1999  <kondou>
! 
!   * innd/rc.c (1.31.2.3):
!     innd/rc.c:
! 	    - From: smurf@noris.de (Matthias Urlichs)
! 	    - Some Perl installations have -Dbool=char, which clashes with
! 	      innd/rc.c.
! 
! Mon Jan 25 10:09:58 1999  <kondou>
! 
!   * nnrpd/udp.c (1.3.2.3):
!     nnrpd/udp.c:
! 	    - From: SUNAGAWA Keiki <Keiki_SUNAGAWA@yokogawa.co.jp>
! 	    - include syslog.h instead of sys/syslog.h
! 
! Mon Jan 25 10:01:56 1999  <kondou>
! 
!   * nnrpd/commands.c (1.20.2.4):
!     nnrpd/commands.c:
! 	    - From: Paul Tomblin <ptomblin@xcski.com>
! 	    - here's the patch again
! 
! Fri Jan 22 15:29:15 1999  <kondou>
! 
!   * samples/cnfsstat.in (1.3.2.3):
!     samples/cnfsstat.in:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - write pointer was not printed correctly
! 
! Thu Jan 21 15:21:04 1999  <kondou>
! 
!   * site/do-subst.sh (1.1.1.1.4.1):
!     site/do-subst.sh:
! 	    - if there is a MAKE configure variable, use it
! 
! Thu Jan 21 11:04:33 1999 James Brister <brister>
! 
!   * README (1.5.2.3):
!   * CONTRIBUTORS (1.13.2.1):
!     2.2 update
! 
! Thu Jan 21 10:30:00 1999 James Brister <brister>
! 
!   * innfeed/Makefile (1.28.2.1):
!   * include/patchlevel.h (1.6.2.3):
!   * Makefile (1.18.2.3):
!     Update for 2.2 release.
! 
! Tue Jan 19 03:14:56 1999  <kondou>
! 
!   * innd/rc.c (1.31.2.2):
!     innd/rc.c:
! 	    - From: Sven Paulus <sven@karlsruhe.org>
! 	    - In innd/rc.c(RCwritelist()): I think The DISPOSE(r) is wrong
!     - via
! 	      cpcatpath() p points to a static buffer and r is assigned to
!     p.
! 
! Tue Jan 19 03:14:10 1999  <kondou>
! 
!   * frontends/rnews.c (1.16.2.3):
!     frontends/rnews.c:
! 	    - From: Sven Paulus <sven@karlsruhe.org>
! 	    - The value of PATHBADNEWS is combined using cpcatpath(), which
!     only
! 	      returns a pointer to a fixed buffer (pathbuff in
!     lib/getconfig.c).
! 	      Later - if you use a password protected NNTP connection -
!     rnews calls
! 	      NNTPsendpassword() (lib/sendpass.c) which also uses
!     cpcatpath() to
! 	      construct a path name -> pathbuff gets overwritten and the
!     value of
! 	      PATHBADNEWS is now pure nonsense.
! 
! Sun Jan 17 23:18:16 1999  <kondou>
! 
!   * samples/incoming.conf (1.3.4.2):
!   * samples/news.daily.in (1.28.2.1):
!     samples/incoming.conf:
! 	    - From: "Igor Timkin" <ivt@gamma.ru>
! 	    - Add ``noresendid'' for non-stream mode.
!     samples/news.daily.in:
! 	    - From: davidsen@tmr.com (bill davidsen)
! 	    - The news.daily script doesn't properly use the user defined
!     temp
! 	      space for sorts. There's some logic to look and see if TMPDIR
!     is
! 	      defined, build the -T option for sort to use, and then ignore
!     the
! 	      whole issue.
! 
! Sun Jan 17 23:16:25 1999  <kondou>
! 
!   * nnrpd/udp.c (1.3.2.2):
!     nnrpd/udp.c:
! 	    - From: Sven Paulus <sven@karlsruhe.org>
! 	    - This eliminates the calls to perror() and replaces them by
!     syslog()s.
! 	      The perror()s make it impossible to use nnrpd from inetd,
!     since the
! 	      output goes to the NNTP channel, thus violating the NNTP
!     specs.
! 
! Sun Jan 17 23:15:13 1999  <kondou>
! 
!   * innd/nc.c (1.37.2.4):
!     innd/nc.c:
! 	    - From: "Igor Timkin" <ivt@gamma.ru>
! 	    - Add ``noresendid'' for non-stream mode.
! 
! Sun Jan 17 23:14:27 1999  <kondou>
! 
!   * Makefile (1.18.2.2):
!     Makefile:
! 	    - From: Aidan Cully <aidan@panix.com>
! 	    - This patch should fix it..  I don't really know where the
!     FLAGS
! 	      variable comes from, since both GNU and BSD-make use
!     MAKEFLAGS, but
! 	      I'm more interested in making this work correctly than
!     cleaning
! 	      things up right now, so I just pass DESTDIR directly, like
!     the
! 	      install: target does to common.
! 
! Wed Jan 13 07:03:21 1999  <kondou>
! 
!   * innfeed/sysconfig.h (1.15.2.3):
!     innfeed/sysconfig.h:
! 	    - From: "Mark Wedel" <mark@icp.siemens.com>
! 	    - avoid symbol duplication for sinix
! 
! Tue Jan 12 13:33:38 1999  <kondou>
! 
!   * nnrpd/post.c (1.28.2.5):
!     nnrpd/post.c:
! 	    - From: Paul Tomblin <ptomblin@xcski.com>
! 	    - The test to see if PERMuser is set is wrong, because PERMuser
!     is a
! 	      char array, not a char pointer.
! 
! Mon Jan 11 02:00:28 1999  <kondou>
! 
!   * nnrpd/commands.c (1.20.2.3):
!     nnrpd/commands.c:
! 	    - From: Paul Tomblin <ptomblin@xcski.com>
! 	    - This patch sets PERMuser and PERMpass after perl
!     authentication so
! 	      that they reflect the user and password that successfully
! 	      authenticated, just as when you're using regular
!     authentication those
! 	      variables are set to the required values from the nnrp.access
!     file.
! 	      This is useful especially if you've configured
!     DO_NNRP_AUTH_SENDER
! 
! Mon Jan 11 01:38:47 1999  <kondou>
! 
!   * innd/art.c (1.90.2.4):
!     innd/art.c:
! 	    - From: "Igor Timkin" <ivt@gamma.ru>
! 	    - Add logging ``Too old'', ``No colon-space in header''
! 
! Sat Jan 09 17:38:43 1999  <kondou>
! 
!   * storage/cnfs/cnfs.c (1.51.2.6):
!     storage/cnfs/cnfs.c:
! 	    - correct syslog messages (storage.ctl was gone already)
! 
! Sat Jan 09 15:40:37 1999  <kondou>
! 
!   * nnrpd/post.c (1.28.2.4):
!     nnrpd/post.c:
! 	    - originally From: Russ Allbery <rra@stanford.edu>
! 	    - All this patch does is move the check against the posting
!     permissions
! 	      pattern above this check, and I believe implements precisely
!     the
! 	      following change: if a post goes to a group that would be
!     disallowed
! 	      by the posting permissions pattern, it will be refused
!     regardless of
! 	      whether we actually carry the group in question.
! 
! Fri Jan 08 22:03:32 1999 David C Lawrence <tale>
! 
!   * backends/nntpget.c (1.11.4.1):
!     y2k fix: pass only two digit date (RFC 977 rules) for newnews command
! 
! Fri Jan 08 22:02:04 1999 David C Lawrence <tale>
! 
!   * nnrpd/misc.c (1.28.2.4):
!     y2k fix: accept three digit and four digit years for dates in  NNTP
!     commands
! 
! Fri Jan 08 08:12:37 1999  <kondou>
! 
!   * INSTALL (1.19.2.4):
!     INSTALL:
! 	    - describe logipaddr should be false if controlchan is used and
!     ihave/
! 	      sendme is required
! 
! Fri Jan 08 01:32:08 1999  <kondou>
! 
!   * INSTALL (1.19.2.3):
!     INSTALL:
! 	    - Add AIX 4.2 which works INN2.x
! 
! Thu Jan 07 10:19:53 1999  <kondou>
! 
!   * innd/newsfeeds.c (1.18.4.2):
!     innd/newsfeeds.c:
! 	    - claim 'setup_error' if SITEsetup() fails
! 	      without this patch, innd exits with 'syntax_error' if
!     SITEsetup()
! 	      fails.  This is confusing for admins, even if there is no
!     syntax
! 	      error.
! 
! Wed Jan 06 10:29:52 1999  <kondou>
! 
!   * innd/art.c (1.90.2.3):
!     innd/art.c
! 	    - do not (sym)link if writelinks is false
! 
! Wed Jan 06 10:05:49 1999  <kondou>
! 
!   * INSTALL (1.19.2.2):
!     INSTALL:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - Patch to INSTALL attached to add more details on why you
!     might need
! 	      overview data and more detail of what the point of the
!     different
! 	      BUCKETS in overview.ctl is.  I also corrected one place where
!     the
! 	      file had an 80 column line, since it made it somewhat
!     annoying to
! 	      deal with in emacs.  (There's still another 80 column line,
!     but
! 	      that's a literal cron entry example that can't be easily
!     shortened
! 	      and is offset from regular text.)
! 
! Wed Jan 06 04:53:17 1999  <kondou>
! 
!   * samples/innreport_inn.pm (1.5.2.4):
!     samples/innreport_inn.pm:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - this will suppress the cycbuff rollover messages, which
!     otherwise
! 	      show up as unknown log entries.  At some point, someone might
!     want to
! 	      do something more interesting with these, but for right now
!     ignoring
! 	      them seems the best.
!     
! 	      There's also a minor formatting fix with a comment in here.
! 
! Tue Jan 05 22:29:59 1999  <kondou>
! 
!   * samples/nnrpd_auth.pl.in (1.1.2.1):
!     samples/nnrpd_auth.pl.in:
! 	    - From: Paul Tomblin <ptomblin@xcski.com>
! 	    - The nnrpd_auth.pl supplied with 2.2-STABLE assumes that the
!     hostname
! 	      patterns in nnrp.access are regular expressions, but they're
!     not,
! 	      they're glob-like.
! 
! Tue Jan 05 15:33:20 1999  <kondou>
! 
!   * backends/archive.c (1.10.4.3):
!     backends/archive.c:
! 	    - just create one archive even if the article is crossposted
! 
! Tue Jan 05 07:17:50 1999  <kondou>
! 
!   * samples/innreport_inn.pm (1.5.2.3):
!     samples/innreport_inn.pm:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - With this plus my previous patch that was already applied, I
!     think
! 	      innreport is at least quiet about all of the log messages
!     generated
! 	      routinely by the standard programs in INN 2.2.
! 
! Mon Jan 04 21:26:54 1999  <kondou>
! 
!   * samples/innreport_inn.pm (1.5.2.2):
!     samples/innreport_inn.pm:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - Better yet, fix innreport so that it ignores controlchan's
!     output.
! 	      There may be some statistical summary that I can think of
!     that might
! 	      be useful eventually, and that way you still have the logs
!     there in
! 	      case you ever want them.	Here's a patch:
! 
! Mon Jan 04 07:44:19 1999  <kondou>
! 
!   * storage/Makefile (1.33.2.1):
!     storage/Makefile:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - storage/Makefile creates a storage/objs directory on first
!     build, but
! 	      the clean target, while deleting everything in the directory,
!     doesn't
! 	      delete the directory itself.  That seems wrong to me, and
!     makes CVS
! 	      whine on an update after a build.  Patch following.
! 
! Mon Jan 04 07:42:50 1999  <kondou>
! 
!   * innd/rc.c (1.31.2.1):
!     innd/rc.c:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - I always liked the way innfeed.conf would let you leave off
!     the
! 	      ip-addr key if it was the same as the key of the entry, so I
!     fixed
! 	      incoming.conf so that it would do the same.  Patch attached.
! 
! Mon Jan 04 07:35:43 1999  <kondou>
! 
!   * Makefile (1.18.2.1):
!   * INSTALL (1.19.2.1):
!     INSTALL:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - explain transit only server needs overview
!     Makefile:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - I'm not sure the intended semantics of realclean here, but
!     I'm pretty
! 	      sure it's intended to be the same as distclean.  If so, it's
!     missing
! 	      a goodly bit of stuff according to CVS, plus it's convenient
!     to have
! 	      distclean available as an alias for it as well.  Patch
!     attached.
!     
! 	      This also removes the following over what was deleted before:
!     
! 	      ? config.status
! 	      ? frontends/c7unbatch.sh
! 	      ? frontends/gunbatch.sh
! 	      ? include/autoconfig.h
! 	      ? innfeed/innfeed-convcfg
! 	      ? innfeed/procbatch
! 	      ? samples/checkgroups.pl
! 	      ? samples/cnfsstat
! 	      ? samples/controlbatch
! 	      ? samples/controlchan
! 	      ? samples/ihave.pl
! 	      ? samples/mailpost
! 	      ? samples/mod-active
! 	      ? samples/news2mail
! 	      ? samples/newgroup.pl
! 	      ? samples/nnrpd_auth.pl
! 	      ? samples/pullnews
! 	      ? samples/rmgroup.pl
! 	      ? samples/sendme.pl
! 	      ? samples/sendsys.pl
! 	      ? samples/senduuname.pl
! 	      ? samples/simpleftp
! 	      ? samples/version.pl
! 	      ? site/config
! 
! Mon Jan 04 02:14:22 1999  <kondou>
! 
!   * configure.in (1.106.2.5):
!   * configure (1.104.2.5):
!     configure:
!     configure.in:
! 	    - From: Russ Allbery <rra@stanford.edu>
! 	    - Additional commands that should run after autoconf generates
!     its
! 	      output files should be put into the second argument of
!     AC_OUTPUT
! 	      rather than just raw into configure.in.  Raw commands will
!     correctly
! 	      get put into the generated configure script, but they *won't*
!     be put
! 	      into config.status.  config.status is very convenient when
!     doing a
! 	      first build and having to patch various things; if you run
! 	      config.status, it will just redo the variable substitution
!     without
! 	      rerunning configure.  But when I was doing that, the build
!     then
! 	      failed because storage/buildconfig wasn't executable.
!     
! 	      configure just runs config.status to do the substitutions;
!     with this
! 	      patch, the chmod gets put in config.status rather than in
!     configure
! 	      and therefore works correctly both after running configure
!     and after
! 	      running config.status.
--- 1,261 ----
! This file lists the change logs applicable to version 2.2.2 made since the
! 2.2.1 release.
! 	
! samples/inncheck.in:
! 	- From: Wolfgang Breyha <wbreyha@gmx.net>
! 	- The "inncheck" Util doesn't check for lines of the style "%DEFINEx:"
! 	  in nnrp.access.
! 
! innd/art.c:
! 	- previous patch still does not fix the problem which leads innd
! 	  dumping core
! 
! innd/art.c:
! 	- From: Don Lewis <Don.Lewis@tsc.tdk.com>
! 	- There's a bug in the ARTpost() function - when it sees an article
! 	  with a distribution header such as "Distribution: ," (note the
! 	  comma), the DISTparse() function returns a distribution[] array with
! 	  a null pointer as it's first element (i.e., an empty list). The later
! 	  call to MaxLength() in the arguments to sprintf() dereferences this
! 	  and dies in flames.
! 
! doc/innfeed.1:
! doc/innfeed.conf.5:
! 	- drop beta description
! 
! README:
! 	- drop beta description
! 
! 	Add documentation of innflags in inn.conf and of the syntax of
! 	incoming.conf.  By Richard Kettlewell <richard.kettlewell@kewill.com>.
! 
! samples/innreport_inn.pm:
! 	- From: Michael Hall <mhall@riverside.org>
! 	- fixes the error that says "Use of uninitialized value at ..."
! 
! nnrpd/udp.c:
! 	- fix for ULTRIX (strdup() does not exist)
! 
! frontends/innconfval.c:
! 	- fix for ULTRIX (strdup() does not exist)
! 
! backends/inndf.c:
! 	- From: Hiroshi MIZOGUCHI <mizoguti@screen.co.jp>
! 	- patch to make ULTRIX work
! 
! 	Add support for alphaev6.
! 
! lib/endian.c:
! 	- From: Hiroshi MIZOGUCHI <mizoguti@screen.co.jp>
! 	- fixed for ULTRIX
! 
! innd/art:c
! 	- check of path in ListHas() was incorrect
! 
! nnrpd/misc.c:
! 	- From: Russell Vincent <russellv@uk.uu.net>
! 	- broken newnews (y2k problem) fixed
! 
! samples/innreport.in:
! 	- From: David Shrimpton <shrimpto@its.uq.edu.au>
! 	- If you set cycle to other than none , eg 7 in innreport.conf then
! 	  index.html is missing all the daily reports that are listed in
! 	  innreport.db
! 
! samples/pgpverify.in:
! 	- From: David Shrimpton <shrimpto@its.uq.edu.au>
! 	- Bug in errmsg subroutine in pgpverify which causes pgpverifies to be
! 	  syslogged with undefined facility
! 
! backends/batcher.c:
! 	- From: David Shrimpton <shrimpto@its.uq.edu.au>
! 	- "Reading config from /usr/local/news/etc/inn.conf" messages to be
! 	  syslogged with undefined facility.
! 
! samples/innshellvars.pl.in:
! samples/innshellvars.tcl.in:
! 	- delete useless variable
! 
! 	The innreport.conf setting for graph was ignored.
! 
! 	Typo in openlog().
! 
! 	The fcntl() flag is F_SETFD, not FD_SETFD.
! 
! frontends/sm.c:
! 	- do not call SMinit() if there is no token in arguments
! 
! samples/cnfsstat.in:
! 	- skip if no article is stored
! 
! samples/control.ctl:
! 	- add drop entry for PGP signed hierarchy
! 
! 	Use space instead of tab after To: to work around a bug in Solaris
! 	sendmail.
! 
! innd/art.c:
! 	- From: Sven Paulus <sven@karlsruhe.org>
! 	- innd may dump core when copying Bytes header
! 
! innd/nc.c:
! 	- From: Heiko Schlichting <inn-bugs@fu-berlin.de>
! 	- When streaming is enabled and INN gets a NNTP "check" command WITHOUT
! 	  a following space/tab and message-id, it prints some memory dump to
! 	  the requestor
! 
! innd/status.c:
! 	- From: Heiko Schlichting <inn-bugs@fu-berlin.de>
! 	- inn crashes immediately if status was enabled and the compile-time
! 	  "MAX_PEER" limit is reached
! 
! samples/innreport_inn.pm:
! 	- 'ME' was included for innfeed stats
! 
! nnrpd/post.c:
! 	- '\r' was lost, if header is folded
! 
! innd/chan.c:
! 	- From: rmtodd@skywalker.ecn.ou.edu (Richard Todd)
! 	- This patch clears cp->In.Data and cp->Out.Data after the data they
! 	  point to are freed in CHANclose, thus making sure that we don't try
! 	  to free the same data again in CHANshutdown, thus littering the
! 	  errlog with
! 	    innd in free(): warning: page is already free.
! 	  warnings from the malloc/free code.
! 
! samples/innreport_inn.pm:
! 	- cancel message which recorded as 'c' was counted twice (also recorded
! 	  as '+') ($inn_flow_total was incorrectly incremented)
! 
! 	Fix typo causing make distclean not to remove include/autoconfig.h.
! 
! 	Use ppport.h for cross-version Perl compatibility rather than
! 	individual #define's in each file.  Also convert the last few
! 	occurances of na to PL_na and remove some duplicate #include's.
! 
! 	Rename include/patchlevel.h to include/innversion.h to avoid conflicts
! 	with Perl header files.
! 
! doc/newsfeeds.5:
! 	- description of ME/exclude was dropped
! 
! doc/Makefile:
! 	- mod-active.8 and simpleftp.1 were still not installed
! 
! 	mod-active.8 was missing from the list of man pages.  Reported by John
! 	Summerfield <summer@OS2.ami.com.au>.
! 
! innd/art.c:
! 	- replic data was broken if storage api and xrefslave is true
! innd/innd.h:
! innd/status.c:
! 	- Size may be overflow
! 
! frontends/inews.c:
! 	- From: Steve Campbell <steve@avalon.Dartmouth.EDU>
! 	- the comparison of mail address should be case-insensitive
! 
! samples/innreport_inn.pm:
! 	- still did not calculate outgoing feed correctly
! 
! samples/innreport_inn.pm:
! 	- innreport should see 'global' log message, or outgoing feed is much
! 	  less than reality
! 
! innd/chan.c:
! 	- paused connection might not be revived correctly when another active
! 	  connection is closed
! 
! innfeed/host.c:
! 	- fixed a problem that 'final' stats was not out if the connection
! 	  is vanished
! 
! innd/chan.c:
! innd/innd.h:
! innd/rc.c:
! 	- 'max-connections' in incoming.conf was effective on each IP address,
! 	  not each label
! 
! backends/batcher.c:
! 	- From: KIZU takashi <kizu@ics.es.osaka-u.ac.jp>
! 	- still had a bug, and fixed it
! 
! backends/batcher.c:
! 	- From: KIZU takashi <kizu@ics.es.osaka-u.ac.jp>
! 	- If any batch file is not opend yet and some kind of signals is
! 	  trapped, the function RequeueAndExit(-1, NULL, 0L) will be called and
! 	  the top line in a queue file will be lost.
! 
! 	  If (BytesInBatch > 0 && BytesInCB + BytesInArt >= BytesInBatch) and
! 	  (MaxBytes > 0 BytesWritten + BytesInArt >= MaxBytes), then `while
! 	  (fgets...)' loop is breaked. But the function BATCHclose(F) usually
! 	  returns 0. Hence `Cookie' is ignored in the function RequeueAndExit().
! 
! innd/nc.c:
! 	- reported by Paul Tomblin <ptomblin@xcski.com>
! 	- 'internal rejecting huge article ..' should not be informed as L_ERROR
! 
! innd/art.c:
! 	- reported by Paul Gamble <paul@saix.net>
! 	- the Xref header in the article as it appears on the reader server
! 	  contains the reader's hostname and not the transit server's
! 	  in slave mode
! 
! samples/parsecontrol.in:
! 	- From: YOKOTA yoshinori <yokota@yynet.tama.tokyo.jp>
! 	- gnu sed was failed to parse
! 
! frontends/inews.c:
! 	- From: Russell Vincent <russellv@uk.uu.net>
! 	- missing '\n' in a couple of error reports
! 
! 	Clean up the environment initialization and fix a potential buffer
! 	overflow reported by Stan Bubrouski <SB@MailAndNews.com>.  Allocate
! 	memory for each environment variable in-place without copying things
! 	through a buffer.
! 
! configure:
! configure.in:
! 	- From: "Boyd Lynn Gerber (801) 250-O795 Work" <gerberb@zenez.com>
! 	- Patch for configure.in for SCO OpenServer 5.0.X and UnixWare 7.1.0
! 
! samples/nntpsend.in:
! 	- From: Russell Vincent <russellv@uk.uu.net>
! 	- prevent nntpsend from overwriting its own batches when using
! 	  storageapi and under certain circumstances (most likely when
! 	  innxmit to a site isn't running and there is already a backlog).
! 
! README:
! 	- From: ambar@clock.org
! 	- typo fixed
! 
! nnrpd/article.c:
! 	- reported by Damien Masse <masse@clipper.ens.fr>
! 	- I found this bug in INN version 2.2 (and version 2.1) :
! 	  when you ask for the last header of the overview file with the 'xhdr'
! 	  command, nnrp displays each header followed by a "\n<number> ".
! 
! nnrpd/perl.c:
! 	- From: Jan-Erik Eriksson <jee@alcom.aland.fi>
! 	- Using the --with-perl on inn-2.2.1 (RedHat 5.2, perl5.00405) will
! 	  cause make to fail.
! 
! lib/perl.c:
! 	- From: Jan-Erik Eriksson <jee@alcom.aland.fi>
! 	- Using the --with-perl on inn-2.2.1 (RedHat 5.2, perl5.00405) will
! 	  cause make to fail.
! 
! innd/cc.c:
! innd/perl.c:
! 	- From: Jan-Erik Eriksson <jee@alcom.aland.fi>
! 	- Using the --with-perl on inn-2.2.1 (RedHat 5.2, perl5.00405) will
! 	  cause make to fail.
! 
! nnrpd/newnews.c:
! 	- '>' was missed for the response
! 
! 
! Local Variables:
! mode: text
! End:
diff -Nacr inn-2.2.1/INSTALL inn-2.2.2/INSTALL
*** inn-2.2.1/INSTALL	Wed May 12 00:51:15 1999
--- inn-2.2.2/INSTALL	Mon Dec 13 13:18:37 1999
***************
*** 1,11 ****
! Welcome to INN 2.0!
  
    Please read this document thoroughly before trying to install INN. You'll be
    glad you did.
  
    If you are upgrading from a previous release of INN (pre-2.0) then it is
    recommended that you make copies of your old configuration files and use them
!   as guides for doing a clean installation and configuration of 2.0. Many
    config files have changed, some have been added, and some have been removed.
    You'll find it much easier to start with a fresh install than to try to
    update your old installation.
--- 1,11 ----
! Welcome to INN 2.2.2!
  
    Please read this document thoroughly before trying to install INN. You'll be
    glad you did.
  
    If you are upgrading from a previous release of INN (pre-2.0) then it is
    recommended that you make copies of your old configuration files and use them
!   as guides for doing a clean installation and configuration of 2.2.2. Many
    config files have changed, some have been added, and some have been removed.
    You'll find it much easier to start with a fresh install than to try to
    update your old installation.
***************
*** 14,20 ****
  
    < Should list all supported OS/hardware configurations >
  
!   FreeBSD 2.2.x
    Linux 2.0.x (with libc 5.4 or libc 6.0)
    OpenBSD ?.?
    SCO 5.0.4 (tested with gcc 2.8.1)
--- 14,20 ----
  
    < Should list all supported OS/hardware configurations >
  
!   FreeBSD 2.2.x, 3.x
    Linux 2.0.x (with libc 5.4 or libc 6.0)
    OpenBSD ?.?
    SCO 5.0.4 (tested with gcc 2.8.1)
***************
*** 135,141 ****
    group. You can change these if you want but these are the defaults and it's
    easier to stick with them on a new installation.
  
!   INN 2.0 uses the GNU 'configure' program to make configuration rather
    painless.  Unless you have a rather abnormal setup configure should be able
    to completely configure INN for your setup. If you want to change the
    defaults you can invoke the configure script with one or more command line
--- 135,141 ----
    group. You can change these if you want but these are the defaults and it's
    easier to stick with them on a new installation.
  
!   INN now uses the GNU 'configure' program to make configuration rather
    painless.  Unless you have a rather abnormal setup configure should be able
    to completely configure INN for your setup. If you want to change the
    defaults you can invoke the configure script with one or more command line
***************
*** 352,357 ****
--- 352,361 ----
                         is required.  Or ihave and sendme cannot get correct
  	               name, then the messages are incorrect.
  
+   innflags             This allows you pass flags to the INN server process
+                        when it starts up.  If you use the `crosspost' feed
+                        (which is recommended) then you must set this to `-L'.
+ 
    2. newsfeeds (REQUIRED)
  
    The newsfeeds file determines how incoming articles are redistributed to
***************
*** 466,473 ****
  
    The incoming.conf file describes what machines are allowed to connect to
    your host to feed articles. In previous versions of INN a different
!   file (hosts.nntp) was used to do some of what incoming.conf can do. See
!   the incoming.conf manpage for more details.
  
    4. cycbuff.conf (Required only if using the CNFS article storage method)
  
--- 470,488 ----
  
    The incoming.conf file describes what machines are allowed to connect to
    your host to feed articles. In previous versions of INN a different
!   file (hosts.nntp) was used to do some of what incoming.conf can do.
! 
!   You can get started for a single feed by adding an entry like this:
! 
!          peer my-feed-site.domain.com {
!          }
! 
!   ..assuming that you will be receiving articles from 
!   my-feed-site.domain.com.  Note that this doesn't cause remote sites
!   to start feeding you news - it merely allows them to do so if they so
!   choose.
! 
!   See the incoming.conf man page for full details.
  
    4. cycbuff.conf (Required only if using the CNFS article storage method)
  
diff -Nacr inn-2.2.1/MANIFEST inn-2.2.2/MANIFEST
*** inn-2.2.1/MANIFEST	Wed Dec 30 05:24:12 1998
--- inn-2.2.2/MANIFEST	Mon Dec 13 13:18:37 1999
***************
*** 199,204 ****
--- 199,205 ----
  include/dbz.h               1 Header file for DBZ
  include/innconf.h           1 Header file for inn.conf
  include/inndcomm.h          1 Innd control channel commands
+ include/innversion.h        1 Official change log
  include/libinn.h            1 InterNetNews library declarations
  include/macros.h            1 Useful syntactic sugar
  include/md5.h               1 Header file for processing md5
***************
*** 207,214 ****
  include/myserver.h          1 Replacement for rrn server.h
  include/mystring.h          1 Default <string.h>
  include/nntp.h              1 NNTP command and reply codes
- include/patchlevel.h        1 Official change log
  include/paths.h.in          1 Paths to common programs and files
  include/qio.h               1 Header file for quick I/O package
  include/storage.h           1 Header file for storageAPI
  include/uio.h               1 Minimal <sys/uio.h> for sites without writev
--- 208,215 ----
  include/myserver.h          1 Replacement for rrn server.h
  include/mystring.h          1 Default <string.h>
  include/nntp.h              1 NNTP command and reply codes
  include/paths.h.in          1 Paths to common programs and files
+ include/ppport.h            1 Perl portability and pollution macros
  include/qio.h               1 Header file for quick I/O package
  include/storage.h           1 Header file for storageAPI
  include/uio.h               1 Minimal <sys/uio.h> for sites without writev
diff -Nacr inn-2.2.1/Makefile inn-2.2.2/Makefile
*** inn-2.2.1/Makefile	Wed Aug 25 15:25:55 1999
--- inn-2.2.2/Makefile	Mon Dec 13 13:18:37 1999
***************
*** 1,11 ****
! ##  $Revision: 1.18.2.5 $
  
  include Makefile.global
  
  CFLAGS = $(GCFLAGS)
  
  RELEASE=2
! PATCHLEVEL=2.1
  VERSION=$(RELEASE).$(PATCHLEVEL)
  
  #TARDIR=inn
--- 1,11 ----
! ##  $Revision: 1.18.2.9 $
  
  include Makefile.global
  
  CFLAGS = $(GCFLAGS)
  
  RELEASE=2
! PATCHLEVEL=2.2
  VERSION=$(RELEASE).$(PATCHLEVEL)
  
  #TARDIR=inn
***************
*** 95,101 ****
  	rm -f BUILD makedirs.sh config/config.data backends/actmerge.sh
  	rm -f backends/actsyncd.sh backends/sendxbatches.sh
  	rm -f frontends/c7unbatch.sh frontends/gunbatch.sh
! 	rm -f includes/autoconfig.h include/clibrary.h include/config.h
  	rm -f include/paths.h innfeed/innfeed-convcfg innfeed/procbatch
  	rm -f samples/actsync.cfg samples/checkgroups samples/checkgroups.pl
  	rm -f samples/cnfsstat samples/controlbatch samples/controlchan
--- 95,101 ----
  	rm -f BUILD makedirs.sh config/config.data backends/actmerge.sh
  	rm -f backends/actsyncd.sh backends/sendxbatches.sh
  	rm -f frontends/c7unbatch.sh frontends/gunbatch.sh
! 	rm -f include/autoconfig.h include/clibrary.h include/config.h
  	rm -f include/paths.h innfeed/innfeed-convcfg innfeed/procbatch
  	rm -f samples/actsync.cfg samples/checkgroups samples/checkgroups.pl
  	rm -f samples/cnfsstat samples/controlbatch samples/controlchan
***************
*** 139,182 ****
  #shar:
  #	makekit -m -k40 -s70k
  
! release: include/patchlevel.h samples/version tar
  
! include/patchlevel.h: Makefile
! 	-set -x ; [ -f $@ ] || co -u $@ ; \
  	sed -e 's/^\(#define RELEASE\).*/\1 "$(RELEASE)"/' \
  	    -e 's/^\(#define PATCHLEVEL\).*/\1 "$(PATCHLEVEL)"/' \
  	    -e 's/^\(#define DATE\).*/\1 "'"`date '+%d-%b-%Y'`"'"/' \
  		$@ > $@.new ;\
! 	if diff -u $@ $@.new > PATCH.$$$$ 2>&1;then \
! 		: ;\
! 	elif rcsdiff $@ > /dev/null 2>&1; then \
! 		rcsclean -u $@ ;\
! 		co -l $@ ;\
! 		patch < PATCH.$$$$ ;\
! 		ci -u -m'new release' $@ ;\
! 	else \
! 		ci -l -m'unknown snapshot' $@ ;\
! 		patch < PATCH.$$$$ ;\
! 		ci -u -m'new release' $@ ;\
! 	fi ;\
! 	rm -f PATCH.$$$$
! 
! 
! samples/version: Makefile
! 	-set -x ; rcsclean -u $@ ;\
! 	co -l $@ ;\
! 	sed -e 's/^\(VERSION="\).*/\1INN $(RELEASE).$(PATCHLEVEL)"/' \
! 		$@ > $@.new ;\
! 	if cmp $@ $@.new > /dev/null 2>&1; then \
! 		rm -f $@.new ;\
! 		rcsdiff $@ > /dev/null 2>&1 && rcs -u $@ ;\
! 	else \
! 		mv $@.new $@ ;\
! 		ci -u -m'new version $(RELEASE).$(PATCHLEVEL)' $@ ;\
! 	fi
  
  
! tardir: MANIFEST CHANGES
  	rm -f inn*.tar.Z inn*.tar.gz
  	rm -fr $(TARDIR)
  	mkdir $(TARDIR)
--- 139,159 ----
  #shar:
  #	makekit -m -k40 -s70k
  
! release: include/innversion.h samples/version tar
  
! include/innversion.h::
  	sed -e 's/^\(#define RELEASE\).*/\1 "$(RELEASE)"/' \
  	    -e 's/^\(#define PATCHLEVEL\).*/\1 "$(PATCHLEVEL)"/' \
  	    -e 's/^\(#define DATE\).*/\1 "'"`date '+%d-%b-%Y'`"'"/' \
  		$@ > $@.new ;\
! 	mv $@.new $@
  
+ samples/version::
+ 	sed -e 's/^\(VERSION="\).*/\1INN $(RELEASE).$(PATCHLEVEL)"/' \
+ 		$@ > $@.new ;
+ 	mv $@.new $@
  
! tardir:
  	rm -f inn*.tar.Z inn*.tar.gz
  	rm -fr $(TARDIR)
  	mkdir $(TARDIR)
***************
*** 184,212 ****
  
  tar:	tardir
  	for i in `sed $(SEDCOMMANDS) <MANIFEST`;do \
! 		[ -f $$i ] || co $$i ; cp $$i $(TARDIR)/$$i;done
  	find $(TARDIR) -type f -print | xargs touch -t `date +%m%d%H%M.%S`
  	tar cf $(TARFILE) $(TARDIR)
  	$(SQUASH) $(TARFILE)
  
  FAQ: FORCE
- 	-cd FAQ && co -q RCS/*
- 
- rcsclean: FORCE
- 	-for i in . *;do\
- 		if [ -d $$i -a -d $$i/RCS ]; then\
- 			echo "RCS Cleaning $$i";\
- 			(cd $$i && rcsclean -q -u);\
- 		fi;\
- 	done
- 
- rcscoall: FORCE
- 	-for i in . *;do\
- 		if [ -d $$i -a -d $$i/RCS ]; then\
- 			echo "Checking out in $$i";\
- 			(cd $$i && co -q $(RCSCOFLAGS) RCS/*);\
- 		fi;\
- 	done
  
  CHANGES: FORCE
  	-for i in ChangeLog */ChangeLog;do\
--- 161,173 ----
  
  tar:	tardir
  	for i in `sed $(SEDCOMMANDS) <MANIFEST`;do \
! 		cp $$i $(TARDIR)/$$i; \
! 	done
  	find $(TARDIR) -type f -print | xargs touch -t `date +%m%d%H%M.%S`
  	tar cf $(TARFILE) $(TARDIR)
  	$(SQUASH) $(TARFILE)
  
  FAQ: FORCE
  
  CHANGES: FORCE
  	-for i in ChangeLog */ChangeLog;do\
***************
*** 220,225 ****
--- 181,187 ----
  ##  Local convention; for xargs.
  list:	FORCE
  	@sed $(SEDCOMMANDS) <MANIFEST >FILELIST
+ 
  FORCE:
  
  # DO NOT DELETE THIS LINE -- make depend depends on it.
diff -Nacr inn-2.2.1/NEWS inn-2.2.2/NEWS
*** inn-2.2.1/NEWS	Wed Aug 25 15:13:53 1999
--- inn-2.2.2/NEWS	Mon Dec 13 13:18:37 1999
***************
*** 1,7 ****
--- 1,14 ----
  
  Here are the changes for the latest version of INN.
  
+ Version 2.2.2
+ 
+ 	- Various minor bug fixes and a y2k bug fix. The y2k bug is in version 
+ 	  version 2.2.1 only and will show up after Jan 1st when a news reader
+ 	  issues a NEWNEWS command for a date prior to the year 2000. 
+ 
  Version 2.2.1
+ 
          - Various bug fixes. Most importantly, bug fixes to potential 
            security holes (buffer overflow type).
  
diff -Nacr inn-2.2.1/README inn-2.2.2/README
*** inn-2.2.1/README	Wed Aug 25 15:58:43 1999
--- inn-2.2.2/README	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! Welcome to INN 2.2.1!
  
    This work is sponsored by the Internet Software Consortium.
  
--- 1,4 ----
! Welcome to INN 2.2.2!
  
    This work is sponsored by the Internet Software Consortium.
  
***************
*** 41,47 ****
    over TCP/IP is called NNTP (Network News Transport Protocol).
  
    INN supports accepting articles via either NNTP connections or via
!   UUCP.  innd, the heard of INN, handles NNTP feeding connections
    directly; UUCP newsfeeds use rnews (included in INN) to hand articles
    off to innd.  Other parts of INN handle feeding articles out to other
    news servers, most commonly innfeed (for real-time outgoing feeds) or
--- 41,47 ----
    over TCP/IP is called NNTP (Network News Transport Protocol).
  
    INN supports accepting articles via either NNTP connections or via
!   UUCP.  innd, the heart of INN, handles NNTP feeding connections
    directly; UUCP newsfeeds use rnews (included in INN) to hand articles
    off to innd.  Other parts of INN handle feeding articles out to other
    news servers, most commonly innfeed (for real-time outgoing feeds) or
***************
*** 113,121 ****
    INN also comes with a very complete set of man pages; there is a man
    page for every configuration file and program that comes with INN.
    (If you find one that doesn't have a man page, that's a bug.  Please
!   do report it.)  When trying to figure out some specific problem,
!   reading the man pages for all of the configuration files involved is a
!   very good start.
  
  Reporting Bugs
  
--- 113,131 ----
    INN also comes with a very complete set of man pages; there is a man
    page for every configuration file and program that comes with INN.
    (If you find one that doesn't have a man page, that's a bug.  Please
!   do report it to inn-bugs@isc.org.)  When trying to figure out some
!   specific problem, reading the man pages for all of the configuration
!   files involved is a very good start.
! 
!   Some good resources on the web (as of December 1999) are:
! 
! 	http://www.isc.org
! 	http://web.inter.nl.net/users/Elena.Samsonova/unix/INN/v2.3/
! 	http://www.blank.org/innfaq
! 	http://www.mibsoftware.com/userkt/userkt.html
! 	http://www.cis.ohio-state.edu/~barr/INN.html
! 	http://members.home.net/rck/software/inn.html
! 	http://www.cybercable.fr/~droyer/inn.html
  
  Reporting Bugs
  
***************
*** 202,205 ****
    <URL:http://www.isc.org/isc/>.
  
  James Brister
! inn@isc.org
--- 212,216 ----
    <URL:http://www.isc.org/isc/>.
  
  James Brister
! inn-bugs@isc.org 	-- bug reports.
! inn@isc.org		-- general INN related mail
diff -Nacr inn-2.2.1/backends/batcher.c inn-2.2.2/backends/batcher.c
*** inn-2.2.1/backends/batcher.c	Tue Oct 13 23:17:48 1998
--- inn-2.2.2/backends/batcher.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.9 $
  **
  **  Read batchfiles on standard input and spew out batches.
  */
--- 1,4 ----
! /*  $Revision: 1.9.2.3 $
  **
  **  Read batchfiles on standard input and spew out batches.
  */
***************
*** 117,137 ****
  	(void)printf("\n");
      }
  
-     (void)openlog("batcher", L_OPENLOG_FLAGS | LOG_PID, LOG_INN_PROG);
      syslog(L_NOTICE, LINE1, Host, usertime, systime, STATend - STATbegin);
      syslog(L_NOTICE, LINE2, Host, BATCHcount, ArtsWritten, BytesWritten);
  
      /* Last batch exit okay? */
      if (BATCHstatus == 0) {
! 	if (feof(stdin)) {
  	    /* Yes, and we're all done -- remove input and exit. */
  	    (void)fclose(stdin);
  	    if (Input)
  		(void)unlink(Input);
  	    exit(0);
  	}
- 	/* Don't seek back -- batch was fine. */
- 	Cookie = -1;
      }
  
      /* Make an appropriate spool file. */
--- 117,134 ----
  	(void)printf("\n");
      }
  
      syslog(L_NOTICE, LINE1, Host, usertime, systime, STATend - STATbegin);
      syslog(L_NOTICE, LINE2, Host, BATCHcount, ArtsWritten, BytesWritten);
  
      /* Last batch exit okay? */
      if (BATCHstatus == 0) {
! 	if (feof(stdin) && Cookie == -1) {
  	    /* Yes, and we're all done -- remove input and exit. */
  	    (void)fclose(stdin);
  	    if (Input)
  		(void)unlink(Input);
  	    exit(0);
  	}
      }
  
      /* Make an appropriate spool file. */
***************
*** 237,242 ****
--- 234,244 ----
      QIOSTATE	*qp;
  
      /* Set defaults. */
+     /* ReadInnConf does a syslog at LOG_DEBUG so need to
+        have opened a log first or get syslog mesgs with no identiy
+        "Reading ..." . Ctlinnd nnrpd will log these mesgs properly */
+     (void)openlog("batcher", L_OPENLOG_FLAGS | LOG_PID, LOG_INN_PROG);
+     /* Set defaults. */
      if (ReadInnConf() < 0) exit(1);
      AltSpool = NULL;
      Redirect = TRUE;
***************
*** 337,342 ****
--- 339,345 ----
  	/* Record line length in case we do an ftell. Not portable to
  	 * systems with non-Unix file formats. */
  	length = strlen(line);
+ 	Cookie = ftell(stdin) - length;
  
  	/* Get lines like "name size" */
  	if ((p = strchr(line, '\n')) == NULL) {
***************
*** 436,442 ****
  		BytesInCB += strlen(InitialString) + 1;
  		BytesWritten += strlen(InitialString) + 1;
  	    }
- 	    Cookie = ftell(stdin) - length;
  	    goto SendIt;
  	}
  
--- 439,444 ----
***************
*** 476,482 ****
  		    QIOclose(qp);
  		else
  		    (void)close(artfd);
! 		RequeueAndExit(Cookie, line, BytesInArt);
  	    }
  
  	    if ((F = BATCHstart()) == NULL) {
--- 478,484 ----
  		    QIOclose(qp);
  		else
  		    (void)close(artfd);
! 		RequeueAndExit(Cookie, (char *)NULL, 0L);
  	    }
  
  	    if ((F = BATCHstart()) == NULL) {
***************
*** 488,494 ****
  		    (void)close(artfd);
  		break;
  	    }
- 	    Cookie = ftell(stdin) - length;
  	}
  
      SendIt:
--- 490,495 ----
***************
*** 542,547 ****
--- 543,549 ----
  	ArtsWritten++;
  
  	if (GotInterrupt) {
+ 	    Cookie = -1;
  	    BATCHstatus = BATCHclose(F);
  	    RequeueAndExit(Cookie, line, BytesInArt);
  	}
diff -Nacr inn-2.2.1/backends/inndf.c inn-2.2.2/backends/inndf.c
*** inn-2.2.1/backends/inndf.c	Tue Jul  6 13:38:41 1999
--- inn-2.2.2/backends/inndf.c	Mon Dec 13 13:18:37 1999
***************
*** 5,11 ****
  Ian Dickinson <idickins@fore.com>
  Wed Jul 26 10:11:38 BST 1995 (My birthday - 27 today!)
  
! $Id: inndf.c,v 1.4.2.1 1999/07/06 13:38:41 kondou Exp $
  
  Replacement for 'df | awk' in innwatch.ctl
  Reports free kilobytes (not disk blocks) or free inodes.
--- 5,11 ----
  Ian Dickinson <idickins@fore.com>
  Wed Jul 26 10:11:38 BST 1995 (My birthday - 27 today!)
  
! $Id: inndf.c,v 1.4.2.2 1999/11/06 09:19:34 kondou Exp $
  
  Replacement for 'df | awk' in innwatch.ctl
  Reports free kilobytes (not disk blocks) or free inodes.
***************
*** 99,109 ****
  #include <sys/mount.h>
  #endif /* HAVE_SYS_MOUNT_H */
  #define STATFUNCT	statfs
  #define STATSTRUC	statfs
  #define STATAVAIL	f_bavail
  #define STATMULTI	f_bsize
! #define STATINODE	f_ffree;
  #define STATTYPES	long
  #define STATFORMT	"%ld"
  #define STATFORMTPAD	"%*ld"
  #endif /* HAVE_STATFS */
--- 99,117 ----
  #include <sys/mount.h>
  #endif /* HAVE_SYS_MOUNT_H */
  #define STATFUNCT	statfs
+ #if defined (__ultrix__)
+ #define STATSTRUC	fs_data
+ #define STATAVAIL	fd_req.bfreen
+ #define STATMULTI	fd_req.bsize
+ #define STATINODE	fd_req.gfree
+ #define STATTYPES	u_int
+ #else
  #define STATSTRUC	statfs
  #define STATAVAIL	f_bavail
  #define STATMULTI	f_bsize
! #define STATINODE	f_ffree
  #define STATTYPES	long
+ #endif
  #define STATFORMT	"%ld"
  #define STATFORMTPAD	"%*ld"
  #endif /* HAVE_STATFS */
***************
*** 116,122 ****
--- 124,134 ----
  	struct STATSTRUC buf;
  	STATTYPES value;
  
+ #if defined (__ultrix__)
+ 	if (STATFUNCT(path, &buf) < 1) {
+ #else
  	if (STATFUNCT(path, &buf) != 0) {
+ #endif
  		value = 0L;	 /* if there's an error - free space is zero */
  	} else {
  		if (!inode) {
***************
*** 127,135 ****
--- 139,151 ----
  #ifdef CAREFULL_STATMULTI
  			if (x==0) x=buf.CAREFULL_STATMULTI;
  #endif
+ #if defined (__ultrix__)
+ 			value = buf.STATAVAIL;
+ #else
  			value = (STATTYPES)
  				(((double) buf.STATAVAIL * x) /
  				(STATTYPES) KILOBYTES);
+ #endif
  		} else {
  			value = buf.STATINODE;	  /* simple! */
  		}
diff -Nacr inn-2.2.1/backends/shrinkfile.c inn-2.2.2/backends/shrinkfile.c
*** inn-2.2.1/backends/shrinkfile.c	Wed Jun  3 00:18:16 1998
--- inn-2.2.2/backends/shrinkfile.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.3 $
  **  Shrink files on line boundaries.
  **  Written by Landon Curt Noll <chongo@toad.com>, and placed in the
  **  public domain.  Rewritten for INN by Rich Salz.
--- 1,4 ----
! /*  $Revision: 1.3.4.1 $
  **  Shrink files on line boundaries.
  **  Written by Landon Curt Noll <chongo@toad.com>, and placed in the
  **  public domain.  Rewritten for INN by Rich Salz.
***************
*** 345,351 ****
      OFFSET_T	maxsize = (OFFSET_T)0;
  
      /* First thing, set up logging and our identity. */
!     openlog("skrinkfile", L_OPENLOG_FLAGS | LOG_PID, LOG_INN_PROG);
  
      /* Set defaults. */
      program = av[0];
--- 345,351 ----
      OFFSET_T	maxsize = (OFFSET_T)0;
  
      /* First thing, set up logging and our identity. */
!     openlog("shrinkfile", L_OPENLOG_FLAGS | LOG_PID, LOG_INN_PROG);
  
      /* Set defaults. */
      program = av[0];
diff -Nacr inn-2.2.1/config.sub inn-2.2.2/config.sub
*** inn-2.2.1/config.sub	Thu Jun 25 05:56:45 1998
--- inn-2.2.2/config.sub	Mon Dec 13 13:18:37 1999
***************
*** 152,158 ****
  	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
  		| arme[lb] | pyramid | mn10200 | mn10300 \
  		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
! 		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
  		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
  		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
  		| mipstx39 | mipstx39el \
--- 152,158 ----
  	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
  		| arme[lb] | pyramid | mn10200 | mn10300 \
  		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
! 		| alpha | alphaev[56] | alphaev56 | we32k | ns16k | clipper \
  		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
  		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
  		| mipstx39 | mipstx39el \
***************
*** 176,182 ****
  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
  	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
  	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
! 	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
  	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
  	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
  	      | sparc64-* | mips64-* | mipsel-* \
--- 176,182 ----
  	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
  	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
  	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
! 	      | alpha-* | alphaev[56]-* | alphaev56-* | we32k-* | cydra-* \
  	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
  	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
  	      | sparc64-* | mips64-* | mipsel-* \
diff -Nacr inn-2.2.1/configure inn-2.2.2/configure
*** inn-2.2.1/configure	Wed Apr 28 01:12:56 1999
--- inn-2.2.2/configure	Mon Dec 13 13:18:37 1999
***************
*** 1,7 ****
  #! /bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.12 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
  # This configure script is free software; the Free Software Foundation
--- 1,7 ----
  #! /bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.13 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
  # This configure script is free software; the Free Software Foundation
***************
*** 90,95 ****
--- 90,96 ----
  # Initialize some other variables.
  subdirs=
  MFLAGS= MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
  # Maximum number of lines to put in a shell here document.
  ac_max_here_lines=12
  
***************
*** 373,379 ****
      verbose=yes ;;
  
    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.12"
      exit 0 ;;
  
    -with-* | --with-*)
--- 374,380 ----
      verbose=yes ;;
  
    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.13"
      exit 0 ;;
  
    -with-* | --with-*)
***************
*** 543,551 ****
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
    if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
--- 544,554 ----
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
+ ac_exeext=
+ ac_objext=o
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
    if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
***************
*** 585,610 ****
  
  
  # Make sure we can run config.sub.
! if $ac_config_sub sun4 >/dev/null 2>&1; then :
  else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:594: checking host system type" >&5
  
  host_alias=$host
  case "$host_alias" in
  NONE)
    case $nonopt in
    NONE)
!     if host_alias=`$ac_config_guess`; then :
      else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
      fi ;;
    *) host_alias=$nonopt ;;
    esac ;;
  esac
  
! host=`$ac_config_sub $host_alias`
  host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
  host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
  host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
--- 588,613 ----
  
  
  # Make sure we can run config.sub.
! if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
  else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:597: checking host system type" >&5
  
  host_alias=$host
  case "$host_alias" in
  NONE)
    case $nonopt in
    NONE)
!     if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
      else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
      fi ;;
    *) host_alias=$nonopt ;;
    esac ;;
  esac
  
! host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
  host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
  host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
  host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
***************
*** 613,627 ****
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:617: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_RANLIB="ranlib"
--- 616,631 ----
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:620: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_RANLIB="ranlib"
***************
*** 642,656 ****
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:646: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_CC="gcc"
--- 646,661 ----
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:650: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_CC="gcc"
***************
*** 671,686 ****
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:675: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
    ac_prog_rejected=no
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
--- 676,692 ----
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:680: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
    ac_prog_rejected=no
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
***************
*** 715,739 ****
    echo "$ac_t""no" 1>&6
  fi
  
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:723: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
! cat > conftest.$ac_ext <<EOF
! #line 733 "configure"
  #include "confdefs.h"
  main(){return(0);}
  EOF
! if { (eval echo configure:737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
--- 721,781 ----
    echo "$ac_t""no" 1>&6
  fi
  
+   if test -z "$CC"; then
+     case "`uname -s`" in
+     *win32* | *WIN32*)
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:731: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+   for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_prog_CC="cl"
+       break
+     fi
+   done
+   IFS="$ac_save_ifs"
+ fi
+ fi
+ CC="$ac_cv_prog_CC"
+ if test -n "$CC"; then
+   echo "$ac_t""$CC" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+  ;;
+     esac
+   fi
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:763: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
! cat > conftest.$ac_ext << EOF
! 
! #line 774 "configure"
  #include "confdefs.h"
+ 
  main(){return(0);}
  EOF
! if { (eval echo configure:779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
***************
*** 747,764 ****
    ac_cv_prog_cc_works=no
  fi
  rm -fr conftest*
  
  echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
  if test $ac_cv_prog_cc_works = no; then
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:757: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:762: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 789,812 ----
    ac_cv_prog_cc_works=no
  fi
  rm -fr conftest*
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
  
  echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
  if test $ac_cv_prog_cc_works = no; then
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:805: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:810: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 767,773 ****
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
--- 815,821 ----
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
***************
*** 778,788 ****
  
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
!   ac_test_CFLAGS="${CFLAGS+set}"
!   ac_save_CFLAGS="$CFLAGS"
!   CFLAGS=
!   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:786: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 826,840 ----
  
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
! else
!   GCC=
! fi
! 
! ac_test_CFLAGS="${CFLAGS+set}"
! ac_save_CFLAGS="$CFLAGS"
! CFLAGS=
! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:838: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 797,812 ****
  fi
  
  echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
!   if test "$ac_test_CFLAGS" = set; then
!     CFLAGS="$ac_save_CFLAGS"
!   elif test $ac_cv_prog_cc_g = yes; then
      CFLAGS="-g -O2"
    else
!     CFLAGS="-O2"
    fi
  else
!   GCC=
!   test "${CFLAGS+set}" = set || CFLAGS="-g"
  fi
  
  # Check whether --with-gnu-ld or --without-gnu-ld was given.
--- 849,868 ----
  fi
  
  echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
! if test "$ac_test_CFLAGS" = set; then
!   CFLAGS="$ac_save_CFLAGS"
! elif test $ac_cv_prog_cc_g = yes; then
!   if test "$GCC" = yes; then
      CFLAGS="-g -O2"
    else
!     CFLAGS="-g"
    fi
  else
!   if test "$GCC" = yes; then
!     CFLAGS="-O2"
!   else
!     CFLAGS=
!   fi
  fi
  
  # Check whether --with-gnu-ld or --without-gnu-ld was given.
***************
*** 822,828 ****
  if test "$ac_cv_prog_gcc" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
! echo "configure:826: checking for ld used by GCC" >&5
    ac_prog=`($CC -print-prog-name=ld) 2>&5`
    case "$ac_prog" in
    # Accept absolute paths.
--- 878,884 ----
  if test "$ac_cv_prog_gcc" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
    echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
! echo "configure:882: checking for ld used by GCC" >&5
    ac_prog=`($CC -print-prog-name=ld) 2>&5`
    case "$ac_prog" in
    # Accept absolute paths.
***************
*** 840,849 ****
    esac
  elif test "$with_gnu_ld" = yes; then
    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
! echo "configure:844: checking for GNU ld" >&5
  else
    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
! echo "configure:847: checking for non-GNU ld" >&5
  fi
  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 896,905 ----
    esac
  elif test "$with_gnu_ld" = yes; then
    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
! echo "configure:900: checking for GNU ld" >&5
  else
    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
! echo "configure:903: checking for non-GNU ld" >&5
  fi
  if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 879,885 ****
  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
  
  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
! echo "configure:883: checking if the linker ($LD) is GNU ld" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 935,941 ----
  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
  
  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
! echo "configure:939: checking if the linker ($LD) is GNU ld" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 895,901 ****
  
  
  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
! echo "configure:899: checking for BSD-compatible nm" >&5
  if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 951,957 ----
  
  
  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
! echo "configure:955: checking for BSD-compatible nm" >&5
  if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 932,938 ****
  
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:936: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 988,994 ----
  
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:992: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1215,1229 ****
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1219: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_CC="gcc"
--- 1271,1286 ----
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1275: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_CC="gcc"
***************
*** 1244,1259 ****
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1248: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
    ac_prog_rejected=no
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
--- 1301,1317 ----
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1305: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
    ac_prog_rejected=no
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
***************
*** 1288,1312 ****
    echo "$ac_t""no" 1>&6
  fi
  
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1296: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
! cat > conftest.$ac_ext <<EOF
! #line 1306 "configure"
  #include "confdefs.h"
  main(){return(0);}
  EOF
! if { (eval echo configure:1310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
--- 1346,1406 ----
    echo "$ac_t""no" 1>&6
  fi
  
+   if test -z "$CC"; then
+     case "`uname -s`" in
+     *win32* | *WIN32*)
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:1356: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+   for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_prog_CC="cl"
+       break
+     fi
+   done
+   IFS="$ac_save_ifs"
+ fi
+ fi
+ CC="$ac_cv_prog_CC"
+ if test -n "$CC"; then
+   echo "$ac_t""$CC" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+  ;;
+     esac
+   fi
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1388: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
! cat > conftest.$ac_ext << EOF
! 
! #line 1399 "configure"
  #include "confdefs.h"
+ 
  main(){return(0);}
  EOF
! if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
***************
*** 1320,1337 ****
    ac_cv_prog_cc_works=no
  fi
  rm -fr conftest*
  
  echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
  if test $ac_cv_prog_cc_works = no; then
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1330: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1335: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1414,1437 ----
    ac_cv_prog_cc_works=no
  fi
  rm -fr conftest*
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
  
  echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
  if test $ac_cv_prog_cc_works = no; then
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1430: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1435: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1340,1346 ****
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
--- 1440,1446 ----
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
***************
*** 1351,1361 ****
  
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
!   ac_test_CFLAGS="${CFLAGS+set}"
!   ac_save_CFLAGS="$CFLAGS"
!   CFLAGS=
!   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1359: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1451,1465 ----
  
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
! else
!   GCC=
! fi
! 
! ac_test_CFLAGS="${CFLAGS+set}"
! ac_save_CFLAGS="$CFLAGS"
! CFLAGS=
! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1463: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1370,1389 ****
  fi
  
  echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
!   if test "$ac_test_CFLAGS" = set; then
!     CFLAGS="$ac_save_CFLAGS"
!   elif test $ac_cv_prog_cc_g = yes; then
      CFLAGS="-g -O2"
    else
!     CFLAGS="-O2"
    fi
  else
!   GCC=
!   test "${CFLAGS+set}" = set || CFLAGS="-g"
  fi
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:1387: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 1474,1497 ----
  fi
  
  echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
! if test "$ac_test_CFLAGS" = set; then
!   CFLAGS="$ac_save_CFLAGS"
! elif test $ac_cv_prog_cc_g = yes; then
!   if test "$GCC" = yes; then
      CFLAGS="-g -O2"
    else
!     CFLAGS="-g"
    fi
  else
!   if test "$GCC" = yes; then
!     CFLAGS="-O2"
!   else
!     CFLAGS=
!   fi
  fi
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:1495: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1404,1410 ****
  fi
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
! echo "configure:1408: checking whether ${MAKE-make} sets \${MAKE}" >&5
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1512,1518 ----
  fi
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
! echo "configure:1516: checking whether ${MAKE-make} sets \${MAKE}" >&5
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1435,1449 ****
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1439: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$YACC"; then
    ac_cv_prog_YACC="$YACC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_YACC="$ac_prog"
--- 1543,1558 ----
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1547: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$YACC"; then
    ac_cv_prog_YACC="$YACC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_YACC="$ac_prog"
***************
*** 1467,1481 ****
  # Extract the first word of "flex", so it can be a program name with args.
  set dummy flex; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1471: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$LEX"; then
    ac_cv_prog_LEX="$LEX" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_LEX="flex"
--- 1576,1591 ----
  # Extract the first word of "flex", so it can be a program name with args.
  set dummy flex; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1580: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$LEX"; then
    ac_cv_prog_LEX="$LEX" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_LEX="flex"
***************
*** 1500,1506 ****
    *) ac_lib=l ;;
    esac
    echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
! echo "configure:1504: checking for yywrap in -l$ac_lib" >&5
  ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1610,1616 ----
    *) ac_lib=l ;;
    esac
    echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
! echo "configure:1614: checking for yywrap in -l$ac_lib" >&5
  ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1508,1514 ****
    ac_save_LIBS="$LIBS"
  LIBS="-l$ac_lib  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1512 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 1618,1624 ----
    ac_save_LIBS="$LIBS"
  LIBS="-l$ac_lib  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1622 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 1519,1525 ****
  yywrap()
  ; return 0; }
  EOF
! if { (eval echo configure:1523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1629,1635 ----
  yywrap()
  ; return 0; }
  EOF
! if { (eval echo configure:1633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1544,1558 ****
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1548: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_RANLIB="ranlib"
--- 1654,1669 ----
  # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1658: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_prog_RANLIB="ranlib"
***************
*** 1572,1578 ****
  
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1576: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
--- 1683,1689 ----
  
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1687: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
***************
*** 1587,1600 ****
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 1591 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
  else
--- 1698,1711 ----
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 1702 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1708: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
  else
***************
*** 1604,1617 ****
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 1608 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
  else
--- 1715,1745 ----
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 1719 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
! if test -z "$ac_err"; then
!   :
! else
!   echo "$ac_err" >&5
!   echo "configure: failed program was:" >&5
!   cat conftest.$ac_ext >&5
!   rm -rf conftest*
!   CPP="${CC-cc} -nologo -E"
!   cat > conftest.$ac_ext <<EOF
! #line 1736 "configure"
! #include "confdefs.h"
! #include <assert.h>
! Syntax Error
! EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
  else
***************
*** 1624,1629 ****
--- 1752,1759 ----
  rm -f conftest*
  fi
  rm -f conftest*
+ fi
+ rm -f conftest*
    ac_cv_prog_CPP="$CPP"
  fi
    CPP="$ac_cv_prog_CPP"
***************
*** 1633,1641 ****
  echo "$ac_t""$CPP" 1>&6
  
  echo $ac_n "checking for AIX""... $ac_c" 1>&6
! echo "configure:1637: checking for AIX" >&5
  cat > conftest.$ac_ext <<EOF
! #line 1639 "configure"
  #include "confdefs.h"
  #ifdef _AIX
    yes
--- 1763,1771 ----
  echo "$ac_t""$CPP" 1>&6
  
  echo $ac_n "checking for AIX""... $ac_c" 1>&6
! echo "configure:1767: checking for AIX" >&5
  cat > conftest.$ac_ext <<EOF
! #line 1769 "configure"
  #include "confdefs.h"
  #ifdef _AIX
    yes
***************
*** 1657,1663 ****
  
  
  echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
! echo "configure:1661: checking for POSIXized ISC" >&5
  if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
  then
--- 1787,1793 ----
  
  
  echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
! echo "configure:1791: checking for POSIXized ISC" >&5
  if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
  then
***************
*** 1678,1684 ****
  fi
  
  echo $ac_n "checking for Digital Unix""... $ac_c" 1>&6
! echo "configure:1682: checking for Digital Unix" >&5
  if test -f /osf_boot 
  then
    echo "$ac_t""yes" 1>&6
--- 1808,1814 ----
  fi
  
  echo $ac_n "checking for Digital Unix""... $ac_c" 1>&6
! echo "configure:1812: checking for Digital Unix" >&5
  if test -f /osf_boot 
  then
    echo "$ac_t""yes" 1>&6
***************
*** 1690,1695 ****
--- 1820,1996 ----
  
  
  
+ 
+ # We need some special hacks when running slowaris
+ # Extract the first word of "uname", so it can be a program name with args.
+ set dummy uname; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:1829: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_uname_prog'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   case "$uname_prog" in
+   /*)
+   ac_cv_path_uname_prog="$uname_prog" # Let the user override the test with a path.
+   ;;
+   ?:/*)			 
+   ac_cv_path_uname_prog="$uname_prog" # Let the user override the test with a dos path.
+   ;;
+   *)
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+   for ac_dir in $ac_dummy; do 
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_path_uname_prog="$ac_dir/$ac_word"
+       break
+     fi
+   done
+   IFS="$ac_save_ifs"
+   test -z "$ac_cv_path_uname_prog" && ac_cv_path_uname_prog="no"
+   ;;
+ esac
+ fi
+ uname_prog="$ac_cv_path_uname_prog"
+ if test -n "$uname_prog"; then
+   echo "$ac_t""$uname_prog" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+ echo $ac_n "checking operating system""... $ac_c" 1>&6
+ echo "configure:1863: checking operating system" >&5
+ if eval "test \"`echo '$''{'inn_cv_sys_os'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ if test "$uname_prog" != "no"; then
+   inn_cv_sys_os="`uname`"
+ 
+   case "$inn_cv_sys_os" in
+     SunOS)
+       case "`uname -r`" in
+         5.*) inn_cv_sys_os="Solaris";
+       esac
+     ;;
+   esac
+ else
+   inn_cv_sys_os="Not Solaris"
+ fi
+ 
+ fi
+ 
+ echo "$ac_t""$inn_cv_sys_os" 1>&6
+ 
+ case "$inn_cv_sys_os" in
+   SCO*)
+      case "$CFLAGS" in
+        *-belf*) 
+           
+   echo $ac_n "checking -belf""... $ac_c" 1>&6
+ echo "configure:1892: checking -belf" >&5
+   OLD_CFLAGS="$CFLAGS"
+   if eval "test \"`echo '$''{'inn_cv_option_sco_belf_option'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     CFLAGS="$OLD_CFLAGS -belf"
+     if test "$cross_compiling" = yes; then
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 1903 "configure"
+ #include "confdefs.h"
+ int main(){exit(0);}
+ EOF
+ if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   inn_cv_option_sco_belf_option=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   inn_cv_option_sco_belf_option=no
+ fi
+ rm -fr conftest*
+ fi
+ 
+   
+ fi
+ 
+   
+   CFLAGS="$OLD_CFLAGS"
+   
+   if test x"$inn_cv_option_sco_belf_option" = "xyes" ; then
+     CFLAGS="$CFLAGS -belf"
+     echo "$ac_t""yes" 1>&6
+   else
+     echo "$ac_t""no" 1>&6
+   fi
+ 
+ 	;;
+        *)
+           
+   echo $ac_n "checking -belf""... $ac_c" 1>&6
+ echo "configure:1936: checking -belf" >&5
+   OLD_CFLAGS="$CFLAGS"
+   if eval "test \"`echo '$''{'inn_cv_option_sco_belf_option'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     CFLAGS="$OLD_CFLAGS -belf"
+     if test "$cross_compiling" = yes; then
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 1947 "configure"
+ #include "confdefs.h"
+ int main(){exit(0);}
+ EOF
+ if { (eval echo configure:1951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   inn_cv_option_sco_belf_option=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   inn_cv_option_sco_belf_option=no
+ fi
+ rm -fr conftest*
+ fi
+ 
+   
+ fi
+ 
+   
+   CFLAGS="$OLD_CFLAGS"
+   
+   if test x"$inn_cv_option_sco_belf_option" = "xyes" ; then
+     CFLAGS="$CFLAGS -belf"
+     echo "$ac_t""yes" 1>&6
+   else
+     echo "$ac_t""no" 1>&6
+   fi
+ 
+        ;;
+      esac
+   ;;
+ 
+   UnixWare*)
+     if test "$GCC" != "yes"; then
+       # We are using built-in inline function
+       CFLAGS="$CFLAGS -Kalloca"
+       CXX="CC -DNO_CPLUSPLUS_ALLOCA"
+     fi
+   ;;
+ esac
+ 
+ 
+ 
+ 
+ 
+ 
+ 
  ac_save_path="$PATH"
  
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
***************
*** 1708,1714 ****
  # Extract the first word of "ctags", so it can be a program name with args.
  set dummy ctags; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1712: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PATH_CTAGS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2009,2015 ----
  # Extract the first word of "ctags", so it can be a program name with args.
  set dummy ctags; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2013: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PATH_CTAGS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1716,1724 ****
    /*)
    ac_cv_path_PATH_CTAGS="$PATH_CTAGS" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_PATH_CTAGS="$ac_dir/$ac_word"
--- 2017,2029 ----
    /*)
    ac_cv_path_PATH_CTAGS="$PATH_CTAGS" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path_PATH_CTAGS="$PATH_CTAGS" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_PATH_CTAGS="$ac_dir/$ac_word"
***************
*** 1739,1745 ****
  
  
  echo $ac_n "checking for path to ctags""... $ac_c" 1>&6
! echo "configure:1743: checking for path to ctags" >&5
  if eval "test \"`echo '$''{'ac_cv_subst_ctags'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2044,2050 ----
  
  
  echo $ac_n "checking for path to ctags""... $ac_c" 1>&6
! echo "configure:2048: checking for path to ctags" >&5
  if eval "test \"`echo '$''{'ac_cv_subst_ctags'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1761,1767 ****
  # Extract the first word of "awk", so it can be a program name with args.
  set dummy awk; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1765: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_AWK'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2066,2072 ----
  # Extract the first word of "awk", so it can be a program name with args.
  set dummy awk; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2070: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_AWK'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1769,1777 ****
    /*)
    ac_cv_path__PATH_AWK="$_PATH_AWK" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_AWK="$ac_dir/$ac_word"
--- 2074,2086 ----
    /*)
    ac_cv_path__PATH_AWK="$_PATH_AWK" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path__PATH_AWK="$_PATH_AWK" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_AWK="$ac_dir/$ac_word"
***************
*** 1798,1804 ****
  # Extract the first word of "perl", so it can be a program name with args.
  set dummy perl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1802: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2107,2113 ----
  # Extract the first word of "perl", so it can be a program name with args.
  set dummy perl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2111: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1806,1814 ****
    /*)
    ac_cv_path__PATH_PERL="$_PATH_PERL" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_PERL="$ac_dir/$ac_word"
--- 2115,2127 ----
    /*)
    ac_cv_path__PATH_PERL="$_PATH_PERL" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path__PATH_PERL="$_PATH_PERL" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_PERL="$ac_dir/$ac_word"
***************
*** 1835,1841 ****
  # Extract the first word of "sed", so it can be a program name with args.
  set dummy sed; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1839: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_SED'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2148,2154 ----
  # Extract the first word of "sed", so it can be a program name with args.
  set dummy sed; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2152: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_SED'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1843,1851 ****
    /*)
    ac_cv_path__PATH_SED="$_PATH_SED" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_SED="$ac_dir/$ac_word"
--- 2156,2168 ----
    /*)
    ac_cv_path__PATH_SED="$_PATH_SED" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path__PATH_SED="$_PATH_SED" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_SED="$ac_dir/$ac_word"
***************
*** 1873,1879 ****
  # Extract the first word of "egrep", so it can be a program name with args.
  set dummy egrep; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1877: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_EGREP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2190,2196 ----
  # Extract the first word of "egrep", so it can be a program name with args.
  set dummy egrep; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2194: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_EGREP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1881,1889 ****
    /*)
    ac_cv_path__PATH_EGREP="$_PATH_EGREP" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_EGREP="$ac_dir/$ac_word"
--- 2198,2210 ----
    /*)
    ac_cv_path__PATH_EGREP="$_PATH_EGREP" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path__PATH_EGREP="$_PATH_EGREP" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_EGREP="$ac_dir/$ac_word"
***************
*** 1910,1916 ****
  # Extract the first word of "sort", so it can be a program name with args.
  set dummy sort; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1914: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_SORT'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2231,2237 ----
  # Extract the first word of "sort", so it can be a program name with args.
  set dummy sort; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2235: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_SORT'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1918,1926 ****
    /*)
    ac_cv_path__PATH_SORT="$_PATH_SORT" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_SORT="$ac_dir/$ac_word"
--- 2239,2251 ----
    /*)
    ac_cv_path__PATH_SORT="$_PATH_SORT" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path__PATH_SORT="$_PATH_SORT" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_SORT="$ac_dir/$ac_word"
***************
*** 1947,1953 ****
  # Extract the first word of "sh", so it can be a program name with args.
  set dummy sh; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1951: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_SH'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2272,2278 ----
  # Extract the first word of "sh", so it can be a program name with args.
  set dummy sh; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2276: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_SH'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1955,1963 ****
    /*)
    ac_cv_path__PATH_SH="$_PATH_SH" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_SH="$ac_dir/$ac_word"
--- 2280,2292 ----
    /*)
    ac_cv_path__PATH_SH="$_PATH_SH" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path__PATH_SH="$_PATH_SH" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_SH="$ac_dir/$ac_word"
***************
*** 1986,1992 ****
  # Extract the first word of "pgpv", so it can be a program name with args.
  set dummy pgpv; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1990: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_PGP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2315,2321 ----
  # Extract the first word of "pgpv", so it can be a program name with args.
  set dummy pgpv; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2319: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_PGP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 1994,2002 ****
    /*)
    ac_cv_path__PATH_PGP="$_PATH_PGP" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_PGP="$ac_dir/$ac_word"
--- 2323,2335 ----
    /*)
    ac_cv_path__PATH_PGP="$_PATH_PGP" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path__PATH_PGP="$_PATH_PGP" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_PGP="$ac_dir/$ac_word"
***************
*** 2019,2025 ****
  # Extract the first word of "pgp", so it can be a program name with args.
  set dummy pgp; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2023: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_PGP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2352,2358 ----
  # Extract the first word of "pgp", so it can be a program name with args.
  set dummy pgp; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2356: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path__PATH_PGP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 2027,2035 ****
    /*)
    ac_cv_path__PATH_PGP="$_PATH_PGP" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_PGP="$ac_dir/$ac_word"
--- 2360,2372 ----
    /*)
    ac_cv_path__PATH_PGP="$_PATH_PGP" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path__PATH_PGP="$_PATH_PGP" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path__PATH_PGP="$ac_dir/$ac_word"
***************
*** 2060,2066 ****
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2064: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GETFTP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2397,2403 ----
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2401: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GETFTP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 2068,2076 ****
    /*)
    ac_cv_path_GETFTP="$GETFTP" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_GETFTP="$ac_dir/$ac_word"
--- 2405,2417 ----
    /*)
    ac_cv_path_GETFTP="$GETFTP" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path_GETFTP="$GETFTP" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_GETFTP="$ac_dir/$ac_word"
***************
*** 2098,2104 ****
  	# Extract the first word of "getconf", so it can be a program name with args.
  set dummy getconf; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2102: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GETCONF'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2439,2445 ----
  	# Extract the first word of "getconf", so it can be a program name with args.
  set dummy getconf; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2443: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GETCONF'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 2106,2114 ****
    /*)
    ac_cv_path_GETCONF="$GETCONF" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_GETCONF="$ac_dir/$ac_word"
--- 2447,2459 ----
    /*)
    ac_cv_path_GETCONF="$GETCONF" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path_GETCONF="$GETCONF" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_GETCONF="$ac_dir/$ac_word"
***************
*** 2137,2143 ****
  # Extract the first word of "compress", so it can be a program name with args.
  set dummy compress; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2141: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2482,2488 ----
  # Extract the first word of "compress", so it can be a program name with args.
  set dummy compress; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2486: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_COMPRESS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 2145,2153 ****
    /*)
    ac_cv_path_COMPRESS="$COMPRESS" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_COMPRESS="$ac_dir/$ac_word"
--- 2490,2502 ----
    /*)
    ac_cv_path_COMPRESS="$COMPRESS" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path_COMPRESS="$COMPRESS" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_COMPRESS="$ac_dir/$ac_word"
***************
*** 2171,2177 ****
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2175: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2520,2526 ----
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2524: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_GZIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 2179,2187 ****
    /*)
    ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_GZIP="$ac_dir/$ac_word"
--- 2528,2540 ----
    /*)
    ac_cv_path_GZIP="$GZIP" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path_GZIP="$GZIP" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_GZIP="$ac_dir/$ac_word"
***************
*** 2240,2246 ****
    # Extract the first word of "sendmail", so it can be a program name with args.
  set dummy sendmail; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2244: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2593,2599 ----
    # Extract the first word of "sendmail", so it can be a program name with args.
  set dummy sendmail; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2597: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 2248,2256 ****
    /*)
    ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
--- 2601,2613 ----
    /*)
    ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
***************
*** 2275,2281 ****
      # Extract the first word of "sendmail", so it can be a program name with args.
  set dummy sendmail; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2279: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 2632,2638 ----
      # Extract the first word of "sendmail", so it can be a program name with args.
  set dummy sendmail; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2636: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 2283,2291 ****
    /*)
    ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path.
    ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
--- 2640,2652 ----
    /*)
    ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a path.
    ;;
+   ?:/*)			 
+   ac_cv_path_SENDMAIL="$SENDMAIL" # Let the user override the test with a dos path.
+   ;;
    *)
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do 
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
        ac_cv_path_SENDMAIL="$ac_dir/$ac_word"
***************
*** 2329,2335 ****
  
  EXTRA_SRC=""
  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
! echo "configure:2333: checking for crypt in -lcrypt" >&5
  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2690,2696 ----
  
  EXTRA_SRC=""
  echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
! echo "configure:2694: checking for crypt in -lcrypt" >&5
  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2337,2343 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2341 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 2698,2704 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2702 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2348,2354 ****
  crypt()
  ; return 0; }
  EOF
! if { (eval echo configure:2352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2709,2715 ----
  crypt()
  ; return 0; }
  EOF
! if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2376,2382 ****
  fi
  
  echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6
! echo "configure:2380: checking for setproctitle in -lutil" >&5
  ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2737,2743 ----
  fi
  
  echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6
! echo "configure:2741: checking for setproctitle in -lutil" >&5
  ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2384,2390 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lutil  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2388 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 2745,2751 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lutil  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2749 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2395,2401 ****
  setproctitle()
  ; return 0; }
  EOF
! if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2756,2762 ----
  setproctitle()
  ; return 0; }
  EOF
! if { (eval echo configure:2760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2423,2429 ****
  fi
  
  echo $ac_n "checking for inet_addr in -l44bsd""... $ac_c" 1>&6
! echo "configure:2427: checking for inet_addr in -l44bsd" >&5
  ac_lib_var=`echo 44bsd'_'inet_addr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2784,2790 ----
  fi
  
  echo $ac_n "checking for inet_addr in -l44bsd""... $ac_c" 1>&6
! echo "configure:2788: checking for inet_addr in -l44bsd" >&5
  ac_lib_var=`echo 44bsd'_'inet_addr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2431,2437 ****
    ac_save_LIBS="$LIBS"
  LIBS="-l44bsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2435 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 2792,2798 ----
    ac_save_LIBS="$LIBS"
  LIBS="-l44bsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2796 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2442,2448 ****
  inet_addr()
  ; return 0; }
  EOF
! if { (eval echo configure:2446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2803,2809 ----
  inet_addr()
  ; return 0; }
  EOF
! if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2470,2476 ****
  fi
  
  echo $ac_n "checking for __inet_addr in -lbind""... $ac_c" 1>&6
! echo "configure:2474: checking for __inet_addr in -lbind" >&5
  ac_lib_var=`echo bind'_'__inet_addr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2831,2837 ----
  fi
  
  echo $ac_n "checking for __inet_addr in -lbind""... $ac_c" 1>&6
! echo "configure:2835: checking for __inet_addr in -lbind" >&5
  ac_lib_var=`echo bind'_'__inet_addr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2478,2484 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2482 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 2839,2845 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2843 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2489,2495 ****
  __inet_addr()
  ; return 0; }
  EOF
! if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2850,2856 ----
  __inet_addr()
  ; return 0; }
  EOF
! if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2517,2523 ****
  fi
  
  echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6
! echo "configure:2521: checking for gethostbyname in -lresolv" >&5
  ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2878,2884 ----
  fi
  
  echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6
! echo "configure:2882: checking for gethostbyname in -lresolv" >&5
  ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2525,2531 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2529 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 2886,2892 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2890 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2536,2542 ****
  gethostbyname()
  ; return 0; }
  EOF
! if { (eval echo configure:2540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2897,2903 ----
  gethostbyname()
  ; return 0; }
  EOF
! if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2558,2564 ****
  fi
  
  echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
! echo "configure:2562: checking for inet_aton in -lresolv" >&5
  ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2919,2925 ----
  fi
  
  echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
! echo "configure:2923: checking for inet_aton in -lresolv" >&5
  ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2566,2572 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2570 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 2927,2933 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2931 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2577,2583 ****
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:2581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2938,2944 ----
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2605,2611 ****
  if test x$ac_try_bind = x1
  then
  	echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6
! echo "configure:2609: checking for inet_aton in -lbind" >&5
  ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2966,2972 ----
  if test x$ac_try_bind = x1
  then
  	echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6
! echo "configure:2970: checking for inet_aton in -lbind" >&5
  ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2613,2619 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2617 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 2974,2980 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2978 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2624,2630 ****
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:2628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 2985,2991 ----
  inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:2989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2647,2653 ****
  	if test x$ac_need_extra_inet_aton = x
  	then
  		echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6
! echo "configure:2651: checking for __inet_aton in -lbind" >&5
  ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3008,3014 ----
  	if test x$ac_need_extra_inet_aton = x
  	then
  		echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6
! echo "configure:3012: checking for __inet_aton in -lbind" >&5
  ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2655,2661 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2659 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3016,3022 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3020 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2666,2672 ****
  __inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:2670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3027,3033 ----
  __inet_aton()
  ; return 0; }
  EOF
! if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2693,2699 ****
  	fi
  fi
  echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
! echo "configure:2697: checking for gethostbyname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3054,3060 ----
  	fi
  fi
  echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
! echo "configure:3058: checking for gethostbyname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2701,2707 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2705 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3062,3068 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3066 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2712,2718 ****
  gethostbyname()
  ; return 0; }
  EOF
! if { (eval echo configure:2716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3073,3079 ----
  gethostbyname()
  ; return 0; }
  EOF
! if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2740,2746 ****
  fi
  
  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
! echo "configure:2744: checking for socket in -lsocket" >&5
  ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3101,3107 ----
  fi
  
  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
! echo "configure:3105: checking for socket in -lsocket" >&5
  ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2748,2754 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2752 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3109,3115 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3113 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2759,2765 ****
  socket()
  ; return 0; }
  EOF
! if { (eval echo configure:2763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3120,3126 ----
  socket()
  ; return 0; }
  EOF
! if { (eval echo configure:3124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2787,2793 ****
  if test x$ac_try_nsl = x1
  then
  	echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
! echo "configure:2791: checking for gethostbyname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3148,3154 ----
  if test x$ac_try_nsl = x1
  then
  	echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
! echo "configure:3152: checking for gethostbyname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2795,2801 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2799 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3156,3162 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3160 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2806,2812 ****
  gethostbyname()
  ; return 0; }
  EOF
! if { (eval echo configure:2810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3167,3173 ----
  gethostbyname()
  ; return 0; }
  EOF
! if { (eval echo configure:3171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2832,2838 ****
  	fi
  fi
  echo $ac_n "checking for getspnam in -lshadow""... $ac_c" 1>&6
! echo "configure:2836: checking for getspnam in -lshadow" >&5
  ac_lib_var=`echo shadow'_'getspnam | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3193,3199 ----
  	fi
  fi
  echo $ac_n "checking for getspnam in -lshadow""... $ac_c" 1>&6
! echo "configure:3197: checking for getspnam in -lshadow" >&5
  ac_lib_var=`echo shadow'_'getspnam | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2840,2846 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lshadow  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2844 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3201,3207 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lshadow  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3205 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2851,2857 ****
  getspnam()
  ; return 0; }
  EOF
! if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3212,3218 ----
  getspnam()
  ; return 0; }
  EOF
! if { (eval echo configure:3216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2879,2885 ****
  fi
  
  echo $ac_n "checking for nlist in -lelf""... $ac_c" 1>&6
! echo "configure:2883: checking for nlist in -lelf" >&5
  ac_lib_var=`echo elf'_'nlist | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3240,3246 ----
  fi
  
  echo $ac_n "checking for nlist in -lelf""... $ac_c" 1>&6
! echo "configure:3244: checking for nlist in -lelf" >&5
  ac_lib_var=`echo elf'_'nlist | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2887,2893 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lelf  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2891 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3248,3254 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lelf  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3252 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2898,2904 ****
  nlist()
  ; return 0; }
  EOF
! if { (eval echo configure:2902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3259,3265 ----
  nlist()
  ; return 0; }
  EOF
! if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2926,2932 ****
  fi
  
  echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6
! echo "configure:2930: checking for flock in -lbsd" >&5
  ac_lib_var=`echo bsd'_'flock | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3287,3293 ----
  fi
  
  echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6
! echo "configure:3291: checking for flock in -lbsd" >&5
  ac_lib_var=`echo bsd'_'flock | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2934,2940 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lbsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2938 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3295,3301 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lbsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3299 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2945,2951 ****
  flock()
  ; return 0; }
  EOF
! if { (eval echo configure:2949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3306,3312 ----
  flock()
  ; return 0; }
  EOF
! if { (eval echo configure:3310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 2973,2979 ****
  fi
  
  echo $ac_n "checking for regexec in -lregex""... $ac_c" 1>&6
! echo "configure:2977: checking for regexec in -lregex" >&5
  ac_lib_var=`echo regex'_'regexec | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3334,3340 ----
  fi
  
  echo $ac_n "checking for regexec in -lregex""... $ac_c" 1>&6
! echo "configure:3338: checking for regexec in -lregex" >&5
  ac_lib_var=`echo regex'_'regexec | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2981,2987 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lregex  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2985 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3342,3348 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lregex  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3346 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 2992,2998 ****
  regexec()
  ; return 0; }
  EOF
! if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3353,3359 ----
  regexec()
  ; return 0; }
  EOF
! if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 3021,3027 ****
  
  if test x${DO_PERL} = xDO ; then
  	echo $ac_n "checking for Perl configuration""... $ac_c" 1>&6
! echo "configure:3025: checking for Perl configuration" >&5
  	perl_core_path=`$_PATH_PERL -e 'use Config; print $Config{archlib}'`
  	perl_core_libs=`$_PATH_PERL -MExtUtils::Embed -e ldopts | tail -1`
  	for i in ${LIBS} ; do
--- 3382,3388 ----
  
  if test x${DO_PERL} = xDO ; then
  	echo $ac_n "checking for Perl configuration""... $ac_c" 1>&6
! echo "configure:3386: checking for Perl configuration" >&5
  	perl_core_path=`$_PATH_PERL -e 'use Config; print $Config{archlib}'`
  	perl_core_libs=`$_PATH_PERL -MExtUtils::Embed -e ldopts | tail -1`
  	for i in ${LIBS} ; do
***************
*** 3042,3053 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
! echo "configure:3046: checking for $ac_hdr that defines DIR" >&5
  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3051 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
--- 3403,3414 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
! echo "configure:3407: checking for $ac_hdr that defines DIR" >&5
  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3412 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
***************
*** 3055,3061 ****
  DIR *dirp = 0;
  ; return 0; }
  EOF
! if { (eval echo configure:3059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
  else
--- 3416,3422 ----
  DIR *dirp = 0;
  ; return 0; }
  EOF
! if { (eval echo configure:3420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
  else
***************
*** 3080,3086 ****
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
! echo "configure:3084: checking for opendir in -ldir" >&5
  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3441,3447 ----
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
! echo "configure:3445: checking for opendir in -ldir" >&5
  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 3088,3094 ****
    ac_save_LIBS="$LIBS"
  LIBS="-ldir  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3092 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3449,3455 ----
    ac_save_LIBS="$LIBS"
  LIBS="-ldir  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3453 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 3099,3105 ****
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:3103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3460,3466 ----
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:3464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 3121,3127 ****
  
  else
  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
! echo "configure:3125: checking for opendir in -lx" >&5
  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3482,3488 ----
  
  else
  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
! echo "configure:3486: checking for opendir in -lx" >&5
  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 3129,3135 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lx  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3133 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3490,3496 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lx  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3494 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
***************
*** 3140,3146 ****
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3501,3507 ----
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:3505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 3163,3174 ****
  fi
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:3167: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3172 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
--- 3524,3535 ----
  fi
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:3528: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3533 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
***************
*** 3176,3183 ****
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    ac_cv_header_stdc=yes
--- 3537,3544 ----
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    ac_cv_header_stdc=yes
***************
*** 3193,3199 ****
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 3197 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
--- 3554,3560 ----
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 3558 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
***************
*** 3211,3217 ****
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 3215 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
--- 3572,3578 ----
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 3576 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
***************
*** 3232,3238 ****
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 3236 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--- 3593,3599 ----
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 3597 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
***************
*** 3243,3249 ****
  exit (0); }
  
  EOF
! if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    :
  else
--- 3604,3610 ----
  exit (0); }
  
  EOF
! if { (eval echo configure:3608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
***************
*** 3267,3278 ****
  fi
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:3271: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3276 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
--- 3628,3639 ----
  fi
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:3632: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3637 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
***************
*** 3281,3287 ****
  struct tm *tp;
  ; return 0; }
  EOF
! if { (eval echo configure:3285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
  else
--- 3642,3648 ----
  struct tm *tp;
  ; return 0; }
  EOF
! if { (eval echo configure:3646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
  else
***************
*** 3302,3313 ****
  fi
  
  echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
! echo "configure:3306: checking for sys/wait.h that is POSIX.1 compatible" >&5
  if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3311 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/wait.h>
--- 3663,3674 ----
  fi
  
  echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
! echo "configure:3667: checking for sys/wait.h that is POSIX.1 compatible" >&5
  if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3672 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/wait.h>
***************
*** 3323,3329 ****
  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
  ; return 0; }
  EOF
! if { (eval echo configure:3327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_sys_wait_h=yes
  else
--- 3684,3690 ----
  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
  ; return 0; }
  EOF
! if { (eval echo configure:3688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_sys_wait_h=yes
  else
***************
*** 3347,3364 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3351: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3356 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
--- 3708,3725 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3712: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3717 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
***************
*** 3387,3404 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3391: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3396 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
--- 3748,3765 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3752: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3757 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
***************
*** 3427,3444 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3431: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3436 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
--- 3788,3805 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3792: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3797 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
***************
*** 3467,3484 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3471: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3476 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
--- 3828,3845 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3832: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3837 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
***************
*** 3513,3530 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3517: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3522 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
--- 3874,3891 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3878: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3883 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
***************
*** 3552,3563 ****
  fi
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:3556: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3561 "configure"
  #include "confdefs.h"
  
  int main() {
--- 3913,3924 ----
  fi
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:3917: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3922 "configure"
  #include "confdefs.h"
  
  int main() {
***************
*** 3606,3612 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
--- 3967,3973 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
***************
*** 3627,3638 ****
  fi
  
  echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
! echo "configure:3631: checking for st_blksize in struct stat" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3636 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
--- 3988,3999 ----
  fi
  
  echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
! echo "configure:3992: checking for st_blksize in struct stat" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3997 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
***************
*** 3640,3646 ****
  struct stat s; s.st_blksize;
  ; return 0; }
  EOF
! if { (eval echo configure:3644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_blksize=yes
  else
--- 4001,4007 ----
  struct stat s; s.st_blksize;
  ; return 0; }
  EOF
! if { (eval echo configure:4005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_blksize=yes
  else
***************
*** 3661,3672 ****
  fi
  
  echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
! echo "configure:3665: checking whether struct tm is in sys/time.h or time.h" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3670 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <time.h>
--- 4022,4033 ----
  fi
  
  echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
! echo "configure:4026: checking whether struct tm is in sys/time.h or time.h" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4031 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <time.h>
***************
*** 3674,3680 ****
  struct tm *tp; tp->tm_sec;
  ; return 0; }
  EOF
! if { (eval echo configure:3678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm=time.h
  else
--- 4035,4041 ----
  struct tm *tp; tp->tm_sec;
  ; return 0; }
  EOF
! if { (eval echo configure:4039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm=time.h
  else
***************
*** 3695,3706 ****
  fi
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
! echo "configure:3699: checking for size_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3704 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 4056,4067 ----
  fi
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
! echo "configure:4060: checking for size_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4065 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
***************
*** 3709,3715 ****
  #endif
  EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_type_size_t=yes
  else
--- 4070,4076 ----
  #endif
  EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_type_size_t=yes
  else
***************
*** 3728,3739 ****
  fi
  
  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
! echo "configure:3732: checking for uid_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3737 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  EOF
--- 4089,4100 ----
  fi
  
  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
! echo "configure:4093: checking for uid_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4098 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  EOF
***************
*** 3762,3773 ****
  fi
  
  echo $ac_n "checking for off_t""... $ac_c" 1>&6
! echo "configure:3766: checking for off_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3771 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 4123,4134 ----
  fi
  
  echo $ac_n "checking for off_t""... $ac_c" 1>&6
! echo "configure:4127: checking for off_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4132 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
***************
*** 3776,3782 ****
  #endif
  EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_type_off_t=yes
  else
--- 4137,4143 ----
  #endif
  EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_type_off_t=yes
  else
***************
*** 3795,3806 ****
  fi
  
  echo $ac_n "checking for pid_t""... $ac_c" 1>&6
! echo "configure:3799: checking for pid_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3804 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 4156,4167 ----
  fi
  
  echo $ac_n "checking for pid_t""... $ac_c" 1>&6
! echo "configure:4160: checking for pid_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4165 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
***************
*** 3809,3815 ****
  #endif
  EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_type_pid_t=yes
  else
--- 4170,4176 ----
  #endif
  EOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_type_pid_t=yes
  else
***************
*** 3828,3839 ****
  fi
  
  echo $ac_n "checking for atomical variable""... $ac_c" 1>&6
! echo "configure:3832: checking for atomical variable" >&5
  if eval "test \"`echo '$''{'ac_cv_type_atomic'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3837 "configure"
  #include "confdefs.h"
  #include <signal.h>
  #ifdef HAVE_SYS_SIGNAL_H
--- 4189,4200 ----
  fi
  
  echo $ac_n "checking for atomical variable""... $ac_c" 1>&6
! echo "configure:4193: checking for atomical variable" >&5
  if eval "test \"`echo '$''{'ac_cv_type_atomic'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4198 "configure"
  #include "confdefs.h"
  #include <signal.h>
  #ifdef HAVE_SYS_SIGNAL_H
***************
*** 3843,3849 ****
  sig_atomic_t i
  ; return 0; }
  EOF
! if { (eval echo configure:3847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_atomic=sig_atomic_t
  else
--- 4204,4210 ----
  sig_atomic_t i
  ; return 0; }
  EOF
! if { (eval echo configure:4208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_atomic=sig_atomic_t
  else
***************
*** 3859,3874 ****
  
  
  echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
! echo "configure:3863: checking for tm_gmtoff in struct tm" >&5
  cat > conftest.$ac_ext <<EOF
! #line 3865 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
  struct tm t; t.tm_gmtoff = 0
  ; return 0; }
  EOF
! if { (eval echo configure:3872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_TM_GMTOFF 1
--- 4220,4235 ----
  
  
  echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
! echo "configure:4224: checking for tm_gmtoff in struct tm" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4226 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
  struct tm t; t.tm_gmtoff = 0
  ; return 0; }
  EOF
! if { (eval echo configure:4233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_TM_GMTOFF 1
***************
*** 3883,3891 ****
  rm -f conftest*
  
  echo $ac_n "checking for union wait""... $ac_c" 1>&6
! echo "configure:3887: checking for union wait" >&5
  cat > conftest.$ac_ext <<EOF
! #line 3889 "configure"
  #include "confdefs.h"
  #ifdef HAVE_WAIT_H
  # include <wait.h>
--- 4244,4252 ----
  rm -f conftest*
  
  echo $ac_n "checking for union wait""... $ac_c" 1>&6
! echo "configure:4248: checking for union wait" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4250 "configure"
  #include "confdefs.h"
  #ifdef HAVE_WAIT_H
  # include <wait.h>
***************
*** 3896,3902 ****
  union wait w
  ; return 0; }
  EOF
! if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_UNION_WAIT 1
--- 4257,4263 ----
  union wait w
  ; return 0; }
  EOF
! if { (eval echo configure:4261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_UNION_WAIT 1
***************
*** 3912,3918 ****
  
  # Size of integers
  echo $ac_n "checking size of int""... $ac_c" 1>&6
! echo "configure:3916: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 4273,4279 ----
  
  # Size of integers
  echo $ac_n "checking size of int""... $ac_c" 1>&6
! echo "configure:4277: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 3920,3926 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 3924 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 4281,4287 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 4285 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 3931,3937 ****
    exit(0);
  }
  EOF
! if { (eval echo configure:3935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
  else
--- 4292,4298 ----
    exit(0);
  }
  EOF
! if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
  else
***************
*** 3954,3960 ****
  	ac_cv_subst_int32_t=int
  else
  	echo $ac_n "checking size of long""... $ac_c" 1>&6
! echo "configure:3958: checking size of long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 4315,4321 ----
  	ac_cv_subst_int32_t=int
  else
  	echo $ac_n "checking size of long""... $ac_c" 1>&6
! echo "configure:4319: checking size of long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 3962,3968 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 3966 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 4323,4329 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 4327 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 3973,3979 ****
    exit(0);
  }
  EOF
! if { (eval echo configure:3977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
  else
--- 4334,4340 ----
    exit(0);
  }
  EOF
! if { (eval echo configure:4338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
  else
***************
*** 3996,4002 ****
  		ac_cv_subst_int32_t=long
  	else
  		echo $ac_n "checking size of short""... $ac_c" 1>&6
! echo "configure:4000: checking size of short" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 4357,4363 ----
  		ac_cv_subst_int32_t=long
  	else
  		echo $ac_n "checking size of short""... $ac_c" 1>&6
! echo "configure:4361: checking size of short" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 4004,4010 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 4008 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
--- 4365,4371 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 4369 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  main()
***************
*** 4015,4021 ****
    exit(0);
  }
  EOF
! if { (eval echo configure:4019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_short=`cat conftestval`
  else
--- 4376,4382 ----
    exit(0);
  }
  EOF
! if { (eval echo configure:4380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_short=`cat conftestval`
  else
***************
*** 4045,4057 ****
  
  if test $ac_cv_prog_gcc = yes; then
      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
! echo "configure:4049: checking whether ${CC-cc} needs -traditional" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
      ac_pattern="Autoconf.*'x'"
    cat > conftest.$ac_ext <<EOF
! #line 4055 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  Autoconf TIOCGETP
--- 4406,4418 ----
  
  if test $ac_cv_prog_gcc = yes; then
      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
! echo "configure:4410: checking whether ${CC-cc} needs -traditional" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
      ac_pattern="Autoconf.*'x'"
    cat > conftest.$ac_ext <<EOF
! #line 4416 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
  Autoconf TIOCGETP
***************
*** 4069,4075 ****
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
! #line 4073 "configure"
  #include "confdefs.h"
  #include <termio.h>
  Autoconf TCGETA
--- 4430,4436 ----
  
    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
! #line 4434 "configure"
  #include "confdefs.h"
  #include <termio.h>
  Autoconf TCGETA
***************
*** 4091,4097 ****
  fi
  
  echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
! echo "configure:4095: checking for 8-bit clean memcmp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 4452,4458 ----
  fi
  
  echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
! echo "configure:4456: checking for 8-bit clean memcmp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 4099,4105 ****
    ac_cv_func_memcmp_clean=no
  else
    cat > conftest.$ac_ext <<EOF
! #line 4103 "configure"
  #include "confdefs.h"
  
  main()
--- 4460,4466 ----
    ac_cv_func_memcmp_clean=no
  else
    cat > conftest.$ac_ext <<EOF
! #line 4464 "configure"
  #include "confdefs.h"
  
  main()
***************
*** 4109,4115 ****
  }
  
  EOF
! if { (eval echo configure:4113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_memcmp_clean=yes
  else
--- 4470,4476 ----
  }
  
  EOF
! if { (eval echo configure:4474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_memcmp_clean=yes
  else
***************
*** 4124,4133 ****
  fi
  
  echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
! test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
  
  echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
! echo "configure:4131: checking whether setvbuf arguments are reversed" >&5
  if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 4485,4494 ----
  fi
  
  echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6
! test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
  
  echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
! echo "configure:4492: checking whether setvbuf arguments are reversed" >&5
  if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 4135,4141 ****
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 4139 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  /* If setvbuf has the reversed format, exit 0. */
--- 4496,4502 ----
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
! #line 4500 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  /* If setvbuf has the reversed format, exit 0. */
***************
*** 4149,4155 ****
    exit(0);			/* Non-reversed systems segv here.  */
  }
  EOF
! if { (eval echo configure:4153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_setvbuf_reversed=yes
  else
--- 4510,4516 ----
    exit(0);			/* Non-reversed systems segv here.  */
  }
  EOF
! if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_setvbuf_reversed=yes
  else
***************
*** 4173,4184 ****
  fi
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:4177: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4182 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
--- 4534,4545 ----
  fi
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:4538: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4543 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
***************
*** 4195,4201 ****
  int i;
  ; return 0; }
  EOF
! if { (eval echo configure:4199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
  else
--- 4556,4562 ----
  int i;
  ; return 0; }
  EOF
! if { (eval echo configure:4560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
  else
***************
*** 4216,4233 ****
  
  ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
! echo "configure:4220: checking for vfork.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4225 "configure"
  #include "confdefs.h"
  #include <vfork.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
--- 4577,4594 ----
  
  ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
! echo "configure:4581: checking for vfork.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4586 "configure"
  #include "confdefs.h"
  #include <vfork.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
***************
*** 4251,4268 ****
  fi
  
  echo $ac_n "checking for working vfork""... $ac_c" 1>&6
! echo "configure:4255: checking for working vfork" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test "$cross_compiling" = yes; then
    echo $ac_n "checking for vfork""... $ac_c" 1>&6
! echo "configure:4261: checking for vfork" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4266 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vfork(); below.  */
--- 4612,4629 ----
  fi
  
  echo $ac_n "checking for working vfork""... $ac_c" 1>&6
! echo "configure:4616: checking for working vfork" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    if test "$cross_compiling" = yes; then
    echo $ac_n "checking for vfork""... $ac_c" 1>&6
! echo "configure:4622: checking for vfork" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4627 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vfork(); below.  */
***************
*** 4285,4291 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_vfork=yes"
  else
--- 4646,4652 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:4650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_vfork=yes"
  else
***************
*** 4304,4312 ****
    echo "$ac_t""no" 1>&6
  fi
  
  else
    cat > conftest.$ac_ext <<EOF
! #line 4310 "configure"
  #include "confdefs.h"
  /* Thanks to Paul Eggert for this test.  */
  #include <stdio.h>
--- 4665,4674 ----
    echo "$ac_t""no" 1>&6
  fi
  
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
  else
    cat > conftest.$ac_ext <<EOF
! #line 4672 "configure"
  #include "confdefs.h"
  /* Thanks to Paul Eggert for this test.  */
  #include <stdio.h>
***************
*** 4401,4407 ****
    }
  }
  EOF
! if { (eval echo configure:4405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_vfork_works=yes
  else
--- 4763,4769 ----
    }
  }
  EOF
! if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_vfork_works=yes
  else
***************
*** 4424,4435 ****
  fi
  
  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
! echo "configure:4428: checking for vprintf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4433 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vprintf(); below.  */
--- 4786,4797 ----
  fi
  
  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
! echo "configure:4790: checking for vprintf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4795 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vprintf(); below.  */
***************
*** 4452,4458 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_vprintf=yes"
  else
--- 4814,4820 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:4818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_vprintf=yes"
  else
***************
*** 4476,4487 ****
  
  if test "$ac_cv_func_vprintf" != yes; then
  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
! echo "configure:4480: checking for _doprnt" >&5
  if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4485 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _doprnt(); below.  */
--- 4838,4849 ----
  
  if test "$ac_cv_func_vprintf" != yes; then
  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
! echo "configure:4842: checking for _doprnt" >&5
  if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4847 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _doprnt(); below.  */
***************
*** 4504,4510 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func__doprnt=yes"
  else
--- 4866,4872 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func__doprnt=yes"
  else
***************
*** 4531,4542 ****
  for ac_func in fchmod getdtab gethostname getrlimit getrusage
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4535: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4540 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 4893,4904 ----
  for ac_func in fchmod getdtab gethostname getrlimit getrusage
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4897: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4902 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 4559,4565 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 4921,4927 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:4925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 4586,4597 ****
  for ac_func in gettimeofday memchr memcmp memcpy memmove memset
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4590: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4595 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 4948,4959 ----
  for ac_func in gettimeofday memchr memcmp memcpy memmove memset
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4952: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4957 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 4614,4620 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 4976,4982 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:4980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 4641,4652 ****
  for ac_func in mkdir mkfifo mktemp select setbuffer setproctitle
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4645: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4650 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 5003,5014 ----
  for ac_func in mkdir mkfifo mktemp select setbuffer setproctitle
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:5007: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5012 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 4669,4675 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 5031,5037 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:5035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 4696,4707 ****
  for ac_func in setsid socket strcasecmp strchr strcspn strerror
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4700: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4705 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 5058,5069 ----
  for ac_func in setsid socket strcasecmp strchr strcspn strerror
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:5062: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5067 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 4724,4730 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 5086,5092 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:5090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 4751,4762 ****
  for ac_func in strrchr strspn strstr symlink sysconf syslog ulimit
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4755: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4760 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 5113,5124 ----
  for ac_func in strrchr strspn strstr symlink sysconf syslog ulimit
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:5117: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5122 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 4779,4785 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 5141,5147 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:5145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 4806,4817 ****
  for ac_func in waitpid socketpair getpagesize getspnam
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4810: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4815 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 5168,5179 ----
  for ac_func in waitpid socketpair getpagesize getspnam
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:5172: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5177 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 4834,4840 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 5196,5202 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:5200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 4861,4872 ****
  for ac_func in statvfs
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4865: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4870 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 5223,5234 ----
  for ac_func in statvfs
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:5227: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5232 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 4889,4895 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 5251,5257 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:5255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 4916,4927 ****
  for ac_func in statfs
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4920: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4925 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 5278,5289 ----
  for ac_func in statfs
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:5282: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5287 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 4944,4950 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 5306,5312 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:5310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 4971,4988 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4975: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4980 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
--- 5333,5350 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:5337: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5342 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:5347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
***************
*** 5013,5030 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:5017: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5022 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:5027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
--- 5375,5392 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:5379: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5384 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:5389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
***************
*** 5055,5072 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:5059: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5064 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:5069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
--- 5417,5434 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:5421: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5426 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:5431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
    eval "ac_cv_header_$ac_safe=yes"
***************
*** 5101,5107 ****
  
  
  echo $ac_n "checking for working mmap""... $ac_c" 1>&6
! echo "configure:5105: checking for working mmap" >&5
  if eval "test \"`echo '$''{'ac_cv_func_mmap_shared'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 5463,5469 ----
  
  
  echo $ac_n "checking for working mmap""... $ac_c" 1>&6
! echo "configure:5467: checking for working mmap" >&5
  if eval "test \"`echo '$''{'ac_cv_func_mmap_shared'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 5109,5115 ****
    ac_cv_func_mmap_shared=no
  else
    cat > conftest.$ac_ext <<EOF
! #line 5113 "configure"
  #include "confdefs.h"
  
  /* test shared mmap */
--- 5471,5477 ----
    ac_cv_func_mmap_shared=no
  else
    cat > conftest.$ac_ext <<EOF
! #line 5475 "configure"
  #include "confdefs.h"
  
  /* test shared mmap */
***************
*** 5209,5215 ****
  }
  
  EOF
! if { (eval echo configure:5213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_mmap_shared=yes
  else
--- 5571,5577 ----
  }
  
  EOF
! if { (eval echo configure:5575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_mmap_shared=yes
  else
***************
*** 5232,5243 ****
    for ac_func in madvise
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:5236: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5241 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 5594,5605 ----
    for ac_func in madvise
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:5598: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5603 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 5260,5266 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:5264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 5622,5628 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:5626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 5290,5296 ****
  fi
  
  echo $ac_n "checking whether msync is needed""... $ac_c" 1>&6
! echo "configure:5294: checking whether msync is needed" >&5
  if eval "test \"`echo '$''{'ac_cv_func_need_msync'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 5652,5658 ----
  fi
  
  echo $ac_n "checking whether msync is needed""... $ac_c" 1>&6
! echo "configure:5656: checking whether msync is needed" >&5
  if eval "test \"`echo '$''{'ac_cv_func_need_msync'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
***************
*** 5298,5304 ****
    ac_cv_func_need_msync=no
  else
    cat > conftest.$ac_ext <<EOF
! #line 5302 "configure"
  #include "confdefs.h"
  
  /* test shared mmap (msync) */
--- 5660,5666 ----
    ac_cv_func_need_msync=no
  else
    cat > conftest.$ac_ext <<EOF
! #line 5664 "configure"
  #include "confdefs.h"
  
  /* test shared mmap (msync) */
***************
*** 5410,5416 ****
  }
  
  EOF
! if { (eval echo configure:5414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_need_msync=yes
  else
--- 5772,5778 ----
  }
  
  EOF
! if { (eval echo configure:5776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_need_msync=yes
  else
***************
*** 5428,5439 ****
  
  if test $ac_cv_lib_regex_regexec = no; then
  	echo $ac_n "checking for regexec""... $ac_c" 1>&6
! echo "configure:5432: checking for regexec" >&5
  if eval "test \"`echo '$''{'ac_cv_func_regexec'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5437 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char regexec(); below.  */
--- 5790,5801 ----
  
  if test $ac_cv_lib_regex_regexec = no; then
  	echo $ac_n "checking for regexec""... $ac_c" 1>&6
! echo "configure:5794: checking for regexec" >&5
  if eval "test \"`echo '$''{'ac_cv_func_regexec'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5799 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char regexec(); below.  */
***************
*** 5456,5462 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:5460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_regexec=yes"
  else
--- 5818,5824 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:5822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_regexec=yes"
  else
***************
*** 5480,5488 ****
  
  
  echo $ac_n "checking for msync args""... $ac_c" 1>&6
! echo "configure:5484: checking for msync args" >&5
  cat > conftest.$ac_ext <<EOF
! #line 5486 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/mman.h>
--- 5842,5850 ----
  
  
  echo $ac_n "checking for msync args""... $ac_c" 1>&6
! echo "configure:5846: checking for msync args" >&5
  cat > conftest.$ac_ext <<EOF
! #line 5848 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/mman.h>
***************
*** 5490,5496 ****
  char *p; int psize; msync(p,psize,MS_ASYNC); 
  ; return 0; }
  EOF
! if { (eval echo configure:5494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_MSYNC_3_ARG 1
--- 5852,5858 ----
  char *p; int psize; msync(p,psize,MS_ASYNC); 
  ; return 0; }
  EOF
! if { (eval echo configure:5856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_MSYNC_3_ARG 1
***************
*** 5505,5516 ****
  rm -f conftest*
  
  echo $ac_n "checking for return type of abort""... $ac_c" 1>&6
! echo "configure:5509: checking for return type of abort" >&5
  if eval "test \"`echo '$''{'ac_cv_type_abort'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5514 "configure"
  #include "confdefs.h"
  #ifdef HAVE_STDLIB_H
  #include <stdlib.h>
--- 5867,5878 ----
  rm -f conftest*
  
  echo $ac_n "checking for return type of abort""... $ac_c" 1>&6
! echo "configure:5871: checking for return type of abort" >&5
  if eval "test \"`echo '$''{'ac_cv_type_abort'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5876 "configure"
  #include "confdefs.h"
  #ifdef HAVE_STDLIB_H
  #include <stdlib.h>
***************
*** 5519,5525 ****
  int a;a=abort()
  ; return 0; }
  EOF
! if { (eval echo configure:5523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_abort=int
  else
--- 5881,5887 ----
  int a;a=abort()
  ; return 0; }
  EOF
! if { (eval echo configure:5885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_abort=int
  else
***************
*** 5534,5545 ****
  echo "$ac_t""$ac_cv_type_abort" 1>&6
  
  echo $ac_n "checking for return type of alarm""... $ac_c" 1>&6
! echo "configure:5538: checking for return type of alarm" >&5
  if eval "test \"`echo '$''{'ac_cv_type_alarm'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5543 "configure"
  #include "confdefs.h"
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
--- 5896,5907 ----
  echo "$ac_t""$ac_cv_type_abort" 1>&6
  
  echo $ac_n "checking for return type of alarm""... $ac_c" 1>&6
! echo "configure:5900: checking for return type of alarm" >&5
  if eval "test \"`echo '$''{'ac_cv_type_alarm'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5905 "configure"
  #include "confdefs.h"
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
***************
*** 5548,5554 ****
  unsigned int alarm()
  ; return 0; }
  EOF
! if { (eval echo configure:5552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_alarm="unsigned int"
  else
--- 5910,5916 ----
  unsigned int alarm()
  ; return 0; }
  EOF
! if { (eval echo configure:5914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_alarm="unsigned int"
  else
***************
*** 5563,5574 ****
  echo "$ac_t""$ac_cv_type_alarm" 1>&6
  
  echo $ac_n "checking for return type of sleep""... $ac_c" 1>&6
! echo "configure:5567: checking for return type of sleep" >&5
  if eval "test \"`echo '$''{'ac_cv_type_sleep'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5572 "configure"
  #include "confdefs.h"
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
--- 5925,5936 ----
  echo "$ac_t""$ac_cv_type_alarm" 1>&6
  
  echo $ac_n "checking for return type of sleep""... $ac_c" 1>&6
! echo "configure:5929: checking for return type of sleep" >&5
  if eval "test \"`echo '$''{'ac_cv_type_sleep'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5934 "configure"
  #include "confdefs.h"
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
***************
*** 5577,5583 ****
  unsigned int sleep()
  ; return 0; }
  EOF
! if { (eval echo configure:5581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_sleep="unsigned int"
  else
--- 5939,5945 ----
  unsigned int sleep()
  ; return 0; }
  EOF
! if { (eval echo configure:5943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_sleep="unsigned int"
  else
***************
*** 5592,5603 ****
  echo "$ac_t""$ac_cv_type_sleep" 1>&6
  
  echo $ac_n "checking for return type of qsort""... $ac_c" 1>&6
! echo "configure:5596: checking for return type of qsort" >&5
  if eval "test \"`echo '$''{'ac_cv_type_qsort'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5601 "configure"
  #include "confdefs.h"
  #ifdef HAVE_STDLIB_H
  #include <stdlib.h>
--- 5954,5965 ----
  echo "$ac_t""$ac_cv_type_sleep" 1>&6
  
  echo $ac_n "checking for return type of qsort""... $ac_c" 1>&6
! echo "configure:5958: checking for return type of qsort" >&5
  if eval "test \"`echo '$''{'ac_cv_type_qsort'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5963 "configure"
  #include "confdefs.h"
  #ifdef HAVE_STDLIB_H
  #include <stdlib.h>
***************
*** 5606,5612 ****
  int a;a=qsort(0,0,0,0)
  ; return 0; }
  EOF
! if { (eval echo configure:5610: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_qsort=int
  else
--- 5968,5974 ----
  int a;a=qsort(0,0,0,0)
  ; return 0; }
  EOF
! if { (eval echo configure:5972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_qsort=int
  else
***************
*** 5621,5632 ****
  echo "$ac_t""$ac_cv_type_qsort" 1>&6
  
  echo $ac_n "checking for return type of free""... $ac_c" 1>&6
! echo "configure:5625: checking for return type of free" >&5
  if eval "test \"`echo '$''{'ac_cv_type_free'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5630 "configure"
  #include "confdefs.h"
  #ifdef _AIX41
  #include <stdlib.h>
--- 5983,5994 ----
  echo "$ac_t""$ac_cv_type_qsort" 1>&6
  
  echo $ac_n "checking for return type of free""... $ac_c" 1>&6
! echo "configure:5987: checking for return type of free" >&5
  if eval "test \"`echo '$''{'ac_cv_type_free'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5992 "configure"
  #include "confdefs.h"
  #ifdef _AIX41
  #include <stdlib.h>
***************
*** 5643,5649 ****
  int a;a=free(0)
  ; return 0; }
  EOF
! if { (eval echo configure:5647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_free=int
  else
--- 6005,6011 ----
  int a;a=free(0)
  ; return 0; }
  EOF
! if { (eval echo configure:6009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_free=int
  else
***************
*** 5658,5669 ****
  echo "$ac_t""$ac_cv_type_free" 1>&6
  
  echo $ac_n "checking for return type of exit""... $ac_c" 1>&6
! echo "configure:5662: checking for return type of exit" >&5
  if eval "test \"`echo '$''{'ac_cv_type_exit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5667 "configure"
  #include "confdefs.h"
  #ifdef HAVE_STDLIB_H
  #include <stdlib.h>
--- 6020,6031 ----
  echo "$ac_t""$ac_cv_type_free" 1>&6
  
  echo $ac_n "checking for return type of exit""... $ac_c" 1>&6
! echo "configure:6024: checking for return type of exit" >&5
  if eval "test \"`echo '$''{'ac_cv_type_exit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6029 "configure"
  #include "confdefs.h"
  #ifdef HAVE_STDLIB_H
  #include <stdlib.h>
***************
*** 5672,5678 ****
  int a;a=exit(0)
  ; return 0; }
  EOF
! if { (eval echo configure:5676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_exit=int
  else
--- 6034,6040 ----
  int a;a=exit(0)
  ; return 0; }
  EOF
! if { (eval echo configure:6038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_exit=int
  else
***************
*** 5687,5698 ****
  echo "$ac_t""$ac_cv_type_exit" 1>&6
  
  echo $ac_n "checking for return type of _exit""... $ac_c" 1>&6
! echo "configure:5691: checking for return type of _exit" >&5
  if eval "test \"`echo '$''{'ac_cv_type__exit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5696 "configure"
  #include "confdefs.h"
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
--- 6049,6060 ----
  echo "$ac_t""$ac_cv_type_exit" 1>&6
  
  echo $ac_n "checking for return type of _exit""... $ac_c" 1>&6
! echo "configure:6053: checking for return type of _exit" >&5
  if eval "test \"`echo '$''{'ac_cv_type__exit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6058 "configure"
  #include "confdefs.h"
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
***************
*** 5701,5707 ****
  int a;a=_exit(0)
  ; return 0; }
  EOF
! if { (eval echo configure:5705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type__exit=int
  else
--- 6063,6069 ----
  int a;a=_exit(0)
  ; return 0; }
  EOF
! if { (eval echo configure:6067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type__exit=int
  else
***************
*** 5719,5730 ****
  for ac_func in flock lockf fcntl
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:5723: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5728 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 6081,6092 ----
  for ac_func in flock lockf fcntl
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:6085: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6090 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
***************
*** 5747,5753 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:5751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 6109,6115 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:6113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 5773,5781 ****
  
  
  echo $ac_n "checking for AF_UNIX""... $ac_c" 1>&6
! echo "configure:5777: checking for AF_UNIX" >&5
  cat > conftest.$ac_ext <<EOF
! #line 5779 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
  #ifdef AF_UNIX
--- 6135,6143 ----
  
  
  echo $ac_n "checking for AF_UNIX""... $ac_c" 1>&6
! echo "configure:6139: checking for AF_UNIX" >&5
  cat > conftest.$ac_ext <<EOF
! #line 6141 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
  #ifdef AF_UNIX
***************
*** 5797,5813 ****
  
  
  echo $ac_n "checking for close on exec style""... $ac_c" 1>&6
! echo "configure:5801: checking for close on exec style" >&5
  CLX_STYLE=pre_test
  if test $ac_cv_header_fcntl_h = yes; then
  	cat > conftest.$ac_ext <<EOF
! #line 5805 "configure"
  #include "confdefs.h"
  #include <fcntl.h>
  #ifdef FD_CLOEXEC
  yes
  #else
! # ifdef FD_SETFD
  yes
  # endif
  #endif
--- 6159,6175 ----
  
  
  echo $ac_n "checking for close on exec style""... $ac_c" 1>&6
! echo "configure:6163: checking for close on exec style" >&5
  CLX_STYLE=pre_test
  if test $ac_cv_header_fcntl_h = yes; then
  	cat > conftest.$ac_ext <<EOF
! #line 6167 "configure"
  #include "confdefs.h"
  #include <fcntl.h>
  #ifdef FD_CLOEXEC
  yes
  #else
! # ifdef F_SETFD
  yes
  # endif
  #endif
***************
*** 5834,5840 ****
  CLX_STYLE=pre_test
  if test $ac_cv_header_sys_filio_h = yes; then
  	cat > conftest.$ac_ext <<EOF
! #line 5838 "configure"
  #include "confdefs.h"
  #include <sys/filio.h>
  #ifdef FIOCLEX
--- 6196,6202 ----
  CLX_STYLE=pre_test
  if test $ac_cv_header_sys_filio_h = yes; then
  	cat > conftest.$ac_ext <<EOF
! #line 6200 "configure"
  #include "confdefs.h"
  #include <sys/filio.h>
  #ifdef FIOCLEX
***************
*** 5866,5876 ****
  
  
  echo $ac_n "checking for nbio style""... $ac_c" 1>&6
! echo "configure:5870: checking for nbio style" >&5
  NBIO_STYLE=pre_test
  if test $ac_cv_header_fcntl_h = yes; then
  	cat > conftest.$ac_ext <<EOF
! #line 5874 "configure"
  #include "confdefs.h"
  #include <fcntl.h>
  #ifdef O_NONBLOCK
--- 6228,6238 ----
  
  
  echo $ac_n "checking for nbio style""... $ac_c" 1>&6
! echo "configure:6232: checking for nbio style" >&5
  NBIO_STYLE=pre_test
  if test $ac_cv_header_fcntl_h = yes; then
  	cat > conftest.$ac_ext <<EOF
! #line 6236 "configure"
  #include "confdefs.h"
  #include <fcntl.h>
  #ifdef O_NONBLOCK
***************
*** 5898,5904 ****
  NBIO_STYLE=pre_test
  if test $ac_cv_header_sys_filio_h = yes; then
  	cat > conftest.$ac_ext <<EOF
! #line 5902 "configure"
  #include "confdefs.h"
  #include <sys/filio.h>
  #ifdef FIONBIO
--- 6260,6266 ----
  NBIO_STYLE=pre_test
  if test $ac_cv_header_sys_filio_h = yes; then
  	cat > conftest.$ac_ext <<EOF
! #line 6264 "configure"
  #include "confdefs.h"
  #include <sys/filio.h>
  #ifdef FIONBIO
***************
*** 5931,5939 ****
  
  
  echo $ac_n "checking log level for news""... $ac_c" 1>&6
! echo "configure:5935: checking log level for news" >&5
  cat > conftest.$ac_ext <<EOF
! #line 5937 "configure"
  #include "confdefs.h"
  #include <syslog.h>
  #ifdef LOG_NEWS
--- 6293,6301 ----
  
  
  echo $ac_n "checking log level for news""... $ac_c" 1>&6
! echo "configure:6297: checking log level for news" >&5
  cat > conftest.$ac_ext <<EOF
! #line 6299 "configure"
  #include "confdefs.h"
  #include <syslog.h>
  #ifdef LOG_NEWS
***************
*** 5956,5967 ****
  
  
  echo $ac_n "checking generic pointer""... $ac_c" 1>&6
! echo "configure:5960: checking generic pointer" >&5
  if eval "test \"`echo '$''{'ac_cv_type_generic'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5965 "configure"
  #include "confdefs.h"
  #ifdef _AIX41
  #include <stdlib.h>
--- 6318,6329 ----
  
  
  echo $ac_n "checking generic pointer""... $ac_c" 1>&6
! echo "configure:6322: checking generic pointer" >&5
  if eval "test \"`echo '$''{'ac_cv_type_generic'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6327 "configure"
  #include "confdefs.h"
  #ifdef _AIX41
  #include <stdlib.h>
***************
*** 5976,5982 ****
  void *a; a = malloc(sizeof(a))
  ; return 0; }
  EOF
! if { (eval echo configure:5980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_generic=void
  else
--- 6338,6344 ----
  void *a; a = malloc(sizeof(a))
  ; return 0; }
  EOF
! if { (eval echo configure:6342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_generic=void
  else
***************
*** 6181,6186 ****
--- 6543,6562 ----
  	MISSING_SRC="${MISSING_SRC}syslog.c "
  	MISSING_OBJ="${MISSING_OBJ}syslog.o "
  fi
+ 
+ case "$inn_cv_sys_os" in
+    SCO*)
+  	MISSING_MAN=""
+  	MISSING_SRC=""
+ 	MISSING_OBJ=""
+    ;;
+    UnixWare*)
+  	MISSING_MAN=""
+  	MISSING_SRC=""
+  	MISSING_OBJ=""
+    ;;
+  esac
+ 
  if test ${ac_cv_func_strerror} = "no"
  then
  	MISSING_SRC="${MISSING_SRC}strerror.c "
***************
*** 6257,6263 ****
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
  (set) 2>&1 |
!   case `(ac_space=' '; set) 2>&1` in
    *ac_space=\ *)
      # `set' does not quote correctly, so add quotes (double-quote substitution
      # turns \\\\ into \\, and sed turns \\ into \).
--- 6633,6639 ----
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
  (set) 2>&1 |
!   case `(ac_space=' '; set | grep ac_space) 2>&1` in
    *ac_space=\ *)
      # `set' does not quote correctly, so add quotes (double-quote substitution
      # turns \\\\ into \\, and sed turns \\ into \).
***************
*** 6324,6330 ****
      echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.12"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
--- 6700,6706 ----
      echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.13"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
      echo "\$ac_cs_usage"; exit 0 ;;
***************
*** 6414,6422 ****
--- 6790,6800 ----
   s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
  $ac_vpsub
  $extrasub
+ s%@SHELL@%$SHELL%g
  s%@CFLAGS@%$CFLAGS%g
  s%@CPPFLAGS@%$CPPFLAGS%g
  s%@CXXFLAGS@%$CXXFLAGS%g
+ s%@FFLAGS@%$FFLAGS%g
  s%@DEFS@%$DEFS%g
  s%@LDFLAGS@%$LDFLAGS%g
  s%@LIBS@%$LIBS%g
***************
*** 6471,6476 ****
--- 6849,6856 ----
  s%@LEX@%$LEX%g
  s%@LEXLIB@%$LEXLIB%g
  s%@CPP@%$CPP%g
+ s%@uname_prog@%$uname_prog%g
+ s%@CXX@%$CXX%g
  s%@PATH_CTAGS@%$PATH_CTAGS%g
  s%@ac_cv_subst_ctags@%$ac_cv_subst_ctags%g
  s%@_PATH_AWK@%$_PATH_AWK%g
diff -Nacr inn-2.2.1/configure.in inn-2.2.2/configure.in
*** inn-2.2.1/configure.in	Wed Apr 28 01:12:55 1999
--- inn-2.2.2/configure.in	Mon Dec 13 13:18:37 1999
***************
*** 135,140 ****
--- 135,223 ----
  AC_ISC_POSIX
  AC_DECUNIX
  
+ AC_DEFUN(AC_SYS_COMPILER_FLAG,
+ [
+   AC_MSG_CHECKING($1)
+   OLD_CFLAGS="[$]CFLAGS"
+   AC_CACHE_VAL(inn_cv_option_$2,
+   [
+     CFLAGS="[$]OLD_CFLAGS $1"
+     AC_TRY_RUN([int main(){exit(0);}],inn_cv_option_$2=yes,inn_cv_option_$2=no)
+   ])
+   
+   CFLAGS="[$]OLD_CFLAGS"
+   
+   if test x"[$]inn_cv_option_$2" = "xyes" ; then
+     $3="[$]$3 $1"
+     AC_MSG_RESULT(yes)
+   else
+     AC_MSG_RESULT(no)
+   fi
+ ])
+ 
+ # We need some special hacks when running slowaris
+ AC_PATH_PROG(uname_prog,uname,no)
+ AC_MSG_CHECKING(operating system)
+ AC_CACHE_VAL(inn_cv_sys_os,
+ [
+ if test "$uname_prog" != "no"; then
+   inn_cv_sys_os="`uname`"
+ 
+   case "$inn_cv_sys_os" in
+     SunOS)
+       case "`uname -r`" in
+         5.*) inn_cv_sys_os="Solaris";
+       esac
+     ;;
+   esac
+ else
+   inn_cv_sys_os="Not Solaris"
+ fi
+ ])
+ AC_MSG_RESULT($inn_cv_sys_os)
+ 
+ case "$inn_cv_sys_os" in
+   SCO*)
+      case "$CFLAGS" in
+        *-belf*) 
+           AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
+            case "$LDFLAGS" in
+              *-belf*) ;;
+              *)
+ 	        echo "Adding -belf option to ldflags."
+                 LDFLAGS="$LDFLAGS -belf"
+              ;;
+            esac
+           ])
+ 	;;
+        *)
+           AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
+            case "$LDFLAGS" in
+              *-belf*) ;;
+              *)
+ 	        echo "Adding -belf option to ldflags."
+                 LDFLAGS="$LDFLAGS -belf"
+              ;;
+            esac
+           ])
+        ;;
+      esac
+   ;;
+ 
+   UnixWare*)
+     if test "$GCC" != "yes"; then
+       # We are using built-in inline function
+       CFLAGS="$CFLAGS -Kalloca"
+       CXX="CC -DNO_CPLUSPLUS_ALLOCA"
+     fi
+   ;;
+ esac
+ AC_SUBST(CFLAGS)
+ AC_SUBST(CXX)
+ AC_SUBST(LD)
+ AC_SUBST(LDFLAGS)
+ 
+ 
  
  dnl Checks for pathnames
  ac_save_path="$PATH"
***************
*** 732,738 ****
  #ifdef FD_CLOEXEC
  yes
  #else
! # ifdef FD_SETFD
  yes
  # endif
  #endif], [AC_DEFINE(CLX_FCNTL) AC_MSG_RESULT(FCNTL)], CLX_STYLE=unknown)
--- 815,821 ----
  #ifdef FD_CLOEXEC
  yes
  #else
! # ifdef F_SETFD
  yes
  # endif
  #endif], [AC_DEFINE(CLX_FCNTL) AC_MSG_RESULT(FCNTL)], CLX_STYLE=unknown)
***************
*** 937,942 ****
--- 1020,1039 ----
  	MISSING_SRC="${MISSING_SRC}syslog.c "
  	MISSING_OBJ="${MISSING_OBJ}syslog.o "
  fi
+ 
+ case "$inn_cv_sys_os" in
+    SCO*)
+  	MISSING_MAN=""
+  	MISSING_SRC=""
+ 	MISSING_OBJ=""
+    ;;
+    UnixWare*)
+  	MISSING_MAN=""
+  	MISSING_SRC=""
+  	MISSING_OBJ=""
+    ;;
+  esac
+ 
  if test ${ac_cv_func_strerror} = "no"
  then
  	MISSING_SRC="${MISSING_SRC}strerror.c "
diff -Nacr inn-2.2.1/doc/Makefile inn-2.2.2/doc/Makefile
*** inn-2.2.1/doc/Makefile	Tue Nov  3 14:02:13 1998
--- inn-2.2.2/doc/Makefile	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! ##  $Revision: 1.35.2.1 $
  include ../Makefile.global
  
  CFLAGS	= $(GCFLAGS)
--- 1,4 ----
! ##  $Revision: 1.35.2.3 $
  include ../Makefile.global
  
  CFLAGS	= $(GCFLAGS)
***************
*** 16,22 ****
  
  SEC1	= convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 installit.1 \
  	nntpget.1 rnews.1 shlock.1 shrinkfile.1 subst.1 innfeed.1 \
! 	startinnfeed.1
  SEC3	= $(MISSING_MAN) \
  	clientlib.3 dbz.3 inndcomm.3 libinn.3 libstorage.3 parsedate.3 qio.3 \
  	wildmat.3
--- 16,22 ----
  
  SEC1	= convdate.1 getlist.1 grephistory.1 inews.1 innconfval.1 installit.1 \
  	nntpget.1 rnews.1 shlock.1 shrinkfile.1 subst.1 innfeed.1 \
! 	startinnfeed.1 simpleftp.1
  SEC3	= $(MISSING_MAN) \
  	clientlib.3 dbz.3 inndcomm.3 libinn.3 libstorage.3 parsedate.3 qio.3 \
  	wildmat.3
***************
*** 29,36 ****
  	batcher.8 buffchan.8 crosspost.8 ctlinnd.8 \
  	cvtbatch.8 expire.8 expireover.8 expirerm.8 fastrm.8 filechan.8 \
  	inncheck.8 innd.8 innreport.8 innstat.8 innwatch.8 innxbatch.8 \
! 	innxmit.8 makeactive.8 makehistory.8 news-recovery.8 news.daily.8 \
! 	newslog.8 newsrequeue.8 nnrpd.8 nntpsend.8 overchan.8 \
  	pgpverify.8 prunehistory.8 scanlogs.8 actived.8 send-uucp.8 \
  	tally.control.8 tally.unwanted.8 writelog.8 expireindex.8 sm.8 inndf.8 \
  	cnfsstat.8 controlchan.8 news2mail.8 pullnews.8 mailpost.8
--- 29,36 ----
  	batcher.8 buffchan.8 crosspost.8 ctlinnd.8 \
  	cvtbatch.8 expire.8 expireover.8 expirerm.8 fastrm.8 filechan.8 \
  	inncheck.8 innd.8 innreport.8 innstat.8 innwatch.8 innxbatch.8 \
! 	innxmit.8 makeactive.8 makehistory.8 mod-active.8 news-recovery.8 \
! 	news.daily.8 newslog.8 newsrequeue.8 nnrpd.8 nntpsend.8 overchan.8 \
  	pgpverify.8 prunehistory.8 scanlogs.8 actived.8 send-uucp.8 \
  	tally.control.8 tally.unwanted.8 writelog.8 expireindex.8 sm.8 inndf.8 \
  	cnfsstat.8 controlchan.8 news2mail.8 pullnews.8 mailpost.8
***************
*** 41,47 ****
  			$D$(MAN1)/nntpget.1 $D$(MAN1)/rnews.1 \
  			$D$(MAN1)/shlock.1 $D$(MAN1)/shrinkfile.1 \
  			$D$(MAN1)/subst.1 $D$(MAN1)/innfeed.1 \
! 			$D$(MAN1)/startinnfeed.1
  
  INSTALLED_SEC3 =	$D$(MAN3)/clientlib.3 $D$(MAN3)/dbz.3 \
  			$D$(MAN3)/inndcomm.3 $D$(MAN3)/libinn.3 \
--- 41,47 ----
  			$D$(MAN1)/nntpget.1 $D$(MAN1)/rnews.1 \
  			$D$(MAN1)/shlock.1 $D$(MAN1)/shrinkfile.1 \
  			$D$(MAN1)/subst.1 $D$(MAN1)/innfeed.1 \
! 			$D$(MAN1)/startinnfeed.1 $D$(MAN1)/simpleftp.1
  
  INSTALLED_SEC3 =	$D$(MAN3)/clientlib.3 $D$(MAN3)/dbz.3 \
  			$D$(MAN3)/inndcomm.3 $D$(MAN3)/libinn.3 \
***************
*** 84,90 ****
  			$D$(MAN8)/actived.8 $D$(MAN8)/send-uucp.8 \
  			$D$(MAN8)/inndf.8 $D$(MAN8)/cnfsstat.8 \
  			$D$(MAN8)/controlchan.8 $D$(MAN8)/news2mail.8 \
! 			$D$(MAN8)/pullnews.8 $D$(MAN8)/mailpost.8
  
  ALL	= $(SEC1) $(SEC3) $(SEC5) $(SEC8)
  
--- 84,91 ----
  			$D$(MAN8)/actived.8 $D$(MAN8)/send-uucp.8 \
  			$D$(MAN8)/inndf.8 $D$(MAN8)/cnfsstat.8 \
  			$D$(MAN8)/controlchan.8 $D$(MAN8)/news2mail.8 \
! 			$D$(MAN8)/pullnews.8 $D$(MAN8)/mailpost.8 \
! 			$D$(MAN8)/mod-active.8
  
  ALL	= $(SEC1) $(SEC3) $(SEC5) $(SEC8)
  
***************
*** 124,129 ****
--- 125,131 ----
  $D$(MAN1)/rnews.1:		rnews.1		   ; $(COPY) $? $@
  $D$(MAN1)/shlock.1:		shlock.1	   ; $(COPY) $? $@
  $D$(MAN1)/shrinkfile.1:		shrinkfile.1	   ; $(COPY) $? $@
+ $D$(MAN1)/simpleftp.1:		simpleftp.1	   ; $(COPY) $? $@
  $D$(MAN1)/subst.1:		subst.1		   ; $(COPY) $? $@
  $D$(MAN1)/innfeed.1:		innfeed.1	   ; $(COPY) $? $@
  $D$(MAN1)/startinnfeed.1:	startinnfeed.1	   ; $(COPY) $? $@
***************
*** 181,186 ****
--- 183,189 ----
  $D$(MAN8)/innxmit.8:		innxmit.8          ; $(COPY) $? $@
  $D$(MAN8)/makeactive.8:		makeactive.8       ; $(COPY) $? $@
  $D$(MAN8)/makehistory.8:	makehistory.8      ; $(COPY) $? $@
+ $D$(MAN8)/mod-active.8:		mod-active.8       ; $(COPY) $? $@
  $D$(MAN8)/news-recovery.8:	news-recovery.8    ; $(COPY) $? $@
  $D$(MAN8)/news.daily.8:		news.daily.8       ; $(COPY) $? $@
  $D$(MAN8)/newslog.8:		newslog.8          ; $(COPY) $? $@
diff -Nacr inn-2.2.1/doc/innfeed.1 inn-2.2.2/doc/innfeed.1
*** inn-2.2.1/doc/innfeed.1	Sat Jun 12 08:22:37 1999
--- inn-2.2.2/doc/innfeed.1	Mon Dec 13 13:18:37 1999
***************
*** 4,10 ****
  .\" Start Date:   Sat, 20 Jan 1996 15:50:56 +1100
  .\" Project:      INN -- innfeed
  .\" File:         innfeed.1
! .\" RCSId:        $Id: innfeed.1,v 1.1.2.1 1999/06/12 08:22:37 kondou Exp $
  .\" Description:  Man page for innfeed(1)
  .\"
  .TH INNFEED 1
--- 4,10 ----
  .\" Start Date:   Sat, 20 Jan 1996 15:50:56 +1100
  .\" Project:      INN -- innfeed
  .\" File:         innfeed.1
! .\" RCSId:        $Id: innfeed.1,v 1.1.2.2 1999/11/16 13:50:25 kondou Exp $
  .\" Description:  Man page for innfeed(1)
  .\"
  .TH INNFEED 1
***************
*** 76,82 ****
  .\"
  .SH DESCRIPTION
  .PP
! This man page describes version 0.10 (beta) of innfeed.
  .PP
  .I Innfeed
  implements the NNTP protocol for transferring news between computers. It
--- 76,82 ----
  .\"
  .SH DESCRIPTION
  .PP
! This man page describes version 1.0 of innfeed.
  .PP
  .I Innfeed
  implements the NNTP protocol for transferring news between computers. It
***************
*** 485,490 ****
  .de R$
  This is revision \\$3, dated \\$4.
  ..
! .R$ $Id: innfeed.1,v 1.1.2.1 1999/06/12 08:22:37 kondou Exp $
  .SH SEE ALSO
  .IR innfeed.conf(5)
--- 485,490 ----
  .de R$
  This is revision \\$3, dated \\$4.
  ..
! .R$ $Id: innfeed.1,v 1.1.2.2 1999/11/16 13:50:25 kondou Exp $
  .SH SEE ALSO
  .IR innfeed.conf(5)
diff -Nacr inn-2.2.1/doc/innfeed.conf.5 inn-2.2.2/doc/innfeed.conf.5
*** inn-2.2.1/doc/innfeed.conf.5	Sat Jun 12 08:22:38 1999
--- inn-2.2.2/doc/innfeed.conf.5	Mon Dec 13 13:18:37 1999
***************
*** 4,10 ****
  .\" Start Date:   Sun, 21 Jan 1996 00:47:37 +1100
  .\" Project:      INN -- innfeed
  .\" File:         innfeed.conf.5
! .\" RCSId:        $Id: innfeed.conf.5,v 1.1.2.1 1999/06/12 08:22:38 kondou Exp $
  .\" Description:  Man page for innfeed.conf(5)
  .\" 
  .TH innfeed.conf 5
--- 4,10 ----
  .\" Start Date:   Sun, 21 Jan 1996 00:47:37 +1100
  .\" Project:      INN -- innfeed
  .\" File:         innfeed.conf.5
! .\" RCSId:        $Id: innfeed.conf.5,v 1.1.2.2 1999/11/16 13:50:25 kondou Exp $
  .\" Description:  Man page for innfeed.conf(5)
  .\" 
  .TH innfeed.conf 5
***************
*** 12,18 ****
  innfeed.conf \- configuration file for innfeed
  .SH DESCRIPTION
  .PP
! This man page describes the configuration file for version 0.10 (beta) of
  innfeed. This format has changed dramatically since version 0.9.3.
  .PP
  The file 
--- 12,18 ----
  innfeed.conf \- configuration file for innfeed
  .SH DESCRIPTION
  .PP
! This man page describes the configuration file for version 1.0 of
  innfeed. This format has changed dramatically since version 0.9.3.
  .PP
  The file 
***************
*** 639,644 ****
  .de R$
  This is revision \\$3, dated \\$4.
  ..
! .R$ $Id: innfeed.conf.5,v 1.1.2.1 1999/06/12 08:22:38 kondou Exp $
  .SH SEE ALSO
  innfeed(1), newsfeeds(5)
--- 639,644 ----
  .de R$
  This is revision \\$3, dated \\$4.
  ..
! .R$ $Id: innfeed.conf.5,v 1.1.2.2 1999/11/16 13:50:25 kondou Exp $
  .SH SEE ALSO
  innfeed(1), newsfeeds(5)
diff -Nacr inn-2.2.1/doc/newsfeeds.5 inn-2.2.2/doc/newsfeeds.5
*** inn-2.2.1/doc/newsfeeds.5	Sat Jun 12 08:22:50 1999
--- inn-2.2.2/doc/newsfeeds.5	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! .\" $Revision: 1.1.2.1 $
  .TH NEWSFEEDS 5
  .SH NAME
  newsfeeds \- determine where Usenet articles get sent
--- 1,4 ----
! .\" $Revision: 1.1.2.2 $
  .TH NEWSFEEDS 5
  .SH NAME
  newsfeeds \- determine where Usenet articles get sent
***************
*** 380,385 ****
--- 380,391 ----
  in the file.
  If the
  .I ME
+ entry has an exclusion sub-field, then the articles are rejected
+ if any of the names specified as
+ .IR exclude s
+ appear in the Path header.
+ If the
+ .I ME
  entry has a subscription list, then that list is automatically
  prepended to the subscription list of all other entries.
  For example, ``*,!control,!junk,!foo.*'' can be used to set up the
***************
*** 602,608 ****
  .de R$
  This is revision \\$3, dated \\$4.
  ..
! .R$ $Id: newsfeeds.5,v 1.1.2.1 1999/06/12 08:22:50 kondou Exp $
  .SH "SEE ALSO"
  active(5),
  buffchan(8),
--- 608,614 ----
  .de R$
  This is revision \\$3, dated \\$4.
  ..
! .R$ $Id: newsfeeds.5,v 1.1.2.2 1999/09/22 06:12:24 kondou Exp $
  .SH "SEE ALSO"
  active(5),
  buffchan(8),
diff -Nacr inn-2.2.1/frontends/inews.c inn-2.2.2/frontends/inews.c
*** inn-2.2.1/frontends/inews.c	Sun Aug 22 06:25:10 1999
--- inn-2.2.2/frontends/inews.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.15.2.5 $
  **
  **  Send an article (prepared by someone on the local site) to the
  **  master news server.
--- 1,4 ----
! /*  $Revision: 1.15.2.7 $
  **
  **  Send an article (prepared by someone on the local site) to the
  **  master news server.
***************
*** 129,140 ****
  	(void)fprintf(stderr, "(Article not posted.)\n");
      (void)fprintf(ToServer, "quit\r\n");
      if (FLUSH_ERROR(ToServer)) {
! 	(void)fprintf(stderr, "Can't send quit to server, %s",
  		strerror(errno));
  	exit(1);
      }
      if (fgets(buff, sizeof buff, FromServer) == NULL) {
! 	(void)fprintf(stderr, "Warning -- server did not reply to quit, %s",
  		strerror(errno));
  	exit(1);
      }
--- 129,140 ----
  	(void)fprintf(stderr, "(Article not posted.)\n");
      (void)fprintf(ToServer, "quit\r\n");
      if (FLUSH_ERROR(ToServer)) {
! 	(void)fprintf(stderr, "Can't send quit to server, %s\n",
  		strerror(errno));
  	exit(1);
      }
      if (fgets(buff, sizeof buff, FromServer) == NULL) {
! 	(void)fprintf(stderr, "Warning -- server did not reply to quit, %s\n",
  		strerror(errno));
  	exit(1);
      }
***************
*** 365,371 ****
      HeaderCleanFrom(localfrom);
  
      /* Is the right person cancelling? */
!     if (!EQ(localfrom, remotefrom)) {
  	(void)fprintf(stderr,
  		"Article was posted by \"%s\" and you are \"%s\".\n",
  		remotefrom, localfrom);
--- 365,371 ----
      HeaderCleanFrom(localfrom);
  
      /* Is the right person cancelling? */
!     if (!caseEQ(localfrom, remotefrom)) {
  	(void)fprintf(stderr,
  		"Article was posted by \"%s\" and you are \"%s\".\n",
  		remotefrom, localfrom);
diff -Nacr inn-2.2.1/frontends/innconfval.c inn-2.2.2/frontends/innconfval.c
*** inn-2.2.1/frontends/innconfval.c	Fri Aug 21 10:28:14 1998
--- inn-2.2.2/frontends/innconfval.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.13 $
  **
  **  Get a config value from INN.
  */
--- 1,4 ----
! /*  $Revision: 1.13.2.1 $
  **
  **  Get a config value from INN.
  */
***************
*** 97,103 ****
  	}
  	(void)fclose(F);
      }
!     printit(strdup("version"), ver);
      exit(0);
  }
  
--- 97,103 ----
  	}
  	(void)fclose(F);
      }
!     printit(COPY("version"), ver);
      exit(0);
  }
  
***************
*** 147,153 ****
  
      ver = INNVersion();
      if (version) {
! 	printit(strdup("version"), ver);
  	exit(0);
      }
      if (!*av) wholeconfig();   /* Doesn't return */
--- 147,153 ----
  
      ver = INNVersion();
      if (version) {
! 	printit(COPY("version"), ver);
  	exit(0);
      }
      if (!*av) wholeconfig();   /* Doesn't return */
diff -Nacr inn-2.2.1/frontends/sm.c inn-2.2.2/frontends/sm.c
*** inn-2.2.1/frontends/sm.c	Thu Jul  9 23:16:28 1998
--- inn-2.2.2/frontends/sm.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.12 $
  **
  ** Provide a command line interface to the storage manager
  */
--- 1,4 ----
! /*  $Revision: 1.12.2.1 $
  **
  ** Provide a command line interface to the storage manager
  */
***************
*** 26,31 ****
--- 26,32 ----
      BOOL                Overview = FALSE;
      BOOL                Rawformat = FALSE;
      BOOL		val;
+     BOOL		notinitialized = TRUE;
      int                 i;
      char                *p;
      QIOSTATE            *qp;
***************
*** 91,101 ****
  		exit(1);
  	    }
  	}
- 	if (!SMinit()) {
- 	    if (!Quiet)
- 		fprintf(stderr, "Could not initialize the storage manager: %s", SMerrorstr);
- 	    exit(1);
- 	}
      }
      
      for (i = optind; i < argc; i++) {
--- 92,97 ----
***************
*** 105,110 ****
--- 101,114 ----
  		    fprintf(stderr, "%s is not a storage token\n", argv[i]);
  		continue;
  	    }
+ 	    if (notinitialized) {
+ 		if (!SMinit()) {
+ 		    if (!Quiet)
+ 			fprintf(stderr, "Could not initialize the storage manager: %s", SMerrorstr);
+ 		    exit(1);
+ 		}
+ 		notinitialized = FALSE;
+ 	    }
  	    if (!SMcancel(TextToToken(argv[i]))) {
  		if (!Quiet)
  		    fprintf(stderr, "Could not remove %s: %s\n", argv[i], SMerrorstr);
***************
*** 115,120 ****
--- 119,132 ----
  		    fprintf(stderr, "%s is not a storage token\n", argv[i]);
  		continue;
  	    }
+ 	    if (notinitialized) {
+ 		if (!SMinit()) {
+ 		    if (!Quiet)
+ 			fprintf(stderr, "Could not initialize the storage manager: %s", SMerrorstr);
+ 		    exit(1);
+ 		}
+ 		notinitialized = FALSE;
+ 	    }
  	    token = TextToToken(argv[i]);
  	    if ((p = OVERretrieve(&token, &linelen)) == (char *)NULL) {
  		if (!Quiet)
***************
*** 135,140 ****
--- 147,160 ----
  		    continue;
  		}
  		token = TextToToken(argv[i]);
+ 		if (notinitialized) {
+ 		    if (!SMinit()) {
+ 			if (!Quiet)
+ 			     fprintf(stderr, "Could not initialize the storage manager: %s", SMerrorstr);
+ 			exit(1);
+ 		    }
+ 		    notinitialized = FALSE;
+ 		}
  		if ((art = SMretrieve(token, RETR_ALL)) == NULL) {
  		    if (!Quiet)
  			fprintf(stderr, "Could not retrieve %s\n", argv[i]);
***************
*** 147,152 ****
--- 167,182 ----
  		}
  		SMfreearticle(art);
  	    } else {
+ 		if (IsToken(argv[i])) {
+ 		    if (notinitialized) {
+ 			if (!SMinit()) {
+ 			    if (!Quiet)
+ 				fprintf(stderr, "Could not initialize the storage manager: %s", SMerrorstr);
+ 			    exit(1);
+ 			}
+ 			notinitialized = FALSE;
+ 		    }
+ 		}
  		if ((qp = QIOopen(argv[i])) == NULL) {
  		    if (!Quiet)
  			fprintf(stderr, "Could not open %s\n", argv[i]);
diff -Nacr inn-2.2.1/include/innversion.h inn-2.2.2/include/innversion.h
*** inn-2.2.1/include/innversion.h	Thu Jan  1 00:00:00 1970
--- inn-2.2.2/include/innversion.h	Mon Dec 13 13:18:37 1999
***************
*** 0 ****
--- 1,28 ----
+ /*
+  * $Revision: 1.1.2.2 $
+  */
+ 
+ 
+ /*
+ **  If you make local modifications to INN, change this line as needed:
+ */
+ #define LOCAL_STRING	""
+ 
+ 
+ /*
+ **  Try to avoid changing these.
+ */
+ #define RELEASE "2"
+ #define PATCHLEVEL "2.2"
+ #define DATE "13-Dec-1999"
+ #define RELEASE "2"
+ #define PATCHLEVEL "2.2"
+ #define SUB_PATCHLEVEL_C 1
+ 
+ 
+ /*
+ **  See lib/innvers.c, but the version string should look like this:
+ **	INN ${RELEASE}.${PATCHLEVEL} ${DATE} (${LOCAL_STRING})
+ **  for example:
+ **	INN 1.0 10-Feb-92 (FOO.COM)
+ */
diff -Nacr inn-2.2.1/include/libinn.h inn-2.2.2/include/libinn.h
*** inn-2.2.1/include/libinn.h	Sat Nov  7 03:00:25 1998
--- inn-2.2.2/include/libinn.h	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.47.2.1 $
  **
  **  Here be declarations of functions in the InterNetNews library.
  */
--- 1,4 ----
! /*  $Revision: 1.47.2.2 $
  **
  **  Here be declarations of functions in the InterNetNews library.
  */
***************
*** 11,18 ****
      /* Worst-case alignment, in order to shut lint up. */
      /* =()<typedef @<ALIGNPTR>@	*ALIGNPTR;>()= */
  typedef long	*ALIGNPTR;
! extern ALIGNPTR	xmalloc(unsigned int i);
! extern ALIGNPTR	xrealloc(char *p, unsigned int i);
  
  /* Headers. */
  extern char	        *GenerateMessageID(void);
--- 11,18 ----
      /* Worst-case alignment, in order to shut lint up. */
      /* =()<typedef @<ALIGNPTR>@	*ALIGNPTR;>()= */
  typedef long	*ALIGNPTR;
! extern ALIGNPTR	xmalloc(unsigned int i, const char *file, int line);
! extern ALIGNPTR	xrealloc(char *p, unsigned int i, const char *file, int line);
  
  /* Headers. */
  extern char	        *GenerateMessageID(void);
diff -Nacr inn-2.2.1/include/macros.h inn-2.2.2/include/macros.h
*** inn-2.2.1/include/macros.h	Thu May 21 04:07:15 1998
--- inn-2.2.2/include/macros.h	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.3 $
  **
  **  Here be some useful macros.
  */
--- 1,4 ----
! /*  $Revision: 1.3.4.1 $
  **
  **  Here be some useful macros.
  */
***************
*** 24,33 ****
  #if	!defined(NEW)
  
  #define NEW(T, c)			\
! 	((T *)xmalloc((unsigned int)(sizeof (T) * (c))))
  
  #define RENEW(p, T, c)			\
!         (p = (T *)xrealloc((char *)(p), (unsigned int)(sizeof (T) * (c))))
  
  /* =()<#define DISPOSE(p)		free((@<POINTER>@ *)p)>()= */
  #define DISPOSE(p)		free((void *)p)
--- 24,34 ----
  #if	!defined(NEW)
  
  #define NEW(T, c)			\
! 	((T *)xmalloc((unsigned int)(sizeof (T) * (c)), __FILE__, __LINE__))
  
  #define RENEW(p, T, c)			\
!         (p = (T *)xrealloc((char *)(p), (unsigned int)(sizeof (T) * (c)), \
!                            __FILE__, __LINE__))
  
  /* =()<#define DISPOSE(p)		free((@<POINTER>@ *)p)>()= */
  #define DISPOSE(p)		free((void *)p)
diff -Nacr inn-2.2.1/include/patchlevel.h inn-2.2.2/include/patchlevel.h
*** inn-2.2.1/include/patchlevel.h	Wed Aug 25 16:02:10 1999
--- inn-2.2.2/include/patchlevel.h	Thu Jan  1 00:00:00 1970
***************
*** 1,28 ****
- /*
-  * $Revision: 1.6.2.4 $
-  */
- 
- 
- /*
- **  If you make local modifications to INN, change this line as needed:
- */
- #define LOCAL_STRING	""
- 
- 
- /*
- **  Try to avoid changing these.
- */
- #define RELEASE "2"
- #define PATCHLEVEL "2.1"
- #define DATE "25-Aug-1999"
- #define RELEASE_C 2
- #define PATCHLEVEL_C 2
- #define SUB_PATCHLEVEL_C 1
- 
- 
- /*
- **  See lib/innvers.c, but the version string should look like this:
- **	INN ${RELEASE}.${PATCHLEVEL} ${DATE} (${LOCAL_STRING})
- **  for example:
- **	INN 1.0 10-Feb-92 (FOO.COM)
- */
--- 0 ----
diff -Nacr inn-2.2.1/include/ppport.h inn-2.2.2/include/ppport.h
*** inn-2.2.1/include/ppport.h	Thu Jan  1 00:00:00 1970
--- inn-2.2.2/include/ppport.h	Mon Dec 13 13:18:37 1999
***************
*** 0 ****
--- 1,236 ----
+ 
+ #ifndef _P_P_PORTABILITY_H_
+ #define _P_P_PORTABILITY_H_
+ 
+ /* Perl/Pollution/Portability Version 1.0003 */
+ 
+ /* Copyright (C) 1999, Kenneth Albanowski. This code may be used and
+    distributed under the same license as any version of Perl. */
+    
+ /* For the latest version of this code, please contact the author at
+    <kjahds@kjahds.com>, or check with the Perl maintainers. */
+    
+ /* If you needed to customize this file for your project, please mention
+    your changes. */
+ 
+ 
+ /*
+    In order for a Perl extension module to be as portable as possible
+    across differing versions of Perl itself, certain steps need to be taken.
+    Including this header is the first major one, then using dTHR is all the
+    appropriate places and using a PL_ prefix to refer to global Perl
+    variables is the second.
+ */
+ 
+ 
+ /* If you use one of a few functions that were not present in earlier
+    versions of Perl, please add a define before the inclusion of ppport.h
+    for a static include, or use the GLOBAL request in a single module to
+    produce a global definition that can be referenced from the other
+    modules.
+    
+    Function:            Static define:           Extern define:
+    newCONSTSUB()        NEED_newCONSTSUB         NEED_newCONSTSUB_GLOBAL
+ 
+ */
+  
+ 
+ /* To verify whether ppport.h is needed for your module, and whether any
+    special defines should be used, ppport.h can be run through Perl to check
+    your source code. Simply say:
+    
+    	perl -x ppport.h *.c *.h *.xs foo/perl.c [etc]
+    
+    The result will be a list of patches suggesting changes that should at
+    least be acceptable, if not necessarily the most efficient solution, or a
+    fix for all possible problems. It won't catch where dTHR is needed, and
+    doesn't attempt to account for global macro or function definitions,
+    nested includes, typemaps, etc.
+    
+    In order to test for the need of dTHR, please try your module under a
+    recent version of Perl that has threading compiled-in.
+  
+ */ 
+ 
+ 
+ /*
+ #!/usr/bin/perl
+ @ARGV = ("*.xs") if !@ARGV;
+ %badmacros = %funcs = %macros = ();
+ foreach (<DATA>) {
+ 	$funcs{$1} = 1 if /Provide:\s+(\S+)/;
+ 	$macros{$1} = 1 if /^#\s*define\s+([a-zA-Z0-9_]+)/;
+ 	$badmacros{$2}=$1 if /^#\s*define\s+(PL_\S+)\s+(\S+)/;
+ }
+ foreach $filename (map(glob($_),@ARGV)) {
+ 	unless (open(IN, "<$filename")) {
+ 		warn "Unable to read from $file: $!\n";
+ 		next;
+ 	}
+ 	print "Scanning $filename...\n";
+ 	$c = ""; while (<IN>) { $c .= $_; } close(IN);
+ 	$need_include = 0; %add_func = (); $changes = 0;
+ 	$has_include = ($c =~ /#.*include.*ppport/m);
+ 
+ 	foreach $func (keys %funcs) {
+ 		if ($c =~ /#.*define.*\bNEED_$func(_GLOBAL)?\b/m) {
+ 			if ($c !~ /\b$func\b/m) {
+ 				print "If $func isn't needed, you don't need to request it.\n" if
+ 				$changes += ($c =~ s/^.*#.*define.*\bNEED_$func\b.*\n//m);
+ 			} else {
+ 				print "Uses $func\n";
+ 				$need_include = 1;
+ 			}
+ 		} else {
+ 			if ($c =~ /\b$func\b/m) {
+ 				$add_func{$func} =1 ;
+ 				print "Uses $func\n";
+ 				$need_include = 1;
+ 			}
+ 		}
+ 	}
+ 
+ 	if (not $need_include) {
+ 		foreach $macro (keys %macros) {
+ 			if ($c =~ /\b$macro\b/m) {
+ 				print "Uses $macro\n";
+ 				$need_include = 1;
+ 			}
+ 		}
+ 	}
+ 
+ 	foreach $badmacro (keys %badmacros) {
+ 		if ($c =~ /\b$badmacro\b/m) {
+ 			$changes += ($c =~ s/\b$badmacro\b/$badmacros{$badmacro}/gm);
+ 			print "Uses $badmacros{$badmacro} (instead of $badmacro)\n";
+ 			$need_include = 1;
+ 		}
+ 	}
+ 	
+ 	if (scalar(keys %add_func) or $need_include != $has_include) {
+ 		if (!$has_include) {
+ 			$inc = join('',map("#define NEED_$_\n", sort keys %add_func)).
+ 			       "#include \"ppport.h\"\n";
+ 			$c = "$inc$c" unless $c =~ s/#.*include.*XSUB.*\n/$&$inc/m;
+ 		} elsif (keys %add_func) {
+ 			$inc = join('',map("#define NEED_$_\n", sort keys %add_func));
+ 			$c = "$inc$c" unless $c =~ s/^.*#.*include.*ppport.*$/$inc$&/m;
+ 		}
+ 		if (!$need_include) {
+ 			print "Doesn't seem to need ppport.h.\n";
+ 			$c =~ s/^.*#.*include.*ppport.*\n//m;
+ 		}
+ 		$changes++;
+ 	}
+ 	
+ 	if ($changes) {
+ 		open(OUT,">/tmp/ppport.h.$$");
+ 		print OUT $c;
+ 		close(OUT);
+ 		open(DIFF, "diff -u $filename /tmp/ppport.h.$$|");
+ 		while (<DIFF>) { s!/tmp/ppport\.h\.$$!$filename.patched!; print STDOUT; }
+ 		close(DIFF);
+ 		unlink("/tmp/ppport.h.$$");
+ 	} else {
+ 		print "Looks OK\n";
+ 	}
+ }
+ __DATA__
+ */
+ 
+ 
+ #ifndef PERL_PATCHLEVEL
+ #	ifndef __PATCHLEVEL_H_INCLUDED__
+ #		include <patchlevel.h>
+ #	endif
+ #endif
+ #ifndef PERL_PATCHLEVEL
+ #	define PERL_PATCHLEVEL PATCHLEVEL
+ #	define PERL_SUBVERSION SUBVERSION
+ #endif
+ 
+ #ifndef ERRSV
+ #	define ERRSV perl_get_sv("@",FALSE)
+ #endif
+ 
+ #if (PERL_PATCHLEVEL < 4) || ((PERL_PATCHLEVEL == 4) && (PERL_SUBVERSION <= 4))
+ #	define PL_sv_undef	sv_undef
+ #	define PL_sv_yes	sv_yes
+ #	define PL_sv_no		sv_no
+ #	define PL_na		na
+ #	define PL_stdingv	stdingv
+ #	define PL_hints		hints
+ #	define PL_curcop	curcop
+ #	define PL_curstash	curstash
+ #	define PL_copline	copline
+ #endif
+ 
+ #if (PERL_PATCHLEVEL < 5)
+ #  ifdef WIN32
+ #	define dTHR extern int Perl___notused
+ #  else
+ #	define dTHR extern int errno
+ #  endif
+ #endif
+ 
+ #ifndef boolSV
+ #	define boolSV(b) ((b) ? &PL_sv_yes : &PL_sv_no)
+ #endif
+ 
+ 
+ 
+ /* Provide: newCONSTSUB */
+ 
+ /* newCONSTSUB from IO.xs is in the core starting with 5.004_63 */
+ #if (PATCHLEVEL < 4) || ((PATCHLEVEL == 4) && (SUBVERSION < 63))
+ 
+ /* Prototype */
+ #if !defined(NEED_newCONSTSUB_GLOBAL)
+ static
+ #endif
+ void newCONSTSUB _((HV * stash, char * name, SV *sv));
+ 
+ /* Warning */
+ #if !defined(NEED_newCONSTSUB) && !defined(NEED_newCONSTSUB_GLOBAL)
+ #define newCONSTSUB Please_define_NEED_newCONSTSUB
+ #endif
+ 
+ /* Definition */
+ #if defined(NEED_newCONSTSUB)
+ static
+ #endif
+ #if defined(NEED_newCONSTSUB) || defined(NEED_newCONSTSUB_GLOBAL)
+ void
+ newCONSTSUB(stash,name,sv)
+ HV *stash;
+ char *name;
+ SV *sv;
+ {
+ 	U32 oldhints = PL_hints;
+ 	HV *old_cop_stash = PL_curcop->cop_stash;
+ 	HV *old_curstash = PL_curstash;
+ 	line_t oldline = PL_curcop->cop_line;
+ 	PL_curcop->cop_line = PL_copline;
+ 
+ 	PL_hints &= ~HINT_BLOCK_SCOPE;
+ 	if (stash)
+ 		PL_curstash = PL_curcop->cop_stash = stash;
+ 
+ 	newSUB(
+ 		start_subparse(FALSE, 0),
+ 		newSVOP(OP_CONST, 0, newSVpv(name,0)),
+ 		newSVOP(OP_CONST, 0, &PL_sv_no),   /* SvPV(&PL_sv_no) == "" -- GMB */
+ 		newSTATEOP(0, Nullch, newSVOP(OP_CONST, 0, sv))
+ 	);
+ 
+ 	PL_hints = oldhints;
+ 	PL_curcop->cop_stash = old_cop_stash;
+ 	PL_curstash = old_curstash;
+ 	PL_curcop->cop_line = oldline;
+ }
+ #endif
+ 
+ #endif /* newCONSTSUB */
+ 
+ 
+ #endif /* _P_P_PORTABILITY_H_ */
diff -Nacr inn-2.2.1/innd/art.c inn-2.2.2/innd/art.c
*** inn-2.2.1/innd/art.c	Sun Aug  8 21:56:53 1999
--- inn-2.2.2/innd/art.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Id: art.c,v 1.90.2.9 1999/08/08 21:56:53 kondou Exp $
  **
  **  Article-processing.
  */
--- 1,4 ----
! /*  $Id: art.c,v 1.90.2.15 1999/11/19 01:30:39 kondou Exp $
  **
  **  Article-processing.
  */
***************
*** 823,828 ****
--- 823,832 ----
  	return in;
      }
  
+     /* Skip the Bytes header */
+     if (hp == &ARTheaders[_bytes])
+ 	return in;
+ 
      if (hp->Type == HTsav) {
  	*deltap = 0;
      }
***************
*** 1552,1569 ****
      NEWSGROUP	*ngp;
      int	        i, len;
      char        xrefbuf[MAXHEADERSIZE*2];
  
      if (!ARTheaders[_xref].Found)
      	return FALSE;
!     if ((name = strchr(HDR(_xref), ' ')) == NULL)
      	return FALSE;
      while ( *++name == ' ' );
      if ( *name == '\0' )
      	return FALSE;
  
      p = xrefbuf;
!     strncpy(p, Path.Data, Path.Used - 1);
!     p += Path.Used - 1;
      
      for (i = 0; *name; name = next) {
  	/* Mark end of this entry and where next one starts. */
--- 1556,1574 ----
      NEWSGROUP	*ngp;
      int	        i, len;
      char        xrefbuf[MAXHEADERSIZE*2];
+     BOOL	nogroup = TRUE;
  
      if (!ARTheaders[_xref].Found)
      	return FALSE;
!     if ((q = name = strchr(HDR(_xref), ' ')) == NULL)
      	return FALSE;
      while ( *++name == ' ' );
      if ( *name == '\0' )
      	return FALSE;
  
      p = xrefbuf;
!     strncpy(p, HDR(_xref), q - HDR(_xref));
!     p += q - HDR(_xref);
      
      for (i = 0; *name; name = next) {
  	/* Mark end of this entry and where next one starts. */
***************
*** 1607,1615 ****
  	sprintf(p, " %s:%ld", name, ngp->Filenum);
  	len = strlen(p);
  	p += len;
! 	
      }
!     
      ARTheaders[_xref].Length = strlen(xrefbuf);
      strcpy(HDR(_xref), xrefbuf);
      return TRUE;
--- 1612,1621 ----
  	sprintf(p, " %s:%ld", name, ngp->Filenum);
  	len = strlen(p);
  	p += len;
! 	nogroup = FALSE;
      }
!     if (nogroup)
! 	return FALSE;
      ARTheaders[_xref].Length = strlen(xrefbuf);
      strcpy(HDR(_xref), xrefbuf);
      return TRUE;
***************
*** 1625,1631 ****
      char	        c;
  
      for (c = *p; (q = *list) != NULL; list++)
! 	if (c == *q && caseEQ(p, q))
  	    return TRUE;
      return FALSE;
  }
--- 1631,1637 ----
      char	        c;
  
      for (c = *p; (q = *list) != NULL; list++)
! 	if (caseEQ(p, q))
  	    return TRUE;
      return FALSE;
  }
***************
*** 2286,2291 ****
--- 2292,2311 ----
      p = HDR(_distribution);
      distributions = *p ? CommaSplit(p) : NULL;
      if (distributions) {
+       if (*distributions[0] == '\0') {
+ 	(void)sprintf(buff, "%d bogus distribution \"%s\"",
+ 		NNTP_REJECTIT_VAL,
+ 		MaxLength(p, p));
+ 	ARTlog(&Data, ART_REJECT, buff);
+ #if	defined(DO_REMEMBER_TRASH)
+         if (Mode == OMrunning && !HISwrite(&Data, ""))
+             syslog(L_ERROR, "%s cant write history %s %m",
+                    LogName, Data.MessageID);
+ #endif	/* defined(DO_REMEMBER_TRASH) */
+ 	DISPOSE(distributions);
+ 	ARTreject(buff, article);
+ 	return buff;
+       } else {
  	DISTparse(distributions, &Data);
  	if (ME.Distributions
  	 && !DISTwantany(ME.Distributions, distributions)) {
***************
*** 2301,2306 ****
--- 2321,2327 ----
  	    ARTreject(REJECT_DISTRIB, cp, buff, article);
  	    return buff;
  	}
+       }
      }
      else {
  	Data.Distribution = "?";
***************
*** 2691,2698 ****
  
      /* We wrote the history, so modify it and save it for output. */
      if (innconf->storageapi) {
! 	Data.Replic = HDR(_xref) + Path.Used;
! 	Data.ReplicLength = ARTheaders[_xref].Length - Path.Used;
      } else {
  	for (Data.Replic = Files.Data, p = (char *)Data.Replic; *p; p++)
  	    if (*p == ' ')
--- 2712,2729 ----
  
      /* We wrote the history, so modify it and save it for output. */
      if (innconf->storageapi) {
! 	if (innconf->xrefslave) {
! 	    if ((p = memchr(HDR(_xref), ' ', ARTheaders[_xref].Length)) == NULL) {
! 		Data.Replic = HDR(_xref);
! 		Data.ReplicLength = 0;
! 	    } else {
! 		Data.Replic = p + 1;
! 		Data.ReplicLength = ARTheaders[_xref].Length - (p + 1 - HDR(_xref));
! 	    }
! 	} else {
! 	    Data.Replic = HDR(_xref) + Path.Used;
! 	    Data.ReplicLength = ARTheaders[_xref].Length - Path.Used;
! 	}
      } else {
  	for (Data.Replic = Files.Data, p = (char *)Data.Replic; *p; p++)
  	    if (*p == ' ')
diff -Nacr inn-2.2.1/innd/cc.c inn-2.2.2/innd/cc.c
*** inn-2.2.1/innd/cc.c	Thu Jul  8 21:18:34 1999
--- inn-2.2.2/innd/cc.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Id: cc.c,v 1.47.2.6 1999/07/08 21:18:34 kondou Exp $
  **
  **  Routines for the control channel.  Create a Unix-domain datagram socket
  **  that processes on the local server send messages to.  The control
--- 1,4 ----
! /*  $Id: cc.c,v 1.47.2.8 1999/09/25 22:42:26 rra Exp $
  **
  **  Routines for the control channel.  Create a Unix-domain datagram socket
  **  that processes on the local server send messages to.  The control
***************
*** 632,643 ****
  #include <EXTERN.h>
  #include <perl.h>
  #include <XSUB.h>
! 
! /* Perl 5.004 didn't define ERRSV and PL_na was called na. */
! #ifndef ERRSV
! # define ERRSV GvSV(errgv)
! # define PL_na na
! #endif
  
  extern CV *perl_filter_cv ;
  
--- 632,638 ----
  #include <EXTERN.h>
  #include <perl.h>
  #include <XSUB.h>
! #include "ppport.h"
  
  extern CV *perl_filter_cv ;
  
***************
*** 2051,2061 ****
  
  #if defined(DO_PERL)
  
- #include "EXTERN.h"
- #include "perl.h"
- #include "XSUB.h"
- 
- 
  XS(XS_INN_havehist)
  {
      dXSARGS;
--- 2046,2051 ----
***************
*** 2064,2070 ****
      if (items != 1)
          croak("Usage: INN::havehist(msgid)");
  
!     msgid = (char *)SvPV(ST(0),na);
      if (HIShavearticle(HashMessageID(msgid)))
  	XSRETURN_YES;
      else
--- 2054,2060 ----
      if (items != 1)
          croak("Usage: INN::havehist(msgid)");
  
!     msgid = (char *)SvPV(ST(0),PL_na);
      if (HIShavearticle(HashMessageID(msgid)))
  	XSRETURN_YES;
      else
***************
*** 2080,2086 ****
      if (items != 1)
          croak("Usage: INN::cancel(msgid)");
  
!     msgid = (char *)SvPV(ST(0),na);
      parambuf[0]=msgid;
      parambuf[1]= 0;
      /* CCcancel returns NULL on success, hence reversed return codes */
--- 2070,2076 ----
      if (items != 1)
          croak("Usage: INN::cancel(msgid)");
  
!     msgid = (char *)SvPV(ST(0),PL_na);
      parambuf[0]=msgid;
      parambuf[1]= 0;
      /* CCcancel returns NULL on success, hence reversed return codes */
***************
*** 2106,2112 ****
  
  
      /* we will always have a message id */
!     msgid = (char *)SvPV(ST(0),na);
  
      /* set up sensible defaults for the time values */
      sprintf(tbuff, "%d",time((long *)0));
--- 2096,2102 ----
  
  
      /* we will always have a message id */
!     msgid = (char *)SvPV(ST(0),PL_na);
  
      /* set up sensible defaults for the time values */
      sprintf(tbuff, "%d",time((long *)0));
***************
*** 2114,2137 ****
  
      switch (items) {
      case 2:
! 	arrivaltime = (char *)SvPV(ST(1),na);
  	articletime = expiretime = arrivaltime;
  	break;
      case 3: 
! 	arrivaltime = (char *)SvPV(ST(1),na);
! 	articletime = (char *)SvPV(ST(2),na);
  	expiretime = arrivaltime;
  	break;
      case 4:
! 	arrivaltime = (char *)SvPV(ST(1),na);
! 	articletime = (char *)SvPV(ST(2),na);
! 	expiretime =  (char *)SvPV(ST(3),na);
  	break;
      case 5:
! 	arrivaltime = (char *)SvPV(ST(1),na);
! 	articletime = (char *)SvPV(ST(2),na);
! 	expiretime =  (char *)SvPV(ST(3),na);
! 	articlepaths =  (char *)SvPV(ST(4),na);
  	break;
      }
      parambuf[0] = msgid;
--- 2104,2127 ----
  
      switch (items) {
      case 2:
! 	arrivaltime = (char *)SvPV(ST(1),PL_na);
  	articletime = expiretime = arrivaltime;
  	break;
      case 3: 
! 	arrivaltime = (char *)SvPV(ST(1),PL_na);
! 	articletime = (char *)SvPV(ST(2),PL_na);
  	expiretime = arrivaltime;
  	break;
      case 4:
! 	arrivaltime = (char *)SvPV(ST(1),PL_na);
! 	articletime = (char *)SvPV(ST(2),PL_na);
! 	expiretime =  (char *)SvPV(ST(3),PL_na);
  	break;
      case 5:
! 	arrivaltime = (char *)SvPV(ST(1),PL_na);
! 	articletime = (char *)SvPV(ST(2),PL_na);
! 	expiretime =  (char *)SvPV(ST(3),PL_na);
! 	articlepaths =  (char *)SvPV(ST(4),PL_na);
  	break;
      }
      parambuf[0] = msgid;
***************
*** 2159,2165 ****
  
      if (items != 1)
          croak("Usage: INN::newsgroup(msgid)");
!     newsgroup = (char *)SvPV(ST(0),na);
  
      if ((ngp = NGfind(newsgroup)) == NULL)
  	XSRETURN_UNDEF;
--- 2149,2155 ----
  
      if (items != 1)
          croak("Usage: INN::newsgroup(msgid)");
!     newsgroup = (char *)SvPV(ST(0),PL_na);
  
      if ((ngp = NGfind(newsgroup)) == NULL)
  	XSRETURN_UNDEF;
***************
*** 2196,2202 ****
      if (items != 1)
          croak("Usage: INN::filesfor(msgid)");
  
!     msgid = (char *)SvPV(ST(0),na);
      files = HISfilesfor(HashMessageID(msgid));
      if (files) {
          XSRETURN_PV(files);
--- 2186,2192 ----
      if (items != 1)
          croak("Usage: INN::filesfor(msgid)");
  
!     msgid = (char *)SvPV(ST(0),PL_na);
      files = HISfilesfor(HashMessageID(msgid));
      if (files) {
          XSRETURN_PV(files);
diff -Nacr inn-2.2.1/innd/chan.c inn-2.2.2/innd/chan.c
*** inn-2.2.1/innd/chan.c	Wed Nov 11 22:56:12 1998
--- inn-2.2.2/innd/chan.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Id: chan.c,v 1.32.2.1 1998/11/11 22:56:12 kondou Exp $
  **
  **  I/O channel (and buffer) processing.
  */
--- 1,4 ----
! /*  $Id: chan.c,v 1.32.2.4 1999/09/27 07:49:17 kondou Exp $
  **
  **  I/O channel (and buffer) processing.
  */
***************
*** 252,257 ****
--- 252,259 ----
  */
  void CHANclose(CHANNEL *cp, char *name)
  {
+     char	*label, *tmplabel;
+ 
      if (cp->Type == CTfree)
  	syslog(L_ERROR, "%s internal closing free channel %d", name, cp->fd);
      else {
***************
*** 282,295 ****
  	    CHANNEL *tempchan;
  
  	    cp->fd = -1;
! 	    for(tfd = 0; tfd < CHANlastfd; tfd++) {
! 		tempchan = &CHANtable[tfd];
! 		if(tempchan->fd > 0 &&
! 		    cp->Address.s_addr == tempchan->Address.s_addr) {
! 		    if(tempchan->ActiveCnx == 0) {
! 			tempchan->ActiveCnx = cp->ActiveCnx;
! 			RCHANadd(tempchan);
! 		        break;
  		    }
  		}
  	    }
--- 284,299 ----
  	    CHANNEL *tempchan;
  
  	    cp->fd = -1;
! 	    if ((label = RClabelname(cp)) != NULL) {
! 		for(tfd = 0; tfd <= CHANlastfd; tfd++) {
! 		    tempchan = &CHANtable[tfd];
! 		    if(tempchan->fd > 0 &&
! 			((tmplabel = RClabelname(tempchan)) != NULL) &&
! 			strcmp(label, tmplabel) == 0 &&
! 			tempchan->ActiveCnx == 0) {
! 			    tempchan->ActiveCnx = cp->ActiveCnx;
! 			    RCHANadd(tempchan);
! 			    break;
  		    }
  		}
  	    }
***************
*** 301,315 ****
--- 305,322 ----
      cp->State = CSerror;
      cp->fd = -1;
      cp->Argument = NULL;
+     cp->ActiveCnx = 0;
  
      /* Free the buffers if they got big. */
      if (cp->In.Size > BIG_BUFFER) {
  	cp->In.Size = 0;
  	DISPOSE(cp->In.Data);
+ 	cp->In.Data = NULL; /* avoid spurious free()s of already freed data in CHANshutdown */
      }
      if (cp->Out.Size > BIG_BUFFER) {
  	cp->Out.Size = 0;
  	DISPOSE(cp->Out.Data);
+ 	cp->Out.Data = NULL; /* ditto */
      }
      if (cp->Sendid.Size) {
  	cp->Sendid.Size = 0;
***************
*** 767,772 ****
--- 774,802 ----
  }
  #endif	/* defined(INND_FIND_BAD_FDS) */
  
+ void CHANsetActiveCnx(CHANNEL *cp) {
+     int		found;  
+     CHANNEL	*tempchan;
+     char	*label, *tmplabel;
+     int		tfd;
+     
+     if((cp->fd > 0) && (cp->Type == CTnntp) && (cp->ActiveCnx == 0)) {
+ 	found = 1;      
+ 	if ((label = RClabelname(cp)) != NULL) {
+ 	    for(tfd = 0; tfd <= CHANlastfd; tfd++) {
+ 		tempchan = &CHANtable[tfd];
+ 		if ((tmplabel = RClabelname(tempchan)) == NULL) {
+ 		    continue;
+ 		}
+ 		if(strcmp(label, tmplabel) == 0) {
+ 		    if(tempchan->ActiveCnx != 0)
+ 			found++;
+ 		}
+ 	    }
+ 	} 
+ 	cp->ActiveCnx = found;
+     }   
+ }
  
  /*
  **  Main I/O loop.  Wait for data, call the channel's handler when there is
***************
*** 795,801 ****
      time_t		LastUpdate;
      CHANNEL             *tempchan;
      int                 found;
!     int                 tfd;
  
      TMRinit();
      STATUSinit();
--- 825,831 ----
      time_t		LastUpdate;
      CHANNEL             *tempchan;
      int                 found;
!     char		*label, *tmplabel;
  
      TMRinit();
      STATUSinit();
***************
*** 885,904 ****
  	    cp = &CHANtable[fd];
  
              if (cp->MaxCnx > 0) {
!                 if((cp->fd > 0) &&
!                    (cp->Type == CTnntp) &&
!                    (cp->ActiveCnx == 0)) {
!                     found = 1;
!                     for(tfd = 0; tfd < CHANlastfd; tfd++) {
!                        tempchan = &CHANtable[tfd];
!                        if(cp->Address.s_addr == tempchan->Address.s_addr) {
!                           if(tempchan->ActiveCnx == found)
!                             found++;
!                        }
!                     }
!                     cp->ActiveCnx = found;
! 		}
! 
                  if((cp->ActiveCnx > cp->MaxCnx) && (cp->fd > 0)) {
  		    if(cp->Started + (PAUSE_BEFORE_DROP * 60) < Now.time) {
                          CHANclose(cp, CHANname(cp));
--- 915,921 ----
  	    cp = &CHANtable[fd];
  
              if (cp->MaxCnx > 0) {
! 		CHANsetActiveCnx(cp);
                  if((cp->ActiveCnx > cp->MaxCnx) && (cp->fd > 0)) {
  		    if(cp->Started + (PAUSE_BEFORE_DROP * 60) < Now.time) {
                          CHANclose(cp, CHANname(cp));
diff -Nacr inn-2.2.1/innd/innd.h inn-2.2.2/innd/innd.h
*** inn-2.2.1/innd/innd.h	Tue Mar  2 03:10:48 1999
--- inn-2.2.2/innd/innd.h	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.44.2.1 $
  **
  **  Many of the data types used here have abbreviations, such as CT
  **  for CHANNELTYPE.  Here are a list of the conventions and meanings:
--- 1,4 ----
! /*  $Revision: 1.44.2.3 $
  **
  **  Many of the data types used here have abbreviations, such as CT
  **  for CHANNELTYPE.  Here are a list of the conventions and meanings:
***************
*** 147,153 ****
      u_long		Unwanted_g;
      u_long		Unwanted_u;
      u_long		Unwanted_o;
!     u_long		Size;
      u_long		Check;
      u_long		Check_send;
      u_long		Check_deferred;
--- 147,153 ----
      u_long		Unwanted_g;
      u_long		Unwanted_u;
      u_long		Unwanted_o;
!     float		Size;
      u_long		Check;
      u_long		Check_send;
      u_long		Check_deferred;
***************
*** 561,566 ****
--- 561,567 ----
  extern BOOL		RCauthorized();
  extern int		RCcanpost();
  extern char		*RChostname();
+ extern char		*RClabelname(CHANNEL *cp);
  extern void		RCclose();
  extern void		RChandoff();
  extern void		RCreadlist();
diff -Nacr inn-2.2.1/innd/inndstart.c inn-2.2.2/innd/inndstart.c
*** inn-2.2.1/innd/inndstart.c	Mon May 31 03:30:41 1999
--- inn-2.2.2/innd/inndstart.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Id: inndstart.c,v 1.16.2.2 1999/05/31 03:30:41 kondou Exp $
  **
  **  Open the privileged port, then exec innd.
  */
--- 1,4 ----
! /*  $Id: inndstart.c,v 1.16.2.3 1999/09/07 09:42:26 rra Exp $
  **
  **  Open the privileged port, then exec innd.
  */
***************
*** 67,73 ****
      char		*p;
      char		pflag[SMBUF];
      char		buff[BUFSIZ];
!     STRING		env[8];
      struct stat		Sb;
      char		*inndpath;
      struct passwd	*pwd;
--- 67,73 ----
      char		*p;
      char		pflag[SMBUF];
      char		buff[BUFSIZ];
!     char *		env[8];
      struct stat		Sb;
      char		*inndpath;
      struct passwd	*pwd;
***************
*** 201,231 ****
      if (getuid() != NewsUID)
  	syslog(L_ERROR, "inndstart cant setuid to %d %m", NewsUID);
  
!     /* Set up the environment. */
!     (void)sprintf(buff, "PATH=%s:%s:/bin:/usr/bin:/usr/ucb",
! 	    innconf->pathbin, innconf->pathetc);
!     env[0] = COPY(buff);
!     (void)sprintf(buff, "TMPDIR=%s", innconf->pathtmp);
!     env[1] = COPY(buff);
!     (void)sprintf(buff, "SHELL=%s", _PATH_SH);
!     env[2] = COPY(buff);
!     (void)sprintf(buff, "LOGNAME=%s", NEWSMASTER);
!     env[3] = COPY(buff);
!     (void)sprintf(buff, "USER=%s", NEWSMASTER);
!     env[4] = COPY(buff);
!     (void)sprintf(buff, "HOME=%s", innconf->pathnews);
!     env[5] = COPY(buff);
      i = 6;
-     /* linux uglyness */
      if ((p = getenv("BIND_INADDR")) != NULL) {
! 		(void)sprintf(buff, "BIND_INADDR=%s", p);
! 		env[i++] = COPY(buff);
      }
      if ((p = getenv("TZ")) != NULL) {
! 	(void)sprintf(buff, "TZ=%s", p);
! 	env[i++] = COPY(buff);
      }
!     env[i++] = NULL;
  
      /* Go exec innd. */
      (void)execve(argv[0], (CSTRING *)argv, (CSTRING *)env);
--- 201,238 ----
      if (getuid() != NewsUID)
  	syslog(L_ERROR, "inndstart cant setuid to %d %m", NewsUID);
  
!     /* Set up the environment.  Note that we're trusting BIND_INADDR and TZ;
!        everything else is either from inn.conf or from configure.  These
!        should be sanity-checked before being propagated, but that requires
!        knowledge of the range of possible values.  Just limiting their
!        length doesn't necessarily do anything to prevent exploits and may
!        stop things from working that should.  */
!     env[0] = NEW(char, (5 + strlen(innconf->pathbin) + 1
!                         + strlen(innconf->pathetc) + 23 + 1));
!     sprintf(env[0], "PATH=%s:%s:/bin:/usr/bin:/usr/ucb",
!             innconf->pathbin, innconf->pathetc);
!     env[1] = NEW(char, 7 + strlen(innconf->pathtmp) + 1);
!     sprintf(env[1], "TMPDIR=%s", innconf->pathtmp);
!     env[2] = NEW(char, 6 + strlen(_PATH_SH) + 1);
!     sprintf(env[2], "SHELL=%s", _PATH_SH);
!     env[3] = NEW(char, 8 + strlen(NEWSMASTER) + 1);
!     sprintf(env[3], "LOGNAME=%s", NEWSMASTER);
!     env[4] = NEW(char, 5 + strlen(NEWSMASTER) + 1);
!     sprintf(env[4], "USER=%s", NEWSMASTER);
!     env[5] = NEW(char, 5 + strlen(innconf->pathnews) + 1);
!     sprintf(env[5], "HOME=%s", innconf->pathnews);
      i = 6;
      if ((p = getenv("BIND_INADDR")) != NULL) {
!         env[i] = NEW(char, 12 + strlen(p) + 1);
!         sprintf(env[i], "BIND_INADDR=%s", p);
!         i++;
      }
      if ((p = getenv("TZ")) != NULL) {
!         env[i] = NEW(char, 3 + strlen(p) + 1);
!         sprintf(env[i], "TZ=%s", p);
!         i++;
      }
!     env[i] = NULL;
  
      /* Go exec innd. */
      (void)execve(argv[0], (CSTRING *)argv, (CSTRING *)env);
diff -Nacr inn-2.2.1/innd/nc.c inn-2.2.2/innd/nc.c
*** inn-2.2.1/innd/nc.c	Fri Jun 11 03:19:34 1999
--- inn-2.2.2/innd/nc.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Id: nc.c,v 1.37.2.5 1999/06/11 03:19:34 kondou Exp $
  **
  **  Routines for the NNTP channel.  Other channels get the descriptors which
  **  we turn into NNTP channels, and over which we speak NNTP.
--- 1,4 ----
! /*  $Id: nc.c,v 1.37.2.7 1999/10/04 02:43:50 kondou Exp $
  **
  **  Routines for the NNTP channel.  Other channels get the descriptors which
  **  we turn into NNTP channels, and over which we speak NNTP.
***************
*** 964,970 ****
  		    cp->Argument = NULL;
  		}
  		i = cp->LargeArtSize + bp->Used;
! 		syslog(L_ERROR, "%s internal rejecting huge article (%d > %d)",
  		    CHANname(cp), i, innconf->maxartsize);
  		cp->LargeArtSize = 0;
  		(void)sprintf(buff, "%d Article exceeds local limit of %ld bytes",
--- 964,970 ----
  		    cp->Argument = NULL;
  		}
  		i = cp->LargeArtSize + bp->Used;
! 		syslog(L_NOTICE, "%s internal rejecting huge article (%d > %d)",
  		    CHANname(cp), i, innconf->maxartsize);
  		cp->LargeArtSize = 0;
  		(void)sprintf(buff, "%d Article exceeds local limit of %ld bytes",
***************
*** 1291,1297 ****
  
      cp->Check++;
      /* Snip off the Message-ID. */
!     for (p = cp->In.Data; !ISWHITE(*p); p++)
  	continue;
      for ( ; ISWHITE(*p); p++)
  	continue;
--- 1291,1297 ----
  
      cp->Check++;
      /* Snip off the Message-ID. */
!     for (p = cp->In.Data; *p && !ISWHITE(*p); p++)
  	continue;
      for ( ; ISWHITE(*p); p++)
  	continue;
diff -Nacr inn-2.2.1/innd/perl.c inn-2.2.2/innd/perl.c
*** inn-2.2.1/innd/perl.c	Fri Jun 25 05:52:45 1999
--- inn-2.2.2/innd/perl.c	Mon Dec 13 13:18:37 1999
***************
*** 3,15 ****
   * Author:      Christophe Wolfhugel <wolf@pasteur.fr>
   *		(although he wouldn't recognise it anymore so don't blame him)
   * File:        perl.c
!  * RCSId:       $Id: perl.c,v 1.7.2.2 1999/06/25 05:52:45 kondou Exp $
   * Description: perl support for innd.
   * 
   */
  
  #if ! defined (lint)
! static const char *rcsid = "$Id: perl.c,v 1.7.2.2 1999/06/25 05:52:45 kondou Exp $" ;
  static void use_rcsid (const char *rid) {   /* Never called */
    use_rcsid (rcsid) ; use_rcsid (rid) ;
  }
--- 3,15 ----
   * Author:      Christophe Wolfhugel <wolf@pasteur.fr>
   *		(although he wouldn't recognise it anymore so don't blame him)
   * File:        perl.c
!  * RCSId:       $Id: perl.c,v 1.7.2.4 1999/09/25 22:42:27 rra Exp $
   * Description: perl support for innd.
   * 
   */
  
  #if ! defined (lint)
! static const char *rcsid = "$Id: perl.c,v 1.7.2.4 1999/09/25 22:42:27 rra Exp $" ;
  static void use_rcsid (const char *rid) {   /* Never called */
    use_rcsid (rcsid) ; use_rcsid (rid) ;
  }
***************
*** 32,43 ****
  
  #include <EXTERN.h>
  #include <perl.h>
! 
! /* Perl 5.004 didn't define ERRSV and PL_na was called na. */
! #ifndef ERRSV
! # define ERRSV GvSV(errgv)
! # define PL_na na
! #endif
  
  extern BOOL		PerlFilterActive;
  extern ARTHEADER	ARTheaders[], *ARTheadersENDOF;
--- 32,38 ----
  
  #include <EXTERN.h>
  #include <perl.h>
! #include "ppport.h"
  
  extern BOOL		PerlFilterActive;
  extern ARTHEADER	ARTheaders[], *ARTheadersENDOF;
diff -Nacr inn-2.2.1/innd/rc.c inn-2.2.2/innd/rc.c
*** inn-2.2.1/innd/rc.c	Wed Jan 27 15:27:29 1999
--- inn-2.2.2/innd/rc.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Id: rc.c,v 1.31.2.3 1999/01/27 15:27:29 kondou Exp $
  **
  **  Routines for the remote connect channel.  Create an Internet stream socket
  **  that processes connect to.  If the incoming site is not one of our feeds,
--- 1,4 ----
! /*  $Id: rc.c,v 1.31.2.4 1999/09/13 11:08:50 kondou Exp $
  **
  **  Routines for the remote connect channel.  Create an Internet stream socket
  **  that processes connect to.  If the incoming site is not one of our feeds,
***************
*** 1221,1227 ****
          if (*p == '/')
  	   q = p + 1;
  
!     fprintf (F, "##  $Revision: 1.31.2.3 $\n");
      fprintf (F, "##  %s - names and addresses that feed us news\n", q);
      DISPOSE(r);
      fprintf (F, "##\n\n");
--- 1221,1227 ----
          if (*p == '/')
  	   q = p + 1;
  
!     fprintf (F, "##  $Revision: 1.31.2.4 $\n");
      fprintf (F, "##  %s - names and addresses that feed us news\n", q);
      DISPOSE(r);
      fprintf (F, "##\n\n");
***************
*** 1342,1347 ****
--- 1342,1360 ----
      return buff;
  }
  
+ /*
+ **  Find the label name of a remote host we've connected to.
+ */
+ char *
+ RClabelname(CHANNEL *cp) {
+     REMOTEHOST	*rp;
+     int		i;
+ 
+     for (rp = RCpeerlist, i = RCnpeerlist; --i >= 0; rp++)
+ 	if (cp->Address.s_addr == rp->Address.s_addr)
+ 	    return rp->Label;
+     return NULL;
+ }
  
  /*
  **  Is the remote site allowed to post to this group?
diff -Nacr inn-2.2.1/innd/status.c inn-2.2.2/innd/status.c
*** inn-2.2.1/innd/status.c	Sun Jun 20 21:56:36 1999
--- inn-2.2.2/innd/status.c	Mon Dec 13 13:18:37 1999
***************
*** 1,5 ****
  
! /* $Id: status.c,v 1.12.2.1 1999/06/20 21:56:36 kondou Exp $ */
  
  #include <stdio.h>
  #include <string.h>
--- 1,5 ----
  
! /* $Id: status.c,v 1.12.2.3 1999/10/04 02:20:59 kondou Exp $ */
  
  #include <stdio.h>
  #include <string.h>
***************
*** 34,40 ****
      unsigned long  Unwanted_g;
      unsigned long  Unwanted_s;
      unsigned long  Unwanted_f;
!     unsigned long  Size;
      unsigned long  Check;
      unsigned long  Check_send;
      unsigned long  Check_deferred;
--- 34,40 ----
      unsigned long  Unwanted_g;
      unsigned long  Unwanted_s;
      unsigned long  Unwanted_f;
!     float          Size;
      unsigned long  Check;
      unsigned long  Check_send;
      unsigned long  Check_deferred;
***************
*** 77,83 ****
    strcpy (start_time, ctime (&now)) ;
  }
  
! char *PrettySize (unsigned long size, char *str)
  {
    if (size > 1073741824) /* 1024*1024*1024 */
      sprintf (str, "%.1fGb", size / 1073741824.);
--- 77,83 ----
    strcpy (start_time, ctime (&now)) ;
  }
  
! char *PrettySize (float size, char *str)
  {
    if (size > 1073741824) /* 1024*1024*1024 */
      sprintf (str, "%.1fGb", size / 1073741824.);
***************
*** 102,108 ****
    unsigned long     accepted = 0;
    unsigned long     refused = 0;
    unsigned long     rejected = 0;
!   unsigned long     size = 0;
    int               peers = 0;
    char              TempString [SMBUF];
    STATUS            status[MAX_PEER];
--- 102,108 ----
    unsigned long     accepted = 0;
    unsigned long     refused = 0;
    unsigned long     rejected = 0;
!   float             size = 0;
    int               peers = 0;
    char              TempString [SMBUF];
    STATUS            status[MAX_PEER];
***************
*** 137,143 ****
      strcpy(TempString, cp->Address.s_addr == 0 ? "localhost" : RChostname(cp));
      while ((j < peers) && (strcmp (TempString, status[j].name)))
        j++;
!     if (j > MAX_PEER) {
        syslog(L_NOTICE, "%s: too many peers for STATUSsummary()", TempString);
        fprintf (F, "%s: too many peers for STATUSsummary()\n", TempString);
        continue;
--- 137,143 ----
      strcpy(TempString, cp->Address.s_addr == 0 ? "localhost" : RChostname(cp));
      while ((j < peers) && (strcmp (TempString, status[j].name)))
        j++;
!     if (j >= MAX_PEER) {
        syslog(L_NOTICE, "%s: too many peers for STATUSsummary()", TempString);
        fprintf (F, "%s: too many peers for STATUSsummary()\n", TempString);
        continue;
diff -Nacr inn-2.2.1/innfeed/README inn-2.2.2/innfeed/README
*** inn-2.2.1/innfeed/README	Wed Jun  3 00:29:21 1998
--- inn-2.2.2/innfeed/README	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! This is the beta test version 0.9.3 of the INN feeder program `innfeed.'
  It is written in ANSI C and tries to be POSIX.1 compliant. The features of
  it are:
  
--- 1,4 ----
! This is version 1.0 of the INN feeder program `innfeed.'
  It is written in ANSI C and tries to be POSIX.1 compliant. The features of
  it are:
  
diff -Nacr inn-2.2.1/innfeed/host.c inn-2.2.2/innfeed/host.c
*** inn-2.2.1/innfeed/host.c	Fri Jun 19 11:58:16 1998
--- inn-2.2.2/innfeed/host.c	Mon Dec 13 13:18:37 1999
***************
*** 4,10 ****
   * Start Date:  Thu Dec 28 17:29:05 1995
   * Project:     INN (innfeed)
   * File:        host.c
!  * RCSId:       $Id: host.c,v 1.24 1998/06/19 11:58:16 scrappy Exp $
   *
   * Copyright:   Copyright (c) 1996 by Internet Software Consortium
   *
--- 4,10 ----
   * Start Date:  Thu Dec 28 17:29:05 1995
   * Project:     INN (innfeed)
   * File:        host.c
!  * RCSId:       $Id: host.c,v 1.24.2.1 1999/09/17 15:28:15 kondou Exp $
   *
   * Copyright:   Copyright (c) 1996 by Internet Software Consortium
   *
***************
*** 29,35 ****
   */
  
  #if ! defined (lint)
! static const char *rcsid = "$Id: host.c,v 1.24 1998/06/19 11:58:16 scrappy Exp $" ;
  static void use_rcsid (const char *rid) {   /* Never called */
    use_rcsid (rcsid) ; use_rcsid (rid) ;
  }
--- 29,35 ----
   */
  
  #if ! defined (lint)
! static const char *rcsid = "$Id: host.c,v 1.24.2.1 1999/09/17 15:28:15 kondou Exp $" ;
  static void use_rcsid (const char *rid) {   /* Never called */
    use_rcsid (rcsid) ; use_rcsid (rid) ;
  }
***************
*** 711,716 ****
--- 711,717 ----
  	     */
  	  if (host->connections[i - 1] != NULL)
  	    {
+ 	      cxnLogStats (host->connections [i-1], true) ;
  	      cxnNuke (host->connections[i-1]) ;
  	      host->connections[i-1] = NULL;
  	    }
diff -Nacr inn-2.2.1/lib/Makefile inn-2.2.2/lib/Makefile
*** inn-2.2.1/lib/Makefile	Fri Sep  4 10:07:35 1998
--- inn-2.2.2/lib/Makefile	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! ##  $Revision: 1.35 $
  include ../Makefile.global
  
  CC	= $(LIBCC)
--- 1,4 ----
! ##  $Revision: 1.35.2.1 $
  include ../Makefile.global
  
  CC	= $(LIBCC)
***************
*** 138,144 ****
  inndcomm.o:	../include/macros.h
  inndcomm.o:	../include/nntp.h
  inndcomm.o:	../include/paths.h
! innvers.o:	../include/patchlevel.h
  localopen.o:	../include/macros.h
  localopen.o:	../include/nntp.h
  localopen.o:	../include/paths.h
--- 138,144 ----
  inndcomm.o:	../include/macros.h
  inndcomm.o:	../include/nntp.h
  inndcomm.o:	../include/paths.h
! innvers.o:	../include/innversion.h
  localopen.o:	../include/macros.h
  localopen.o:	../include/nntp.h
  localopen.o:	../include/paths.h
diff -Nacr inn-2.2.1/lib/endian.c inn-2.2.2/lib/endian.c
*** inn-2.2.1/lib/endian.c	Wed Aug 19 06:50:54 1998
--- inn-2.2.2/lib/endian.c	Mon Dec 13 13:18:37 1999
***************
*** 87,93 ****
  	exit(1);
      }
  
! #if !defined(INN_MUST_ALIGN) && !defined(__alpha__) && !defined(__alpha)
      /* setup to catch alignment bus errors */
      signal(SIGBUS, buserr);
      signal(SIGSEGV, buserr);	/* some systems will generate SEGV instead! */
--- 87,93 ----
  	exit(1);
      }
  
! #if !defined(INN_MUST_ALIGN) && !defined(__alpha__) && !defined(__alpha) && !defined(__ultrix__)
      /* setup to catch alignment bus errors */
      signal(SIGBUS, buserr);
      signal(SIGSEGV, buserr);	/* some systems will generate SEGV instead! */
diff -Nacr inn-2.2.1/lib/innvers.c inn-2.2.2/lib/innvers.c
*** inn-2.2.1/lib/innvers.c	Mon Oct 20 21:30:09 1997
--- inn-2.2.2/lib/innvers.c	Mon Dec 13 13:18:37 1999
***************
*** 1,11 ****
! /*  $Revision: 1.2 $
  **
  */
  #include <stdio.h>
  #include <sys/types.h>
  #include "configdata.h"
  #include "clibrary.h"
! #include "patchlevel.h"
  
      /* Length of string plus trailing space. */
  #define S(x)	sizeof(x)
--- 1,11 ----
! /*  $Revision: 1.2.4.1 $
  **
  */
  #include <stdio.h>
  #include <sys/types.h>
  #include "configdata.h"
  #include "clibrary.h"
! #include "innversion.h"
  
      /* Length of string plus trailing space. */
  #define S(x)	sizeof(x)
diff -Nacr inn-2.2.1/lib/perl.c inn-2.2.2/lib/perl.c
*** inn-2.2.1/lib/perl.c	Fri Jun 25 03:16:00 1999
--- inn-2.2.2/lib/perl.c	Mon Dec 13 13:18:37 1999
***************
*** 3,15 ****
   * Author:      Christophe Wolfhugel <wolf@pasteur.fr>
   *		(although he wouldn't recognise it anymore so don't blame him)
   * File:        perl.c
!  * RCSId:       $Id: perl.c,v 1.7.2.1 1999/06/25 03:16:00 kondou Exp $
   * Description: Perl hooks for libinn.a
   * 
   */
  
  #if ! defined (lint)
! static const char *rcsid = "$Id: perl.c,v 1.7.2.1 1999/06/25 03:16:00 kondou Exp $" ;
  static void use_rcsid (const char *rid) {   /* Never called */
    use_rcsid (rcsid) ; use_rcsid (rid) ;
  }
--- 3,15 ----
   * Author:      Christophe Wolfhugel <wolf@pasteur.fr>
   *		(although he wouldn't recognise it anymore so don't blame him)
   * File:        perl.c
!  * RCSId:       $Id: perl.c,v 1.7.2.3 1999/09/25 22:42:25 rra Exp $
   * Description: Perl hooks for libinn.a
   * 
   */
  
  #if ! defined (lint)
! static const char *rcsid = "$Id: perl.c,v 1.7.2.3 1999/09/25 22:42:25 rra Exp $" ;
  static void use_rcsid (const char *rid) {   /* Never called */
    use_rcsid (rcsid) ; use_rcsid (rid) ;
  }
***************
*** 34,45 ****
  #include <EXTERN.h>
  #include <perl.h>
  #include <XSUB.h>
! 
! /* Perl 5.004 didn't define ERRSV and PL_na was called na. */
! #ifndef ERRSV
! # define ERRSV GvSV(errgv)
! # define PL_na na
! #endif
  
  extern void xs_init    _((void));
  extern void boot_DynaLoader _((CV* cv));
--- 34,40 ----
  #include <EXTERN.h>
  #include <perl.h>
  #include <XSUB.h>
! #include "ppport.h"
  
  extern void xs_init    _((void));
  extern void boot_DynaLoader _((CV* cv));
diff -Nacr inn-2.2.1/lib/xmalloc.c inn-2.2.2/lib/xmalloc.c
*** inn-2.2.1/lib/xmalloc.c	Mon Oct 20 21:30:22 1997
--- inn-2.2.2/lib/xmalloc.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.2 $
  **
  */
  #include <stdio.h>
--- 1,4 ----
! /*  $Revision: 1.2.4.1 $
  **
  */
  #include <stdio.h>
***************
*** 13,24 ****
  /*
  **  Allocate some memory or call the memory failure handler.
  */
! ALIGNPTR xmalloc(unsigned int i)
  {
      POINTER		new;
  
      while ((new = malloc(i)) == NULL)
! 	(*xmemfailure)("malloc", i);
  #if 0
      memset (new,0,i) ;
  #endif
--- 13,24 ----
  /*
  **  Allocate some memory or call the memory failure handler.
  */
! ALIGNPTR xmalloc(unsigned int i, const char *file, int line)
  {
      POINTER		new;
  
      while ((new = malloc(i)) == NULL)
! 	(*xmemfailure)("malloc", i, file, line);
  #if 0
      memset (new,0,i) ;
  #endif
diff -Nacr inn-2.2.1/lib/xmemerr.c inn-2.2.2/lib/xmemerr.c
*** inn-2.2.1/lib/xmemerr.c	Mon Aug  4 04:03:47 1997
--- inn-2.2.2/lib/xmemerr.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.1.1.1 $
  **
  */
  #include <stdio.h>
--- 1,4 ----
! /*  $Revision: 1.1.1.1.4.1 $
  **
  */
  #include <stdio.h>
***************
*** 12,24 ****
  **  Memory failure handler; print an error and exit.
  */
  STATIC int
! xmemerr(what, i)
      char		*what;
      unsigned int	i;
  {
      /* We want large values to show up as negative, hence %d. */
!     (void)fprintf(stderr, "Can't %s %d bytes, %s", what, i, strerror(errno));
!     exit(1);
      /* NOTREACHED */
  }
  
--- 12,27 ----
  **  Memory failure handler; print an error and exit.
  */
  STATIC int
! xmemerr(what, i, file, line)
      char		*what;
      unsigned int	i;
+     const char		*file;
+     int			line;
  {
      /* We want large values to show up as negative, hence %d. */
!     (void)fprintf(stderr, "%s:%d Can\'t %s %d bytes, %s",
!                   file, line, what, i, strerror(errno));
!     exit(1); 
      /* NOTREACHED */
  }
  
diff -Nacr inn-2.2.1/lib/xrealloc.c inn-2.2.2/lib/xrealloc.c
*** inn-2.2.1/lib/xrealloc.c	Mon Oct 20 21:30:22 1997
--- inn-2.2.2/lib/xrealloc.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.2 $
  **
  */
  #include <stdio.h>
--- 1,4 ----
! /*  $Revision: 1.2.4.1 $
  **
  */
  #include <stdio.h>
***************
*** 13,23 ****
  /*
  **  Reallocate some memory or call the memory failure handler.
  */
! ALIGNPTR xrealloc(char *p, unsigned int i)
  {
      POINTER		new;
  
      while ((new = realloc((POINTER)p, i)) == NULL)
! 	(*xmemfailure)("remalloc", i);
      return CAST(ALIGNPTR, new);
  }
--- 13,23 ----
  /*
  **  Reallocate some memory or call the memory failure handler.
  */
! ALIGNPTR xrealloc(char *p, unsigned int i, const char *file, int line)
  {
      POINTER		new;
  
      while ((new = realloc((POINTER)p, i)) == NULL)
! 	(*xmemfailure)("remalloc", i, file, line);
      return CAST(ALIGNPTR, new);
  }
diff -Nacr inn-2.2.1/nnrpd/article.c inn-2.2.2/nnrpd/article.c
*** inn-2.2.1/nnrpd/article.c	Mon Apr 19 06:56:47 1999
--- inn-2.2.2/nnrpd/article.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.57.2.7 $
  **
  **  Article-related routines.
  */
--- 1,4 ----
! /*  $Revision: 1.57.2.8 $
  **
  **  Article-related routines.
  */
***************
*** 1089,1095 ****
      }
  
      /* Figure out length; get space. */
!     if ((next = strchr(p, '\t')) != NULL)
  	i = next - p;
      else
  	i = strlen(p);
--- 1089,1095 ----
      }
  
      /* Figure out length; get space. */
!     if ((next = strpbrk(p, "\t\r\n")) != NULL)
  	i = next - p;
      else
  	i = strlen(p);
diff -Nacr inn-2.2.1/nnrpd/misc.c inn-2.2.2/nnrpd/misc.c
*** inn-2.2.1/nnrpd/misc.c	Tue Aug 24 00:23:48 1999
--- inn-2.2.2/nnrpd/misc.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.28.2.5 $
  **
  **  Miscellaneous support routines.
  */
--- 1,4 ----
! /*  $Revision: 1.28.2.6 $
  **
  **  Miscellaneous support routines.
  */
***************
*** 235,241 ****
  	century = current->tm_year / 100;
  
  	/* Convert current year to two digits if necessary. */
! 	if (current->tm_year > 100)
  		current->tm_year -= century * 100;
  
  	if (year <= current->tm_year)
--- 235,241 ----
  	century = current->tm_year / 100;
  
  	/* Convert current year to two digits if necessary. */
! 	if (current->tm_year >= 100)
  		current->tm_year -= century * 100;
  
  	if (year <= current->tm_year)
diff -Nacr inn-2.2.1/nnrpd/newnews.c inn-2.2.2/nnrpd/newnews.c
*** inn-2.2.1/nnrpd/newnews.c	Wed Aug 25 12:58:47 1999
--- inn-2.2.2/nnrpd/newnews.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.9.2.3 $
  **
  **  The newnews command.
  */
--- 1,4 ----
! /*  $Revision: 1.9.2.4 $
  **
  **  The newnews command.
  */
***************
*** 376,382 ****
  		msgid[p2-q] = '\0';
  		Printf("%s\r\n", msgid);
  	    } else {
! 		*(--p) = '\0';
  		Printf("%s\r\n", line);
  	    }
  	} while (fgets(line, sizeof line, F) != NULL);
--- 376,382 ----
  		msgid[p2-q] = '\0';
  		Printf("%s\r\n", msgid);
  	    } else {
! 		*p = '\0';
  		Printf("%s\r\n", line);
  	    }
  	} while (fgets(line, sizeof line, F) != NULL);
diff -Nacr inn-2.2.1/nnrpd/perl.c inn-2.2.2/nnrpd/perl.c
*** inn-2.2.1/nnrpd/perl.c	Fri Jun 25 03:16:09 1999
--- inn-2.2.2/nnrpd/perl.c	Mon Dec 13 13:18:37 1999
***************
*** 3,15 ****
   * Author:      Christophe Wolfhugel <wolf@pasteur.fr>
   *		(although he wouldn't recognise it anymore so don't blame him)
   * File:        perl.c
!  * RCSId:       $Id: perl.c,v 1.8.2.1 1999/06/25 03:16:09 kondou Exp $
   * Description: Perl hooks for nnrpd.
   * 
   */
  
  #if ! defined (lint)
! static const char *rcsid = "$Id: perl.c,v 1.8.2.1 1999/06/25 03:16:09 kondou Exp $" ;
  static void use_rcsid (const char *rid) {   /* Never called */
    use_rcsid (rcsid) ; use_rcsid (rid) ;
  }
--- 3,15 ----
   * Author:      Christophe Wolfhugel <wolf@pasteur.fr>
   *		(although he wouldn't recognise it anymore so don't blame him)
   * File:        perl.c
!  * RCSId:       $Id: perl.c,v 1.8.2.3 1999/09/25 22:42:28 rra Exp $
   * Description: Perl hooks for nnrpd.
   * 
   */
  
  #if ! defined (lint)
! static const char *rcsid = "$Id: perl.c,v 1.8.2.3 1999/09/25 22:42:28 rra Exp $" ;
  static void use_rcsid (const char *rid) {   /* Never called */
    use_rcsid (rcsid) ; use_rcsid (rid) ;
  }
***************
*** 37,49 ****
  #include <EXTERN.h>
  #include <perl.h>
  #include <XSUB.h>
! 
! /* Perl 5.004 didn't define ERRSV and PL_na was called na. */
! #ifndef ERRSV
! # define ERRSV GvSV(errgv)
! # define PL_sv_undef sv_undef
! # define PL_na na
! #endif
  
  extern BOOL PerlFilterActive;
  extern HEADER	Table[], *EndOfTable;
--- 37,43 ----
  #include <EXTERN.h>
  #include <perl.h>
  #include <XSUB.h>
! #include "ppport.h"
  
  extern BOOL PerlFilterActive;
  extern HEADER	Table[], *EndOfTable;
diff -Nacr inn-2.2.1/nnrpd/post.c inn-2.2.2/nnrpd/post.c
*** inn-2.2.1/nnrpd/post.c	Wed Jul 14 13:27:07 1999
--- inn-2.2.2/nnrpd/post.c	Mon Dec 13 13:18:37 1999
***************
*** 1,4 ****
! /*  $Revision: 1.28.2.8 $
  **
  **  Check article, send it to the local server.
  */
--- 1,4 ----
! /*  $Revision: 1.28.2.9 $
  **
  **  Check article, send it to the local server.
  */
***************
*** 865,870 ****
--- 865,902 ----
      return SpoolitTo(article, Error, innconf->pathincoming);
  }
   
+ STATIC char *Towire(char *p) {
+     char	*q, *r, *s;
+     int		curlen, len = BIG_BUFFER;
+ 
+     for (r = p, q = s = NEW(char, len); *r != '\0' ;) {
+ 	curlen = q - s;
+ 	if (curlen + 3 > len) {
+ 	    len += BIG_BUFFER;
+ 	    RENEW(s, char, len);
+ 	    q = s + curlen;
+ 	}
+ 	if (*r == '\n') {
+ 	    if (r > p) {
+ 		if (*(r - 1) != '\r')
+ 		    *q++ = '\r';
+ 	    } else {
+ 		/* this should not happen */
+ 		DISPOSE(s);
+ 		return NULL;
+ 	    }
+ 	}
+ 	*q++ = *r++;
+     }
+     curlen = q - s;
+     if (curlen + 1 > len) {
+ 	len++;
+ 	RENEW(s, char, len);
+ 	q = s + curlen;
+     }
+     *q = '\0';
+     return s;
+ }
  
  STRING
  ARTpost(article, idbuff)
***************
*** 1060,1067 ****
  
      /* Write the headers and a blank line. */
      for (hp = Table; hp < ENDOF(Table); hp++)
! 	if (hp->Value)
! 	    (void)fprintf(ToServer, "%s: %s\r\n", hp->Name, hp->Value);
      for (i = 0; i < OtherCount; i++)
  	(void)fprintf(ToServer, "%s\r\n", OtherHeaders[i]);
      (void)fprintf(ToServer, "\r\n");
--- 1092,1107 ----
  
      /* Write the headers and a blank line. */
      for (hp = Table; hp < ENDOF(Table); hp++)
! 	if (hp->Value) {
! 	    if (strchr(hp->Value, '\n') != NULL) {
! 		if ((p = Towire(hp->Value)) != NULL) {
! 		    (void)fprintf(ToServer, "%s: %s\r\n", hp->Name, p);
! 		    DISPOSE(p);
! 		}
! 	    } else {
! 		(void)fprintf(ToServer, "%s: %s\r\n", hp->Name, hp->Value);
! 	    }
! 	}
      for (i = 0; i < OtherCount; i++)
  	(void)fprintf(ToServer, "%s\r\n", OtherHeaders[i]);
      (void)fprintf(ToServer, "\r\n");
***************
*** 1100,1107 ****
  	strcat(TrackID,HDR(_messageid));
  	if ((ftd=fopen(TrackID,"w")) != NULL) {
  		for (hp = Table; hp < ENDOF(Table); hp++)
! 			if (hp->Value)
! 				(void)fprintf(ftd, "%s: %s\r\n", hp->Name, hp->Value);
  		for (i=0; i<OtherCount; i++)
  			(void)fprintf(ftd,"%s\r\n",OtherHeaders[i]);
  		(void)fprintf(ftd,"\r\n");
--- 1140,1155 ----
  	strcat(TrackID,HDR(_messageid));
  	if ((ftd=fopen(TrackID,"w")) != NULL) {
  		for (hp = Table; hp < ENDOF(Table); hp++)
! 			if (hp->Value) {
! 			    if (strchr(hp->Value, '\n') != NULL) {
! 				if ((p = Towire(hp->Value)) != NULL) {
! 				    (void)fprintf(ftd, "%s: %s\r\n", hp->Name, p);
! 				    DISPOSE(p);
! 				}
! 			    }
! 			} else {
! 			    (void)fprintf(ToServer, "%s: %s\r\n", hp->Name, hp->Value);
! 			}
  		for (i=0; i<OtherCount; i++)
  			(void)fprintf(ftd,"%s\r\n",OtherHeaders[i]);
  		(void)fprintf(ftd,"\r\n");
diff -Nacr inn-2.2.1/nnrpd/udp.c inn-2.2.2/nnrpd/udp.c
*** inn-2.2.1/nnrpd/udp.c	Mon Jan 25 10:09:58 1999
--- inn-2.2.2/nnrpd/udp.c	Mon Dec 13 13:18:37 1999
***************
*** 8,13 ****
--- 8,14 ----
  #include <string.h>
  #include <syslog.h>
  #include "config.h"
+ #include "macros.h"
  
  int create_udp_socket(int port, int portexclude)
  {
***************
*** 42,48 ****
          struct hostent *host;
          int dots = 0;
          int numeric = 0;
!         char *str = strdup(ascii);
          char *colon = strrchr(str, ':');
          char *lastdot = strrchr(str, '.');
          char *ptr;
--- 43,49 ----
          struct hostent *host;
          int dots = 0;
          int numeric = 0;
!         char *str = COPY(ascii);
          char *colon = strrchr(str, ':');
          char *lastdot = strrchr(str, '.');
          char *ptr;
***************
*** 77,93 ****
          /* Now do we have a numeric address */
          if (numeric) {
                  addr->sin_addr.s_addr = inet_addr(str);
!                 free(str);
                  return(0);
          }
          /* Or a name */
          if (! (host = gethostbyname(str))) {
!                 free(str);
                  syslog(L_ERROR, "make_udp_sockaddr: gethostbyname %s", str);
  		return(-1);
          }
          mybcopy(host->h_addr_list[0], (char *)&addr->sin_addr.s_addr, sizeof(addr->sin_addr.s_addr));
!         free(str);
          return(0);
  }
  
--- 78,94 ----
          /* Now do we have a numeric address */
          if (numeric) {
                  addr->sin_addr.s_addr = inet_addr(str);
!                 DISPOSE(str);
                  return(0);
          }
          /* Or a name */
          if (! (host = gethostbyname(str))) {
!                 DISPOSE(str);
                  syslog(L_ERROR, "make_udp_sockaddr: gethostbyname %s", str);
  		return(-1);
          }
          mybcopy(host->h_addr_list[0], (char *)&addr->sin_addr.s_addr, sizeof(addr->sin_addr.s_addr));
!         DISPOSE(str);
          return(0);
  }
  
diff -Nacr inn-2.2.1/samples/cnfsstat.in inn-2.2.2/samples/cnfsstat.in
*** inn-2.2.1/samples/cnfsstat.in	Wed Aug 25 07:50:40 1999
--- inn-2.2.2/samples/cnfsstat.in	Mon Dec 13 13:18:37 1999
***************
*** 1,5 ****
  #!@_PATH_PERL@
! #  $Id: cnfsstat.in,v 1.3.2.7 1999/08/25 07:50:40 rra Exp $
  # 
  #  Copyright Andreas Lamrecht 1998
  #  <Andreas.Lamprect@siemens.at>
--- 1,5 ----
  #!@_PATH_PERL@
! #  $Id: cnfsstat.in,v 1.3.2.8 1999/10/18 06:54:42 kondou Exp $
  # 
  #  Copyright Andreas Lamrecht 1998
  #  <Andreas.Lamprect@siemens.at>
***************
*** 460,467 ****
  	# written a little past free.
  	
  	$offset = 0;
    do_seek:
! 	while (1) {
  	    $offset += 16384;
  	    seek (BUFF, $cyclenum ? $free + $offset : 0, 0);
  
--- 460,470 ----
  	# written a little past free.
  	
  	$offset = 0;
+ 	$minartoffset = int($len / (512 * 8)) + 512;
+ 	$tonextblock = 16384 - ($minartoffset & (16384 - 1));
+ 	$minartoffset += $tonextblock;
    do_seek:
! 	while (!($cyclenum == 0 && $free == $minartoffset)) {
  	    $offset += 16384;
  	    seek (BUFF, $cyclenum ? $free + $offset : 0, 0);
  
diff -Nacr inn-2.2.1/samples/control.ctl inn-2.2.2/samples/control.ctl
*** inn-2.2.1/samples/control.ctl	Tue Jul 13 01:42:59 1999
--- inn-2.2.2/samples/control.ctl	Mon Dec 13 13:18:37 1999
***************
*** 101,106 ****
--- 101,109 ----
  #rmgroup:*:comp.*|humanities.*|misc.*|news.*|rec.*|sci.*|soc.*|talk.*:log
  
  # *PGP*   See comment at top of file.
+ checkgroups:*:comp.*|humanities.*|misc.*|news.*|rec.*|sci.*|soc.*|talk.*:drop
+ newgroup:*:comp.*|humanities.*|misc.*|news.*|rec.*|sci.*|soc.*|talk.*:drop
+ rmgroup:*:comp.*|humanities.*|misc.*|news.*|rec.*|sci.*|soc.*|talk.*:drop
  checkgroups:group-admin@isc.org:*:verify-news.announce.newgroups
  newgroup:group-admin@isc.org:comp.*|misc.*|news.*:verify-news.announce.newgroups
  newgroup:group-admin@isc.org:rec.*|sci.*|soc.*:verify-news.announce.newgroups
***************
*** 144,149 ****
--- 147,156 ----
  ## ALABAMA & HSV (Huntsville, Alabama, USA)
  # Contact: news@news.msfc.nasa.gov
  # *PGP*   See comment at top of file.
+ checkgroups:*:alabama.*|hsv.*:drop
+ newgroup:*:alabama.*|hsv.*:drop
+ rmgroup:*:alabama.*|hsv.*:drop
+ checkgroups:news@news.msfc.nasa.gov:alabama.*|hsv.*:verify-alabama-group-admin
  newgroup:news@news.msfc.nasa.gov:alabama.*|hsv.*:verify-alabama-group-admin
  rmgroup:news@news.msfc.nasa.gov:alabama.*|hsv.*:verify-alabama-group-admin
  
***************
*** 203,208 ****
--- 210,218 ----
  # Contact: ausadmin@aus.news-admin.org
  # URL: http://aus.news-admin.org/ 
  # *PGP*   See comment at top of file.
+ checkgroups:*:aus.*:drop
+ newgroup:*:aus.*:drop
+ rmgroup:*:aus.*:drop
  checkgroups:ausadmin@aus.news-admin.org:aus.*:verify-ausadmin@aus.news-admin.org
  newgroup:ausadmin@aus.news-admin.org:aus.*:verify-ausadmin@aus.news-admin.org
  rmgroup:ausadmin@aus.news-admin.org:aus.*:verify-ausadmin@aus.news-admin.org
***************
*** 226,234 ****
  # Contact: <ba-mod@nas.nasa.gov>
  # URL: http://ennui.org/ba/
  # *PGP*   See comment at top of file.
  newgroup:ba-mod@nas.nasa.gov:ba.*:verify-ba.news.config
  rmgroup:ba-mod@nas.nasa.gov:ba.*:verify-ba.news.config
- checkgroups:ba-mod@nas.nasa.gov:ba.*:verify-ba.news.config
  
  ## BACKBONE (ruhr.de/ruhrgebiet.individual.net in Germany)
  # Contact: admin@ruhr.de
--- 236,247 ----
  # Contact: <ba-mod@nas.nasa.gov>
  # URL: http://ennui.org/ba/
  # *PGP*   See comment at top of file.
+ checkgroups:*:ba.*:drop
+ newgroup:*:ba.*:drop
+ rmgroup:*:ba.*:drop
+ checkgroups:ba-mod@nas.nasa.gov:ba.*:verify-ba.news.config
  newgroup:ba-mod@nas.nasa.gov:ba.*:verify-ba.news.config
  rmgroup:ba-mod@nas.nasa.gov:ba.*:verify-ba.news.config
  
  ## BACKBONE (ruhr.de/ruhrgebiet.individual.net in Germany)
  # Contact: admin@ruhr.de
***************
*** 242,250 ****
  # Key fingerprint = F7 AD 96 D8 7A 3F 7E 84  02 0C 83 9A DB 8F EB B8
  # Syncable server: news.mayn.de (contact news@mayn.de if permission denied)
  # *PGP*   See comment at top of file.
  newgroup:news@mayn.de:baynet.*:verify-news.mayn.de
  rmgroup:news@mayn.de:baynet.*:verify-news.mayn.de
- checkgroups:news@mayn.de:baynet.*:verify-news.mayn.de
  
  # newgroup:news@mayn.de:baynet.*:mail
  # rmgroup:news@mayn.de:baynet.*:mail
--- 255,266 ----
  # Key fingerprint = F7 AD 96 D8 7A 3F 7E 84  02 0C 83 9A DB 8F EB B8
  # Syncable server: news.mayn.de (contact news@mayn.de if permission denied)
  # *PGP*   See comment at top of file.
+ checkgroups:*:baynet.*:drop
+ newgroup:*:baynet.*:drop
+ rmgroup:*:baynet.*:drop
+ checkgroups:news@mayn.de:baynet.*:verify-news.mayn.de
  newgroup:news@mayn.de:baynet.*:verify-news.mayn.de
  rmgroup:news@mayn.de:baynet.*:verify-news.mayn.de
  
  # newgroup:news@mayn.de:baynet.*:mail
  # rmgroup:news@mayn.de:baynet.*:mail
***************
*** 258,263 ****
--- 274,282 ----
  # Contact: usenet@innet.be
  # URL: ftp://ftp.innet.be/pub/staff/stef/
  # *PGP*   See comment at top of file.
+ checkgroups:*:be.*:drop
+ newgroup:*:be.*:drop
+ rmgroup:*:be.*:drop
  checkgroups:news@*innet.be:be.*:verify-be.announce.newgroups
  newgroup:news@*innet.be:be.*:verify-be.announce.newgroups
  rmgroup:news@*innet.be:be.*:verify-be.announce.newgroups
***************
*** 287,292 ****
--- 306,314 ----
  
  ## BIT (Gatewayed Mailing lists)
  # *PGP*   See comment at top of file.
+ checkgroups:*:bit.*:drop
+ newgroup:*:bit.*:drop
+ rmgroup:*:bit.*:drop
  checkgroups:jim@american.edu:bit.*:verify-bit.admin
  newgroup:jim@american.edu:bit.*:verify-bit.admin
  rmgroup:jim@american.edu:bit.*:verify-bit.admin
***************
*** 362,367 ****
--- 384,392 ----
  # Key URL: http://www.use-net.ch/Usenet/adminkey.html
  # *PGP*   See comment at top of file.
  # Key fingerprint = 71 80 D6 8C A7 DE 2C 70  62 4A 48 6E D9 96 02 DF
+ checkgroups:*:ch.*:drop
+ newgroup:*:ch.*:drop
+ rmgroup:*:ch.*:drop
  checkgroups:felix.rauch@nice.ch:ch.*:verify-ch-news-admin@use-net.ch
  newgroup:felix.rauch@nice.ch:ch.*:verify-ch-news-admin@use-net.ch
  rmgroup:felix.rauch@nice.ch:ch.*:verify-ch-news-admin@use-net.ch
***************
*** 397,402 ****
--- 422,430 ----
  # Contact: Dave Williams <newsmaster@demon.net>
  # URL: ftp://ftp.demon.co.uk/pub/news/doc/demon.news.txt
  # *PGP*   See comment at top of file.
+ checkgroups:*:cityscp.*:drop
+ newgroup:*:cityscp.*:drop
+ rmgroup:*:cityscp.*:drop
  checkgroups:newsmaster@demon.net:cityscp.*:verify-demon.news
  newgroup:newsmaster@demon.net:cityscp.*:verify-demon.news
  rmgroup:newsmaster@demon.net:cityscp.*:verify-demon.news
***************
*** 407,412 ****
--- 435,443 ----
  # URL: http://www.zerberus.de/org/cl/index.html
  # Syncable server: net2.dinoex.sub.de
  # Key fingerprint: 21 ED D6 CB 05 56 6E E8  F6 F1 11 E9 2F 6C D5 BB
+ checkgroups:*:cl.*:drop
+ newgroup:*:cl.*:drop
+ rmgroup:*:cl.*:drop
  checkgroups:cl-koordination@dinoex.sub.org:cl.*:verify-cl.koordination.einstellungen
  newgroup:cl-koordination@dinoex.sub.org:cl.*:verify-cl.koordination.einstellungen
  rmgroup:cl-koordination@dinoex.sub.org:cl.*:verify-cl.koordination.einstellungen
***************
*** 418,423 ****
--- 449,457 ----
  
  ## CLARINET ( Features and News, Available on a commercial basis)
  # *PGP*   See comment at top of file.
+ checkgroups:*:clari.*:drop
+ newgroup:*:clari.*:drop
+ rmgroup:*:clari.*:drop
  checkgroups:cl*@clarinet.com:clari.*:verify-ClariNet.Group
  newgroup:cl*@clarinet.com:clari.*:verify-ClariNet.Group
  rmgroup:cl*@clarinet.com:clari.*:verify-ClariNet.Group
***************
*** 474,479 ****
--- 508,515 ----
  
  ## DE (German language)
  # *PGP*   See comment at top of file.
+ checkgroups:*:de.*:drop
+ rmgroup:*:de.*:drop
  checkgroups:moderator@dana.de:de.*:verify-de.admin.news.announce
  newgroup:moderator@dana.de:de.*:verify-de.admin.news.announce
  newgroup:*@*:de.alt.*:doit
***************
*** 494,499 ****
--- 530,538 ----
  # Key URL: http://www.DK.net/Usenet/pgp.html
  # Key fingerprint = 7C B2 C7 50 F3 7D 5D 73  8C EE 2E 3F 55 80 72 FF
  # *PGP*   See comment at top of file.
+ checkgroups:*:dk.*:drop
+ newgroup:*:dk.*:drop
+ rmgroup:*:dk.*:drop
  newgroup:news@news.dknet.dk:dk.*:verify-news@news.dknet.dk
  rmgroup:news@news.dknet.dk:dk.*:verify-news@news.dknet.dk
  
***************
*** 510,521 ****
--- 549,566 ----
  # Contact: Christiaan Keet <newsmaster@easynet.net>
  # URL: ftp://ftp.easynet.net/pub/usenet/easynet.control.txt
  # *PGP*   See comment at top of file.
+ checkgroups:*:easynet.*:drop
+ newgroup:*:easynet.*:drop
+ rmgroup:*:easynet.*:drop
  checkgroups:newsmaster@easynet.net:easynet.*:verify-easynet.news
  newgroup:newsmaster@easynet.net:easynet.*:verify-easynet.news
  rmgroup:newsmaster@easynet.net:easynet.*:verify-easynet.news
  
  ## EFN & EUG (Eugene Free Computer Network, Eugene/Springfield, Oregon, USA)
  # *PGP*   See comment at top of file.
+ checkgroups:*:eug.*:drop
+ newgroup:*:eug.*:drop
+ rmgroup:*:eug.*:drop
  checkgroups:newsadmin@efn.org:efn.*|eug.*:verify-eug.config
  newgroup:newsadmin@efn.org:efn.*|eug.*:verify-eug.config
  rmgroup:newsadmin@efn.org:efn.*|eug.*:verify-eug.config
***************
*** 535,543 ****
  # See: http://news.rediris.es/~moderador/grupos/newsgroups.es
  # *PGP*   See comment at top of file.
  # Key fingerprint = 3B 63 18 6F 83 EA 89 82 95 1B 7F 8D B6 ED DD 87
  newgroup:moderador@news.rediris.es:es.*:verify-es.news
  rmgroup:moderador@news.rediris.es:es.*:verify-es.news
- checkgroups:moderador@news.rediris.es:es.*:doit
  
  # checkgroups:moderador@news.rediris.es:es.*:mail
  # newgroup:moderador@news.rediris.es:es.*:doit
--- 580,591 ----
  # See: http://news.rediris.es/~moderador/grupos/newsgroups.es
  # *PGP*   See comment at top of file.
  # Key fingerprint = 3B 63 18 6F 83 EA 89 82 95 1B 7F 8D B6 ED DD 87
+ checkgroups:*:es.*:drop
+ newgroup:*:es.*:drop
+ rmgroup:*:es.*:drop
+ checkgroups:moderador@news.rediris.es:es.*:doit
  newgroup:moderador@news.rediris.es:es.*:verify-es.news
  rmgroup:moderador@news.rediris.es:es.*:verify-es.news
  
  # checkgroups:moderador@news.rediris.es:es.*:mail
  # newgroup:moderador@news.rediris.es:es.*:doit
***************
*** 547,555 ****
  # Contact: <mod-ena@ennui.org>
  # URL: http://ennui.org/esp/
  # *PGP*   See comment at top of file.
  newgroup:mod-ena@ennui.org:esp.*:verify-esp.news.administracion
  rmgroup:mod-ena@ennui.org:esp.*:verify-esp.news.administracion
- checkgroups:mod-ena@ennui.org:esp.*:verify-esp.news.administracion
  
  ## EUNET ( Europe )
  newgroup:news@noc.eu.net:eunet.*:doit
--- 595,606 ----
  # Contact: <mod-ena@ennui.org>
  # URL: http://ennui.org/esp/
  # *PGP*   See comment at top of file.
+ checkgroups:*:esp.*:drop
+ newgroup:*:esp.*:drop
+ rmgroup:*:esp.*:drop
+ checkgroups:mod-ena@ennui.org:esp.*:verify-esp.news.administracion
  newgroup:mod-ena@ennui.org:esp.*:verify-esp.news.administracion
  rmgroup:mod-ena@ennui.org:esp.*:verify-esp.news.administracion
  
  ## EUNET ( Europe )
  newgroup:news@noc.eu.net:eunet.*:doit
***************
*** 572,583 ****
--- 623,640 ----
  ## FIDO.BELG.* newsgroups (FidoNet)
  # URL: http://www.z2.fidonet.org/news/fido.belg.news/
  # *PGP*   See comment at top of file.
+ checkgroups:*:fido.belg.*:drop
+ newgroup:*:fido.belg.*:drop
+ rmgroup:*:fido.belg.*:drop
  checkgroups:fidobelg@mail.z2.fidonet.org:fido.belg.*:verify-fido.belg.news
  newgroup:fidobelg@mail.z2.fidonet.org:fido.belg.*:verify-fido.belg.news
  rmgroup:fidobelg@mail.z2.fidonet.org:fido.belg.*:verify-fido.belg.news
  
  ## FIDO7
  # *PGP*   See comment at top of file.
+ checkgroups:*:fido7.*:drop
+ newgroup:*:fido7.*:drop
+ rmgroup:*:fido7.*:drop
  checkgroups:newgroups-request@fido7.ru:fido7.*:verify-fido7.announce.newgroups
  newgroup:newgroups-request@fido7.ru:fido7.*:verify-fido7.announce.newgroups
  rmgroup:newgroups-request@fido7.ru:fido7.*:verify-fido7.announce.newgroups
***************
*** 593,598 ****
--- 650,658 ----
  # Contact: committee@fj-news.org
  # URL: http://www.is.tsukuba.ac.jp/~yas/fj/
  # Key URL: http://www.is.tsukuba.ac.jp/~yas/fj/fj.asc
+ checkgroups:*:fj.*:drop
+ newgroup:*:fj.*:drop
+ rmgroup:*:fj.*:drop
  checkgroups:committee@fj-news.org:fj.*:verify-fj.news.announce
  newgroup:committee@fj-news.org:fj.*:verify-fj.news.announce
  rmgroup:committee@fj-news.org:fj.*:verify-fj.news.announce
***************
*** 608,619 ****
--- 668,685 ----
  # See: http://news.flora.org/  for newsgroup listings and information
  # See: http://www.flora.org/russell/ for PGP keys
  # *PGP*   See comment at top of file.
+ checkgroups:*:flora.*:drop
+ newgroup:*:flora.*:drop
+ rmgroup:*:flora.*:drop
  checkgroups:news@flora.ottawa.on.ca:flora.*:verify-flora-news
  newgroup:news@news.rediris.es:flora.*:verify-flora-news
  rmgroup:news@news.rediris.es:flora.*:verify-flora-news
  
  ## FR (French Language)
  # *PGP*   See comment at top of file.
+ checkgroups:*:fr.*:drop
+ newgroup:*:fr.*:drop
+ rmgroup:*:fr.*:drop
  checkgroups:control@usenet-fr.news.eu.org:fr.*:verify-control@usenet-fr.news.eu.org
  newgroup:control@usenet-fr.news.eu.org:fr.*:verify-control@usenet-fr.news.eu.org
  rmgroup:control@usenet-fr.news.eu.org:fr.*:verify-control@usenet-fr.news.eu.org
***************
*** 652,657 ****
--- 718,726 ----
  # *PGP*   See comment at top of file.
  # URL: http://www.govnews.org/govnews/
  # PGPKEY URL: http://www.govnews.org/govnews/site-setup/gov.pgpkeys
+ checkgroups:*:gov.*:drop
+ newgroup:*:gov.*:drop
+ rmgroup:*:gov.*:drop
  checkgroups:gov-usenet-announce-moderator@govnews.org:gov.*:verify-gov.usenet.announce
  newgroup:gov-usenet-announce-moderator@govnews.org:gov.*:verify-gov.usenet.announce
  rmgroup:gov-usenet-announce-moderator@govnews.org:gov.*:verify-gov.usenet.announce
***************
*** 669,674 ****
--- 738,747 ----
  # Contact: newgroups-request@usenet.or.kr
  # PGPKEY URL: ftp://ftp.usenet.or.kr/pub/korea/usenet/pgp/PGPKEY.han
  # *PGP*   See comment at top of file.
+ checkgroups:*:han.*:drop
+ newgroup:*:han.*:drop
+ rmgroup:*:han.*:drop
+ checkgroups:newgroups-request@usenet.or.kr:han.*:verify-han.news.admin
  newgroup:newgroups-request@usenet.or.kr:han.*:verify-han.news.admin
  rmgroup:newgroups-request@usenet.or.kr:han.*:verify-han.news.admin
  
***************
*** 686,691 ****
--- 759,767 ----
  
  ## HOUSTON (Houston, Texas, USA)
  # *PGP*   See comment at top of file.
+ checkgroups:*:houston.*:drop
+ newgroup:*:houston.*:drop
+ rmgroup:*:houston.*:drop
  checkgroups:news@academ.com:houston.*:verify-houston.usenet.config
  newgroup:news@academ.com:houston.*:verify-houston.usenet.config
  rmgroup:news@academ.com:houston.*:verify-houston.usenet.config
***************
*** 694,699 ****
--- 770,778 ----
  # rmgroup:news@academ.com:houston.*:doit
  
  ## HUN (Hungary)
+ checkgroups:*:hun.*:drop
+ newgroup:*:hun.*:drop
+ rmgroup:*:hun.*:drop
  checkgroups:hun-mnt@news.sztaki.hu:hun.*:verify-hun.admin.news
  newgroup:hun-mnt@news.sztaki.hu:hun.*:verify-hun.admin.news
  rmgroup:hun-mnt@news.sztaki.hu:hun.*:verify-hun.admin.news
***************
*** 731,736 ****
--- 810,818 ----
  ## IS (Iceland)
  # Contact: Marius Olafsson <news@isnet.is>
  # *PGP*   See comment at top of file.
+ checkgroups:*:is.*:drop
+ newgroup:*:is.*:drop
+ rmgroup:*:is.*:drop
  newgroup:news@isnet.is:is.*:verify-is.isnet
  rmgroup:news@isnet.is:is.*:verify-is.isnet
  
***************
*** 744,749 ****
--- 826,834 ----
  
  ## IT (Italian)
  # *PGP*   See comment at top of file.
+ checkgroups:*:it.*:drop
+ newgroup:*:it.*:drop
+ rmgroup:*:it.*:drop
  checkgroups:stefano@unipi.it:it.*:verify-it.announce.newgroups
  newgroup:stefano@unipi.it:it.*:verify-it.announce.newgroups
  rmgroup:stefano@unipi.it:it.*:verify-it.announce.newgroups
***************
*** 767,772 ****
--- 852,860 ----
  # PGP Key: http://grex.cyberspace.org/~tt/japan.admin.announce.asc
  # PGP Key: http://www.asahi-net.or.jp/~AE5T-KSN/japan/japan.admin.announce.asc
  # *PGP*   See comment at top of file.
+ checkgroups:*:japan.*:drop
+ newgroup:*:japan.*:drop
+ rmgroup:*:japan.*:drop
  checkgroups:japan.admin.announce@news.efnet.com:japan.*:verify-japan.admin.announce@news.efnet.com
  newgroup:japan.admin.announce@news.efnet.com:japan.*:verify-japan.admin.announce@news.efnet.com
  rmgroup:japan.admin.announce@news.efnet.com:japan.*:verify-japan.admin.announce@news.efnet.com
***************
*** 788,793 ****
--- 876,884 ----
  #
  # *PGP*   See comment at top of file. 
  # Key fingerprint =  DE 19 BB 25 76 19 81 17  F0 67 D2 23 E8 C8 7C 90
+ checkgroups:*:ka.*:drop
+ newgroup:*:ka.*:drop
+ rmgroup:*:ka.*:drop
  checkgroups:usenet@karlsruhe.org:ka.*:verify-usenet@karlsruhe.org
  newgroup:usenet@karlsruhe.org:ka.*:verify-usenet@karlsruhe.org
  rmgroup:usenet@karlsruhe.org:ka.*:verify-usenet@karlsruhe.org
***************
*** 795,800 ****
--- 886,893 ----
  
  ## KANTO
  # *PGP*   See comment at top of file.
+ checkgroups:*:kanto.*:drop
+ rmgroup:*:kanto.*:drop
  checkgroups:ty@kamoi.imasy.or.jp:kanto.*:verify-kanto.news.network
  # NOTE: newgroups aren't verified...
  newgroup:*@*.jp:kanto.*:doit
***************
*** 803,808 ****
--- 896,904 ----
  ## KASSEL (Kassel, Germany)
  # *PGP*   See comment at top of file.
  # MAIL: pgp-public-keys@keys.de.pgp.net Subject: GET 0xC4D30EE5
+ checkgroups:*:kassel.*:drop
+ newgroup:*:kassel.*:drop
+ rmgroup:*:kassel.*:drop
  checkgroups:dirk.meyer@dinoex.sub.org:kassel.*:verify-kassel-admin
  newgroup:dirk.meyer@dinoex.sub.org:kassel.*:verify-kassel-admin
  rmgroup:dirk.meyer@dinoex.sub.org:kassel.*:verify-kassel-admin
***************
*** 848,853 ****
--- 944,952 ----
  # Contact: cmeli@cis.um.edu.mt
  # URL: http://www.cis.um.edu.mt/news-malta/malta-news-new-site-faq.html
  # *PGP*   See comment at top of file. 
+ checkgroups:*:malta.*:drop
+ newgroup:*:malta.*:drop
+ rmgroup:*:malta.*:drop
  checkgroups:cmeli@cis.um.edu.mt:malta.*:verify-malta.config
  newgroup:cmeli@cis.um.edu.mt:malta.*:verify-malta.config
  rmgroup:cmeli@cis.um.edu.mt:malta.*:verify-malta.config
***************
*** 864,869 ****
--- 963,971 ----
  ## MAUS ( MausNet, German )
  # *PGP*   See comment at top of file. 
  # Key fingerprint: 82 52 C7 70 26 B9 72 A1  37 98 55 98 3F 26 62 3E
+ checkgroups:*:maus.*:drop
+ newgroup:*:maus.*:drop
+ rmgroup:*:maus.*:drop
  checkgroups:guenter@gst0hb.north.de:maus.*:verify-maus-info
  checkgroups:guenter@gst0hb.hb.provi.de:maus.*:verify-maus-info
  newgroup:guenter@gst0hb.north.de:maus.*:verify-maus-info
***************
*** 904,909 ****
--- 1006,1014 ----
  # Contact: usenet@newsgate.mensa.org
  # Key fingerprint:  A7 57 24 49 C0 D4 47 33  84 A0 52 6E F1 A4 00 5B
  # *PGP*   See comment at top of file.
+ checkgroups:*:mensa.*:drop
+ newgroup:*:mensa.*:drop
+ rmgroup:*:mensa.*:drop
  checkgroups:usenet@newsgate.mensa.org:mensa.*:verify-mensa.config
  newgroup:usenet@newsgate.mensa.org:mensa.*:verify-mensa.config
  rmgroup:usenet@newsgate.mensa.org:mensa.*:verify-mensa.config
***************
*** 935,940 ****
--- 1040,1048 ----
  ## MUC (Munchen (Munich), Germany)
  # *PGP*   See comment at top of file.
  # Key fingerprint = 43 C7 0E 7C 45 C7 06 E0  BD 6F 76 CE 07 39 5E 66
+ checkgroups:*:muc.*:drop
+ newgroup:*:muc.*:drop
+ rmgroup:*:muc.*:drop
  checkgroups:muc-cmsg@muenchen.pro-bahn.org:muc.*:verify-muc.admin
  newgroup:muc-cmsg@muenchen.pro-bahn.org:muc.*:verify-muc.admin
  rmgroup:muc-cmsg@muenchen.pro-bahn.org:muc.*:verify-muc.admin
***************
*** 991,996 ****
--- 1099,1107 ----
  # URL: http://www.usenet2.org
  # *PGP*   See comment at top of file.
  # Key fingerprint: D7 D3 5C DB 18 6A 29 79  BF 74 D4 58 A3 78 9D 22
+ checkgroups:*:net.*:drop
+ newgroup:*:net.*:drop
+ rmgroup:*:net.*:drop
  checkgroups:control@usenet2.org:net.*:verify-control@usenet2.org
  newgroup:control@usenet2.org:net.*:verify-control@usenet2.org
  rmgroup:control@usenet2.org:net.*:verify-control@usenet2.org
***************
*** 1001,1006 ****
--- 1112,1120 ----
  # URL: http://www.mozilla.org/community.html
  # URL: http://www.mozilla.org/newsfeeds.html
  # Key fingerprint = B7 80 55 12 1F 9C 17 0B  86 66 AD 3B DB 68 35 EC
+ checkgroups:*:netscape.*:drop
+ newgroup:*:netscape.*:drop
+ rmgroup:*:netscape.*:drop
  checkgroups:news@netscape.com:netscape.*:verify-netscape.public.admin
  newgroup:news@netscape.com:netscape.*:verify-netscape.public.admin
  rmgroup:news@netscape.com:netscape.*:verify-netscape.public.admin
***************
*** 1033,1038 ****
--- 1147,1155 ----
  # URL: http://www.kinkhorst.com/usenet/nladmin.en.html (English)
  # *PGP*   See comment at top of file.
  # Key fingerprint: 45 20 0B D5 A1 21 EA 7C  EF B2 95 6C 25 75 4D 27
+ checkgroups:*:nl.*:drop
+ newgroup:*:nl.*:drop
+ rmgroup:*:nl.*:drop
  checkgroups:nl-admin@nic.surfnet.nl:nl.*:verify-nl.newsgroups
  newgroup:nl-admin@nic.surfnet.nl:nl.*:verify-nl.newsgroups
  rmgroup:nl-admin@nic.surfnet.nl:nl.*:verify-nl.newsgroups
***************
*** 1046,1051 ****
--- 1163,1172 ----
  # Several options are given in the FAQ for creating and removing groups.
  # *PGP*   See comment at top of file.
  # Key fingerprint: 6B 62 EB 53 4D 5D 2F 96  35 D9 C8 9C B0 65 0E 4C
+ checkgroups:*:nl-alt.*:drop
+ rmgroup:*:nl-alt.*:drop
+ rmgroup:*:nl-alt.*:drop
+ checkgroups:nl-alt-janitor@surfer.xs4all.nl:nl-alt.*:verify-nl-alt.config.admin
  newgroup:*@*:nl-alt.*:doit
  rmgroup:nl-alt-janitor@surfer.xs4all.nl:nl-alt.*:verify-nl-alt.config.admin
  rmgroup:news@kink.xs4all.nl:nl-alt.*:verify-nl-alt.config.admin
***************
*** 1061,1069 ****
  ## NO (Norway)
  # See also http://www.usenet.no/
  # *PGP*   See comment at top of file.
  checkgroups:control@usenet.no:no.*:verify-no-hir-control
  newgroup:control@usenet.no:no.*:verify-no-hir-control
- newgroup:*@*.no:no.alt.*:doit
  rmgroup:control@usenet.no:no.*:verify-no-hir-control
  
  # checkgroups:control@usenet.no:no.*:mail
--- 1182,1192 ----
  ## NO (Norway)
  # See also http://www.usenet.no/
  # *PGP*   See comment at top of file.
+ checkgroups:*:no.*:drop
+ newgroup:*:no.*:drop
+ rmgroup:*:no.*:drop
  checkgroups:control@usenet.no:no.*:verify-no-hir-control
  newgroup:control@usenet.no:no.*:verify-no-hir-control
  rmgroup:control@usenet.no:no.*:verify-no-hir-control
  
  # checkgroups:control@usenet.no:no.*:mail
***************
*** 1099,1104 ****
--- 1222,1230 ----
  # URL: http://usenet.net.nz
  # URL: http://www.faqs.org/faqs/usenet/nz-news-hierarchy
  # PGP fingerprint: 07 DF 48 AA D0 ED AA 88  16 70 C5 91 65 3D 1A 28
+ checkgroups:*:nz.*:drop
+ newgroup:*:nz.*:drop
+ rmgroup:*:nz.*:drop
  checkgroups:root@usenet.net.nz:nz.*:verify-nz-hir-control
  newgroup:root@usenet.net.nz:nz.*:verify-nz-hir-control
  rmgroup:root@usenet.net.nz:nz.*:verify-nz-hir-control
***************
*** 1151,1156 ****
--- 1277,1285 ----
  
  ## PGH (Pittsburgh, Pennsylvania, USA)
  # *PGP*   See comment at top of file.
+ checkgroups:*:pgh.*:drop
+ newgroup:*:pgh.*:drop
+ rmgroup:*:pgh.*:drop
  checkgroups:pgh-config@psc.edu:pgh.*:verify-pgh.config
  newgroup:pgh-config@psc.edu:pgh.*:verify-pgh.config
  rmgroup:pgh-config@psc.edu:pgh.*:verify-pgh.config
***************
*** 1181,1186 ****
--- 1310,1318 ----
  ## PL (Poland and Polish language)
  ## For more info, see http://www.ict.pwr.wroc.pl/doc/news-pl-new-site-faq.html
  # *PGP*   See comment at top of file.
+ checkgroups:*:pl.*:drop
+ newgroup:*:pl.*:drop
+ rmgroup:*:pl.*:drop
  checkgroups:michalj@*fuw.edu.pl:pl.*:verify-pl.announce.newgroups
  checkgroups:newgroup@usenet.pl:pl.*:verify-pl.announce.newgroups
  newgroup:michalj@*fuw.edu.pl:pl.*:verify-pl.announce.newgroups
***************
*** 1212,1217 ****
--- 1344,1352 ----
  rmgroup:*@*:psu.*:doit
  
  ## PT (Portugal and Portuguese language)
+ checkgroups:*:pt.*:drop
+ newgroup:*:pt.*:drop
+ rmgroup:*:pt.*:drop
  checkgroups:pmelo@*.inescc.pt:pt.*:verify-control@usenet-pt.org
  newgroup:pmelo@*.inescc.pt:pt.*:verify-control@usenet-pt.org
  rmgroup:pmelo@*.inescc.pt:pt.*:verify-control@usenet-pt.org
***************
*** 1226,1231 ****
--- 1361,1369 ----
  # The official list of relcom groups is supposed to be available from
  # URL: ftp://ftp.kiae.su/relcom/netinfo/telconfs.txt
  # *PGP*   See comment at top of file.
+ checkgroups:*:relcom.*:drop
+ newgroup:*:relcom.*:drop
+ rmgroup:*:relcom.*:drop
  checkgroups:coord@new*.relcom.ru:relcom.*:verify-relcom.newsgroups
  newgroup:coord@new*.relcom.ru:relcom.*:verify-relcom.newsgroups
  rmgroup:coord@new*.relcom.ru:relcom.*:verify-relcom.newsgroups
***************
*** 1248,1253 ****
--- 1386,1394 ----
  # *PGP*   See comment at top of file.
  # Contact: satgroup@endicor.com
  # URL: http://www.endicor.com/~satgroup/
+ checkgroups:*:sat.*:drop
+ newgroup:*:sat.*:drop
+ rmgroup:*:sat.*:drop
  checkgroups:satgroup@endicor.com:sat.*:verify-satgroup@endicor.com
  newgroup:satgroup@endicor.com:sat.*:verify-satgroup@endicor.com
  rmgroup:satgroup@endicor.com:sat.*:verify-satgroup@endicor.com
***************
*** 1268,1273 ****
--- 1409,1417 ----
  # Key fingerprint = 64 06 F0 AE E1 46 85 0C  BD CA 0E 53 8B 1E 73 D2
  # Key URL: http://home.pages.de/~schule-admin/schule.asc
  # *PGP*   See comment at top of file.
+ checkgroups:*:schule.*:drop
+ newgroup:*:schule.*:drop
+ rmgroup:*:schule.*:drop
  checkgroups:newsctrl@schule.de:schule.*:verify-schule.konfig
  newgroup:newsctrl@schule.de:schule.*:verify-schule.konfig
  rmgroup:newsctrl@schule.de:schule.*:verify-schule.konfig
***************
*** 1292,1300 ****
  # Key URL:  http://www.usenet-se.net/pgp-key.txt
  # Key fingerprint = 68 03 F0 FD 0C C3 4E 69  6F 0D 0C 60 3C 58 63 96
  # *PGP*   See comment at top of file.
  newgroup:usenet@usenet-se.net:se.*:verify-usenet-se
  rmgroup:usenet@usenet-se.net:se.*:verify-usenet-se
- checkgroups:usenet@usenet-se.net:se.*:verify-usenet-se
  
  #newgroup:usenet@usenet-se.net:se.*:doit
  #rmgroup:usenet@usenet-se.net:se.*:doit
--- 1436,1447 ----
  # Key URL:  http://www.usenet-se.net/pgp-key.txt
  # Key fingerprint = 68 03 F0 FD 0C C3 4E 69  6F 0D 0C 60 3C 58 63 96
  # *PGP*   See comment at top of file.
+ checkgroups:*:se.*:drop
+ newgroup:*:se.*:drop
+ rmgroup:*:se.*:drop
+ checkgroups:usenet@usenet-se.net:se.*:verify-usenet-se
  newgroup:usenet@usenet-se.net:se.*:verify-usenet-se
  rmgroup:usenet@usenet-se.net:se.*:verify-usenet-se
  
  #newgroup:usenet@usenet-se.net:se.*:doit
  #rmgroup:usenet@usenet-se.net:se.*:doit
***************
*** 1316,1321 ****
--- 1463,1471 ----
  
  ## SI (The Republic of Slovenia)
  # *PGP*   See comment at top of file.
+ checkgroups:*:si.*:drop
+ newgroup:*:si.*:drop
+ rmgroup:*:si.*:drop
  checkgroups:news-admin@arnes.si:si.*:verify-si.news.announce.newsgroups
  newgroup:news-admin@arnes.si:si.*:verify-si.news.announce.newsgroups
  rmgroup:news-admin@arnes.si:si.*:verify-si.news.announce.newsgroups
***************
*** 1403,1408 ****
--- 1553,1561 ----
  ## THUR ( Thuringia, Germany )
  # *PGP*   See comment at top of file.
  # Key Fingerprint: 7E 3D 73 13 93 D4 CA 78  39 DE 3C E7 37 EE 22 F1
+ checkgroups:*:thur.*:drop
+ newgroup:*:thur.*:drop
+ rmgroup:*:thur.*:drop
  checkgroups:usenet@thur.de:thur.*:verify-thur.net.news.groups
  newgroup:usenet@thur.de:thur.*:verify-thur.net.news.groups
  rmgroup:usenet@thur.de:thur.*:verify-thur.net.news.groups
***************
*** 1446,1451 ****
--- 1599,1608 ----
  
  ## UCB ( University of California Berkeley, USA)
  # Contact: Chris van den Berg <usenet@agate.berkeley.edu>
+ checkgroups:*:ucb.*:drop
+ newgroup:*:ucb.*:drop
+ rmgroup:*:ucb.*:drop
+ checkgroups:usenet@agate.berkeley.edu:ucb.*:verify-ucb.news
  newgroup:usenet@agate.berkeley.edu:ucb.*:verify-ucb.news
  rmgroup:usenet@agate.berkeley.edu:ucb.*:verify-ucb.news
  
***************
*** 1461,1469 ****
  # Key fingerprint = F7 AD 96 D8 7A 3F 7E 84  02 0C 83 9A DB 8F EB B8
  # Syncable server: news.mayn.de (contact news@mayn.de if permission denied)
  # *PGP*   See comment at top of file.
  newgroup:news@mayn.de:ufra.*:verify-news.mayn.de
  rmgroup:news@mayn.de:ufra.*:verify-news.mayn.de
- checkgroups:news@mayn.de:ufra.*:verify-news.mayn.de
  
  # newgroup:news@mayn.de:ufra.*:verify-news.mayn.de
  # rmgroup:news@mayn.de:ufra.*:verify-news.mayn.de
--- 1618,1629 ----
  # Key fingerprint = F7 AD 96 D8 7A 3F 7E 84  02 0C 83 9A DB 8F EB B8
  # Syncable server: news.mayn.de (contact news@mayn.de if permission denied)
  # *PGP*   See comment at top of file.
+ checkgroups:*:ufra.*:drop
+ newgroup:*:ufra.*:drop
+ rmgroup:*:ufra.*:drop
+ checkgroups:news@mayn.de:ufra.*:verify-news.mayn.de
  newgroup:news@mayn.de:ufra.*:verify-news.mayn.de
  rmgroup:news@mayn.de:ufra.*:verify-news.mayn.de
  
  # newgroup:news@mayn.de:ufra.*:verify-news.mayn.de
  # rmgroup:news@mayn.de:ufra.*:verify-news.mayn.de
***************
*** 1477,1482 ****
--- 1637,1645 ----
  
  ## UK (United Kingdom of Great Britain and Northern Ireland)
  # *PGP*   See comment at top of file.
+ checkgroups:*:uk.*:drop
+ newgroup:*:uk.*:drop
+ rmgroup:*:uk.*:drop
  checkgroups:control@usenet.org.uk:uk.*:verify-uk.net.news.announce
  newgroup:control@usenet.org.uk:uk.*:verify-uk.net.news.announce
  rmgroup:control@usenet.org.uk:uk.*:verify-uk.net.news.announce
***************
*** 1507,1512 ****
--- 1670,1678 ----
  ## UN (The United Nations)
  # URL: http://www.itu.int/Conferences/un/
  # *PGP*   See comment at top of file.
+ checkgroups:*:un.*:drop
+ newgroup:*:un.*:drop
+ rmgroup:*:un.*:drop
  checkgroups:news@news.itu.int:un.*:verify-ungroups@news.itu.int
  newgroup:news@news.itu.int:un.*:verify-ungroups@news.itu.int
  rmgroup:news@news.itu.int:un.*:verify-ungroups@news.itu.int
***************
*** 1589,1597 ****
  ## WALES (Wales)
  # Contact: control@A470.demon.co.uk
  # *PGP*   See comment at top of file.
  newgroup:control@*470.demon.co.uk:wales.*:verify-wales.config
  rmgroup:control@*470.demon.co.uk:wales.*:verify-wales.config
- checkgroups:control@*470.demon.co.uk:wales.*:verify-wales.config
  
  ## WASH (Washington State, USA)
  newgroup:graham@ee.washington.edu:wash.*:doit
--- 1755,1766 ----
  ## WALES (Wales)
  # Contact: control@A470.demon.co.uk
  # *PGP*   See comment at top of file.
+ checkgroups:*:wales.*:drop
+ newgroup:*:wales.*:drop
+ rmgroup:*:wales.*:drop
+ checkgroups:control@*470.demon.co.uk:wales.*:verify-wales.config
  newgroup:control@*470.demon.co.uk:wales.*:verify-wales.config
  rmgroup:control@*470.demon.co.uk:wales.*:verify-wales.config
  
  ## WASH (Washington State, USA)
  newgroup:graham@ee.washington.edu:wash.*:doit
***************
*** 1638,1643 ****
--- 1807,1815 ----
  ## Z-NETZ (German non internet based network.)
  # *PGP*   See comment at top of file.
  # MAIL: pgp-public-keys@informatik.uni-hamburg.de Subject: GET 0x40145FC9
+ checkgroups:*:z-netz.*:drop
+ newgroup:*:z-netz.*:drop
+ rmgroup:*:z-netz.*:drop
  checkgroups:dirk.meyer@dinoex.sub.org:z-netz.*:verify-checkgroups-dinoex
  newgroup:dirk.meyer@dinoex.sub.org:z-netz.*:verify-checkgroups-dinoex
  newgroup:*@*.de:z-netz.alt.*:doit
diff -Nacr inn-2.2.1/samples/inncheck.in inn-2.2.2/samples/inncheck.in
*** inn-2.2.1/samples/inncheck.in	Wed Jun  2 02:48:49 1999
--- inn-2.2.2/samples/inncheck.in	Mon Dec 13 13:18:37 1999
***************
*** 1,5 ****
  #!@_PATH_PERL@ --
! ##  $Revision: 1.22.2.6 $
  ##  Sanity-check the configuration of an INN system
  ##  by Brendan Kehoe <brendan@cygnus.com> and Rich $alz.
  
--- 1,5 ----
  #!@_PATH_PERL@ --
! ##  $Revision: 1.22.2.7 $
  ##  Sanity-check the configuration of an INN system
  ##  by Brendan Kehoe <brendan@cygnus.com> and Rich $alz.
  
***************
*** 719,724 ****
--- 719,726 ----
  
      input: while ( <IN> ) {
  	next input if &spacious($file, ++$line);
+ 
+ 	next input if (/^%DEFINE/);
  
  	unless ( ($host, $perm, $user, $pass, $groups) =
  	    /^([^:])+:([^:]*):([^:]*):([^:]*):([^:]+)$/ ) {
diff -Nacr inn-2.2.1/samples/innmail.in inn-2.2.2/samples/innmail.in
*** inn-2.2.1/samples/innmail.in	Mon Jun 21 00:58:42 1999
--- inn-2.2.2/samples/innmail.in	Mon Dec 13 13:18:37 1999
***************
*** 4,10 ****
  # Start Date:   Fri, 25 Apr 1997 14:11:23 +0200
  # Project:      INN
  # File:         innmail.pl
! # RCSId:        $Id: innmail.in,v 1.9.2.1 1999/06/21 00:58:42 tale Exp $
  # Description:  A simple replacement for UCB Mail to avoid nasty security
  #		problems. 
  # 
--- 4,10 ----
  # Start Date:   Fri, 25 Apr 1997 14:11:23 +0200
  # Project:      INN
  # File:         innmail.pl
! # RCSId:        $Id: innmail.in,v 1.9.2.2 1999/10/12 16:43:26 rra Exp $
  # Description:  A simple replacement for UCB Mail to avoid nasty security
  #		problems. 
  # 
***************
*** 69,75 ****
      die "$0: Fork failed: $!\n" ;
  }
  
! print MTA "To:\t", join (",\n\t",@addrs), "\n" ;
  print MTA "Subject: $opt_s\n" ;
  print MTA "\n" ;
  while (<STDIN>) {
--- 69,75 ----
      die "$0: Fork failed: $!\n" ;
  }
  
! print MTA "To: ", join (",\n\t",@addrs), "\n" ;
  print MTA "Subject: $opt_s\n" ;
  print MTA "\n" ;
  while (<STDIN>) {
diff -Nacr inn-2.2.1/samples/innreport.in inn-2.2.2/samples/innreport.in
*** inn-2.2.1/samples/innreport.in	Sun May  9 00:36:53 1999
--- inn-2.2.2/samples/innreport.in	Mon Dec 13 13:18:37 1999
***************
*** 193,198 ****
--- 193,200 ----
  $HTML = 0 if defined ($ref{'html'});
  $HTML = 1 if ($ref{'html'});
  
+ $GRAPH = 0 if defined ($output{'default'}{'graph'});
+ $GRAPH = 1 if ($HTML && ($output{'default'}{'graph'} eq 'true'));
  $GRAPH = 0 if (defined ($ref{'g'}) || defined ($ref{'graph'}));
  $GRAPH = 1 if ($HTML && ($ref{'g'} || $ref{'graph'}));
  
***************
*** 847,852 ****
--- 849,855 ----
    }
    $result .= "</TR>\n<TR>$temp</TR>\n";
  
+   $i = 0;
    foreach (sort {$b cmp $a} (keys %data)) {
      if (($CYCLE == 0) || ($i < $CYCLE)) {
        my @list = split /\|/, $data{$_};
***************
*** 864,869 ****
--- 867,873 ----
        $str .= "</TR>\n";
        $result .= "$str";
      }
+     $i++;
    }
    $result .= "</TABLE>\n</CENTER>\n<P><HR>";
    $result .= "<A HREF=\"ftp://ftp.eerie.fr/pub/usenet/innreport/\">innreport";
diff -Nacr inn-2.2.1/samples/innreport_inn.pm inn-2.2.2/samples/innreport_inn.pm
*** inn-2.2.1/samples/innreport_inn.pm	Wed Jun 30 02:01:43 1999
--- inn-2.2.2/samples/innreport_inn.pm	Mon Dec 13 13:18:37 1999
***************
*** 58,64 ****
    if ($prog eq "inn")
    { 
      # accepted article
!     if ($res =~ m/[\+cj]/o)
      {
        $hour =~ s/:.*$//o;
        $inn_flow{"$day $hour"}++;
--- 58,64 ----
    if ($prog eq "inn")
    { 
      # accepted article
!     if ($res =~ m/[\+j]/o)
      {
        $hour =~ s/:.*$//o;
        $inn_flow{"$day $hour"}++;
***************
*** 220,225 ****
--- 220,226 ----
      {
        my $command = $1;
        my $cmd = $ctlinnd{$command};
+       $cmd = $command unless $cmd;
        return 1 if ($cmd eq 'flush'); # to avoid a double count
        $innd_control{"$cmd"}++;
        return 1;
***************
*** 653,670 ****
        my ($server, $seconds, $offered, $accepted, $refused, $rejected,
  	  $missing, $spooled) = ($1, $2, $3, $4, $5, $6, $7, $8);
        $server =~ tr/A-Z/a-z/ unless ($CASE_SENSITIVE);
        $innfeed_seconds{$server} += $seconds;
        $innfeed_offered{$server} += $offered;
        $innfeed_accepted{$server} += $accepted;
        $innfeed_refused{$server} += $refused;
        $innfeed_rejected{$server} += $rejected;
        $innfeed_missing{$server} += $missing;
!       $innfeed_spooled{$server} += $spooled;
        $t_innfeed_seconds{$server} = 0;
        $t_innfeed_offered{$server} = 0;
        $t_innfeed_accepted{$server} = 0;
        $t_innfeed_refused{$server} = 0;
        $t_innfeed_rejected{$server} = 0;
        return 1;
      }
      # final (only seconds & spooled)
--- 654,705 ----
        my ($server, $seconds, $offered, $accepted, $refused, $rejected,
  	  $missing, $spooled) = ($1, $2, $3, $4, $5, $6, $7, $8);
        $server =~ tr/A-Z/a-z/ unless ($CASE_SENSITIVE);
+       $tt_innfeed_seconds{$server} += $seconds;
+       $tt_innfeed_offered{$server} += $offered;
+       $tt_innfeed_accepted{$server} += $accepted;
+       $tt_innfeed_refused{$server} += $refused;
+       $tt_innfeed_missing{$server} += $missing;
+       $tt_innfeed_spooled{$server} += $spooled;
+       $tt_innfeed_rejected{$server} += $rejected;
+       $t_innfeed_seconds{$server} = 0;
+       $t_innfeed_offered{$server} = 0;
+       $t_innfeed_accepted{$server} = 0;
+       $t_innfeed_refused{$server} = 0;
+       $t_innfeed_missing{$server} = 0;
+       $t_innfeed_spooled{$server} = 0;
+       $t_innfeed_rejected{$server} = 0;
+       return 1;
+     }
+     # global (real)
+     if ($left =~ /(\S+) global seconds (\d+) offered (\d+) accepted (\d+) refused (\d+) rejected (\d+) missing (\d+)/o)
+     {
+       my ($server, $seconds, $offered, $accepted, $refused, $rejected,
+ 	  $missing) = ($1, $2, $3, $4, $5, $6, $7);
+       if ($server eq "ME") {
+         return 1;
+       }
+       $server =~ tr/A-Z/a-z/ unless ($CASE_SENSITIVE);
        $innfeed_seconds{$server} += $seconds;
        $innfeed_offered{$server} += $offered;
        $innfeed_accepted{$server} += $accepted;
        $innfeed_refused{$server} += $refused;
        $innfeed_rejected{$server} += $rejected;
        $innfeed_missing{$server} += $missing;
!       $innfeed_spooled{$server} += $spooled + $t_innfeed_spooled{$server};
        $t_innfeed_seconds{$server} = 0;
        $t_innfeed_offered{$server} = 0;
        $t_innfeed_accepted{$server} = 0;
        $t_innfeed_refused{$server} = 0;
+       $t_innfeed_missing{$server} = 0;
+       $t_innfeed_spooled{$server} = 0;
        $t_innfeed_rejected{$server} = 0;
+       $tt_innfeed_seconds{$server} = 0;
+       $tt_innfeed_offered{$server} = 0;
+       $tt_innfeed_accepted{$server} = 0;
+       $tt_innfeed_refused{$server} = 0;
+       $tt_innfeed_missing{$server} = 0;
+       $tt_innfeed_spooled{$server} = 0;
+       $tt_innfeed_rejected{$server} = 0;
        return 1;
      }
      # final (only seconds & spooled)
***************
*** 1600,1606 ****
    ## from innreport although the data in the logs is correctly
    ## parsed and understood).
    
!   if (%t_innfeed_seconds && !(%innfeed_seconds))
    {
      # do it only of there are no data recorded but temporary
      my $server;
--- 1635,1641 ----
    ## from innreport although the data in the logs is correctly
    ## parsed and understood).
    
!   if (%t_innfeed_seconds)
    {
      # do it only of there are no data recorded but temporary
      my $server;
***************
*** 1611,1616 ****
--- 1646,1668 ----
        $innfeed_accepted{$server} += $t_innfeed_accepted{$server}; 
        $innfeed_refused{$server} += $t_innfeed_refused{$server};
        $innfeed_rejected{$server} += $t_innfeed_rejected{$server};
+       $innfeed_missing{$server} += $t_innfeed_missing{$server};
+       $innfeed_spooled{$server} += $t_innfeed_spooled{$server};
+     }
+   }
+   if (%tt_innfeed_seconds)
+   {
+     # do it only of there are no data recorded but temporary
+     my $server;
+     foreach $server (sort keys (%tt_innfeed_seconds))
+     {
+       $innfeed_seconds{$server} += $tt_innfeed_seconds{$server};
+       $innfeed_offered{$server} += $tt_innfeed_offered{$server};
+       $innfeed_accepted{$server} += $tt_innfeed_accepted{$server}; 
+       $innfeed_refused{$server} += $tt_innfeed_refused{$server};
+       $innfeed_rejected{$server} += $tt_innfeed_rejected{$server};
+       $innfeed_missing{$server} += $tt_innfeed_missing{$server};
+       $innfeed_spooled{$server} += $tt_innfeed_spooled{$server};
      }
    }
    
diff -Nacr inn-2.2.1/samples/innshellvars.pl.in inn-2.2.2/samples/innshellvars.pl.in
*** inn-2.2.1/samples/innshellvars.pl.in	Sat Oct 17 01:07:27 1998
--- inn-2.2.2/samples/innshellvars.pl.in	Mon Dec 13 13:18:37 1999
***************
*** 3,9 ****
  # Start Date:   Sat, 24 Aug 1996 22:08:19 +0200
  # Project:      INN 
  # File:         innshellvars.pl
! # RCSId:        $Id: innshellvars.pl.in,v 1.20 1998/10/17 01:07:27 tale Exp $
  # Description:  Set up any and all variables that an INN perl script
  #               might need.
  
--- 3,9 ----
  # Start Date:   Sat, 24 Aug 1996 22:08:19 +0200
  # Project:      INN 
  # File:         innshellvars.pl
! # RCSId:        $Id: innshellvars.pl.in,v 1.20.2.1 1999/10/26 01:37:53 kondou Exp $
  # Description:  Set up any and all variables that an INN perl script
  #               might need.
  
***************
*** 30,36 ****
  $newsbin = $pathbin;
  $innddir = $pathrun;
  $newsetc = $pathetc;
- $newslib = $pathlib;
  $newslbin = "$pathnews/local";
  
  $active = "${pathdb}/active" ;
--- 30,35 ----
diff -Nacr inn-2.2.1/samples/innshellvars.tcl.in inn-2.2.2/samples/innshellvars.tcl.in
*** inn-2.2.1/samples/innshellvars.tcl.in	Sat Oct 17 01:07:28 1998
--- inn-2.2.2/samples/innshellvars.tcl.in	Mon Dec 13 13:18:37 1999
***************
*** 4,10 ****
  # Start Date:   Sat, 24 Aug 1996 23:45:34 +0200
  # Project:      INN
  # File:         innshellvars.tcl
! # RCSId:        $Id: innshellvars.tcl.in,v 1.18 1998/10/17 01:07:28 tale Exp $
  # Description:  Set up any and all variables that an INN tcl script
  #               might need.
  
--- 4,10 ----
  # Start Date:   Sat, 24 Aug 1996 23:45:34 +0200
  # Project:      INN
  # File:         innshellvars.tcl
! # RCSId:        $Id: innshellvars.tcl.in,v 1.18.2.1 1999/10/26 01:37:54 kondou Exp $
  # Description:  Set up any and all variables that an INN tcl script
  #               might need.
  
***************
*** 30,36 ****
  set inn_locks "${inn_pathrun}"
  set inn_newsbin "${inn_pathbin}"
  set inn_newsetc "${inn_newshome}/etc"
- set inn_newslib "${inn_newshome}/lib"
  
  set inn_active "${inn_pathdb}/active"
  set inn_activetimes "${inn_pathdb}/active.times"
--- 30,35 ----
diff -Nacr inn-2.2.1/samples/nntpsend.in inn-2.2.2/samples/nntpsend.in
*** inn-2.2.1/samples/nntpsend.in	Mon Jun 28 09:32:31 1999
--- inn-2.2.2/samples/nntpsend.in	Mon Dec 13 13:18:37 1999
***************
*** 1,5 ****
  #!@_PATH_SH@
! ##  $Revision: 1.11.2.1 $
  ##  Send news via NNTP by running several innxmit processes in the background.
  ##  Usage:
  ##	nntpsend [-n][-p][-r][-s size][-S][-t timeout][-T limit][host fqdn]...
--- 1,5 ----
  #!@_PATH_SH@
! ##  $Revision: 1.11.2.2 $
  ##  Send news via NNTP by running several innxmit processes in the background.
  ##  Usage:
  ##	nntpsend [-n][-p][-r][-s size][-S][-t timeout][-T limit][host fqdn]...
***************
*** 352,358 ****
      if [ -f "${SITE}.work" ] ; then
  	if [ X${STORAGEAPI} = X"true" -o X${STORAGEAPI} = X"yes" -o \
  			X${STORAGEAPI} = X"on" ]; then
! 	    mv "${SITE}.work" "${BATCHFILE}"
  	else
  	    sort "${SITE}.work" >>"${BATCHFILE}"
  	    rm -f "${SITE}.work"
--- 352,359 ----
      if [ -f "${SITE}.work" ] ; then
  	if [ X${STORAGEAPI} = X"true" -o X${STORAGEAPI} = X"yes" -o \
  			X${STORAGEAPI} = X"on" ]; then
! 	    cat "${SITE}.work" >>"${BATCHFILE}"
! 	    rm -f "${SITE}.work"
  	else
  	    sort "${SITE}.work" >>"${BATCHFILE}"
  	    rm -f "${SITE}.work"
***************
*** 364,370 ****
  	if ctlinnd -s -t30 flush ${SITE} ; then
  	    if [ X${STORAGEAPI} = X"true" -o X${STORAGEAPI} = X"yes" -o \
  			X${STORAGEAPI} = X"on" ]; then
! 		mv ${SITE}.work "${BATCHFILE}"
  	    else
  		sort ${SITE}.work >>"${BATCHFILE}"
  		rm -f ${SITE}.work
--- 365,372 ----
  	if ctlinnd -s -t30 flush ${SITE} ; then
  	    if [ X${STORAGEAPI} = X"true" -o X${STORAGEAPI} = X"yes" -o \
  			X${STORAGEAPI} = X"on" ]; then
! 		cat ${SITE}.work >>"${BATCHFILE}"
! 		rm -f ${SITE}.work
  	    else
  		sort ${SITE}.work >>"${BATCHFILE}"
  		rm -f ${SITE}.work
diff -Nacr inn-2.2.1/samples/parsecontrol.in inn-2.2.2/samples/parsecontrol.in
*** inn-2.2.1/samples/parsecontrol.in	Wed Aug  4 03:22:12 1999
--- inn-2.2.2/samples/parsecontrol.in	Mon Dec 13 13:18:37 1999
***************
*** 1,5 ****
  #!@_PATH_SH@
! ##  $Revision: 1.18.2.2 $
  ##  Initial parsing of control messages.
  
  . @LIBDIR@/innshellvars
--- 1,5 ----
  #!@_PATH_SH@
! ##  $Revision: 1.18.2.3 $
  ##  Initial parsing of control messages.
  
  . @LIBDIR@/innshellvars
***************
*** 141,147 ****
  	    ;;
  	*)
  	    ACTION=${ACT_PAT}
! 	    NEWSGROUPPATS=`echo X${NG_PAT} | ${SED} -e 's/^X//' -e 's/^/\\\\^/' -e 's/\|/\\\\|\\\\^/g'`
  	    ;;
  	esac
      ;;
--- 141,147 ----
  	    ;;
  	*)
  	    ACTION=${ACT_PAT}
! 	    NEWSGROUPPATS=`echo X${NG_PAT} | ${SED} -e 's/^X//' -e 's/^/\\\\^/' -e 's/|/\\\\|\\\\^/g'`
  	    ;;
  	esac
      ;;
diff -Nacr inn-2.2.1/samples/pgpverify.in inn-2.2.2/samples/pgpverify.in
*** inn-2.2.1/samples/pgpverify.in	Thu May 20 14:59:02 1999
--- inn-2.2.2/samples/pgpverify.in	Mon Dec 13 13:18:37 1999
***************
*** 352,358 ****
          }
        }
        
!       ($facility, $level) = ($syslog =~ /^(w+)\.(\w+)$/);
  
        # unfortunately, there is no way to definitively know in this program if
        # the message was logged.  I wish there were a way to send a message
--- 352,358 ----
          }
        }
        
!       ($facility, $level) = ($syslog =~ /^(\w+)\.(\w+)$/);
  
        # unfortunately, there is no way to definitively know in this program if
        # the message was logged.  I wish there were a way to send a message