diff -ruNp inn-2.4.2/CONTRIBUTORS inn-2.4.3/CONTRIBUTORS
--- inn-2.4.2/CONTRIBUTORS	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/CONTRIBUTORS	Mon Mar 20 04:14:57 2006
@@ -257,4 +257,5 @@ Andreas Lamrecht, Duane Currie, Ian Dick
 Jochen Erwied, Rebecca Ore, Felicia Neff, Antonio Querubin, Bear Giles,
 Christopher P. Lindsey, Winfried Szukalski, Edvard Tuinder,
 Frank McConnell, Ilya Kovalenko, Steve Youngs, Jacek Konieczny,
-Ilya Voronin, Sergey Babitch, WATANABE Katsuhiro
+Ilya Voronin, Sergey Babitch, WATANABE Katsuhiro, Chris Caputo,
+Thomas Parmelan
diff -ruNp inn-2.4.2/ChangeLog inn-2.4.3/ChangeLog
--- inn-2.4.2/ChangeLog	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/ChangeLog	Mon Mar 20 04:14:57 2006
@@ -1,1004 +1,452 @@
-2004-12-22 04:20  rra
-
-	* samples/actsync.cfg: The active file is now gzipped, not
-	  compressed.
-
-2004-12-22 04:20  rra
-
-	* samples/actsync.ign: Fix the Big Eight listing (humanities.*, not
-	  gnu.*).
-
-2004-12-20 03:33  rra
-
-	* storage/cnfs/cnfs.c: Reorder code a little so that the message
-	  about a cycbuff rolling over contains the right new cycbuff.
-	  Reported by Christoph Biedl.
-
-2004-12-20 03:26  rra
-
-	* MANIFEST, doc/man/inews.1, doc/pod/Makefile, doc/pod/inews.pod:
-	  Convert the inews documentation to POD and significantly update
-	  it, taking out more documentation of things that it no longer
-	  does and including more complete documentation of the checks that
-	  it performs.
-
-2004-12-20 03:19  rra
-
-	* doc/pod/inews.pod: Convert the inews documentation to POD and
-	  significantly update it, taking out more documentation of things
-	  that it no longer does and including more complete documentation
-	  of the checks that it performs.
-
-2004-12-20 01:43  hkehoe
-
-	* configure, configure.in, frontends/ovdb_stat.c,
-	  storage/ovdb/ovdb.c: Add support for BerkeleyDB 4.3
-
-2004-12-19 22:15  rra
-
-	* frontends/inews.c: Use die, not sysdie, if the response from the
-	  server isn't what we expect, since errno isn't going to contain
-	  anything useful.
-
-2004-12-19 21:49  rra
-
-	* innfeed/startinnfeed.c: Don't unlimit the stack size.  This
-	  really shouldn't be needed, and it causes bizarre things to
-	  happen on some versions of Linux.
-
-2004-12-19 21:47  rra
-
-	* backends/news2mail.in: Use news as the sender, not <news>, as the
-	  latter is a sendmailism that sendmail doesn't even need.
-
-2004-12-19 21:40  rra
-
-	* doc/man/ctlinnd.8: Document the restriction on the use of
-	  changegroup.
-
-2004-12-19 21:36  rra
-
-	* frontends/cnfsstat.in, scripts/innreport_inn.pm: Report CNFS
-	  buffer length as a floating point number instead of an integer
-	  number of megabytes, and adjust innreport to cope.
-
-2004-12-19 21:27  rra
-
-	* scripts/rc.news.in: Close stdout when scheduling innwatch and
-	  cnfsstat to run in the future, since otherwise some shells will
-	  sit around and wait for sleep to finish.  Reported by Felix Klee.
-
-2004-12-19 20:55  rra
-
-	* doc/man/dbz.3: man pages should have only one NAME line.
-	  Reported by Eric Raymond.
-
-2004-12-19 20:49  rra
-
-	* doc/: pod/nnrpd.pod, man/nnrpd.8: Add documentation of how to run
-	  nnrpd with SSL support.
-
-2004-12-19 19:54  rra
-
-	* doc/: man/nnrpd.8, pod/nnrpd.pod: Add some missing =back
-	  commands.
-
-2004-12-19 19:50  rra
-
-	* Makefile: Put the key into a different file than the certificate
-	  in make cert.
-
-2004-12-19 19:49  rra
-
-	* samples/sasl.conf.in: Put the key into a separate file from the
-	  certificate.
-
-2004-12-19 19:48  rra
-
-	* doc/: man/sasl.conf.5, pod/sasl.conf.pod: Improve the
-	  installation instructions to put the key into a separate file and
-	  to set the permissions on it correctly.
-
-2004-12-19 19:41  rra
-
-	* doc/: man/tdx-util.8, pod/tdx-util.pod: The documentation for -i
-	  and -g was reversed relative to what the program actually did.
-	  Reported by WATANABE Katsuhiro.
-
-2004-12-19 19:37  rra
-
-	* MANIFEST, doc/man/grephistory.1, doc/pod/Makefile,
-	  doc/pod/grephistory.pod: Convert the grephistory man page to POD
-	  and clean up some historic references to article file names.
-	  Update the exact string that grephistory prints when it can't
-	  find an article.
-
-2004-12-19 08:57  rra
-
-	* doc/pod/grephistory.pod: Convert the grephistory man page to POD
-	  and clean up some historic references to article file names.
-	  Update the exact string that grephistory prints when it can't
-	  find an article.
-
-2004-12-19 08:33  rra
-
-	* expire/grephistory.c: Exit with an error status if the message ID
-	  wasn't found, for consistency with the man page and previous
-	  versions.
-
-2004-12-19 08:24  rra
-
-	* CONTRIBUTORS: Add WATANABE Katsuhiro.
-
-2004-12-19 08:21  rra
-
-	* expire/makehistory.c: Don't add an extra Xref: to the overview
-	  information when cobbling together an Xref header for an article
-	  that doesn't already have one, based on a bug report by WATANABE
-	  Katsuhiro.  Also fix a bug that caused makehistory to skip
-	  processing any articles without Xref headers for which SMprobe to
-	  determine the newsgroup name and article number succeeded.
-
-2004-12-19 08:19  rra
-
-	* storage/tradspool/tradspool.c: When returning the newsgroup name
-	  in response to SMprobe, replace slashes with periods.
-
-2004-12-19 04:39  rra
-
-	* storage/tradspool/tradspool.c: In tradspool_cancel, free xrefs if
-	  the Xref header were present but contained no groups to plug a
-	  minor memory leak.  Reported by WATANABE Katsuhiro.
-
-2004-11-29 00:31  rra
-
-	* samples/control.ctl: Add pgsql.*.
-
-2004-11-16 02:12  rra
-
-	* samples/control.ctl: Add a URL for dfw.*.
-
-2004-11-10 04:45  rra
-
-	* README, doc/pod/readme.pod: More minor wording changes requested
-	  by ISC folks.
-
-2004-11-10 03:33  rra
-
-	* doc/pod/readme.pod, README: Update the ISC's activities.
-
-2004-10-14 01:51  rra
-
-	* NEWS, doc/pod/news.pod: Add documentation of the change to the
-	  status codes for the GROUP command.
-
-2004-10-14 01:49  rra
-
-	* nnrpd/group.c: We had previously returned 411 (group doesn't
-	  exist) if the user didn't have permission to read the group for
-	  all cases other than Python dynamic authentication (where we
-	  returned 502 for permission denied).	I can sort of understand
-	  the dubious security mindset behind this choice, but at least
-	  when the user isn't already authenticated, this breaks reactive
-	  authentication.
-
-	  Instead, if the user is not authenticated, return 480, and if the
-	  user is authenticated, return 502.  This means that a user can
-	  determine that a group exists by probing for it and seeing if
-	  they get 411 or 502, but the protocol is cleaner.
-
-2004-10-12 21:27  rra
-
-	* samples/control.ctl: Update admin group for x-privat.*.
-
-2004-10-01 06:42  rra
-
-	* support/: config.guess, config.sub: Update to upstream versions
-	  from 2004-06-24.
-
-2004-10-01 06:41  rra
-
-	* HACKING, doc/pod/hacking.pod: Note that new versions of
-	  config.guess, config.sub, and the libtool files can now just be
-	  checked in without any special CVS commands, since we no longer
-	  have local modifications that we need to preserve.
-
-2004-10-01 06:19  rra
-
-	* doc/: man/nnrpd.8, pod/nnrpd.pod: Document that nnrpd creates a
-	  PID file when run in daemon mode (-D).
-
-2004-10-01 06:08  rra
-
-	* innfeed/connection.c: Be consistent and allow for all responses
-	  to IHAVE or TAKETHIS to be sent before we're done sending the
-	  article except for successful responses.
-
-2004-10-01 05:52  rra
-
-	* contrib/respool.c, expire/makehistory.c: The argument to SMsetup
-	  for SM_RDWR and SM_PREOPEN must be a bool *, not an int *.  This
-	  makes a difference with some versions of GCC on some platforms.
-
-2004-10-01 05:32  rra
-
-	* scripts/innstat.in: Use sed 1d instead of tail +2 since the
-	  latter isn't POSIX.  Reported by Chris Caputo.
-
-2004-10-01 05:30  rra
-
-	* doc/man/incoming.conf.5: Warn that identd callbacks currently
-	  don't implement any timeout.
-
-2004-10-01 05:10  rra
-
-	* innd/innd.c: Only open the history file during initial startup if
-	  the server wasn't throttled on the command line.  Reported by
-	  John Wehle.
-
-2004-10-01 04:59  rra
-
-	* scripts/innreport_inn.pm: Match either nnrpd or nnrpd-ssl when
-	  finding nnrpd log lines.  Patch from Marco d'Itri.
-
-2004-10-01 04:57  rra
-
-	* nnrpd/list.c: Advertise AUTHINFO USER if the user hasn't already
-	  authenticated.
-
-2004-09-27 01:59  rra
-
-	* nnrpd/tls.c: Include sasl_config.h to get a prototype for the
-	  config function, fixing a bug on 64-bit platforms.
-
-2004-08-25 02:54  rra
-
-	* samples/innreport.conf.in: Fix an inconsistency between the
-	  commented-out html_dir and the commented-out title line.  (Debian
-	  bug #255324.)
-
-2004-07-20 18:56  hkehoe
-
-	* site/Makefile: Added missing PATH_NNRPACCESS definition
-
-2004-07-19 15:38  hkehoe
-
-	* frontends/ovdb_server.c: Need to ignore SIGPIPE to prevent
-	  possible process death
-
-2004-07-16 00:43  rra
-
-	* innd/art.c: The overview copying loop has two indexes; make sure
-	  to advance both of them when unfolding.
-
-2004-07-15 18:56  rra
-
-	* README, doc/pod/readme.pod: Change more occurrences of Internet
-	  Software Consortium to Internet Systems Consortium.
-
-2004-07-15 02:26  rra
-
-	* configure, configure.in: Only check for a PAM library if one of
-	  pam/pam_appl.h or security/pam_appl.h is found.  IRIX has a PAM
-	  library but no header libraries, meaning that we don't want to
-	  try to link ckpasswd against it.
-
-2004-07-15 02:16  rra
-
-	* innd/Makefile, nnrpd/Makefile: Shuffle the order of libraries to
-	  put Perl and Python first, then SSL, and then the additional
-	  libraries.  Not only does this fix a few problems on platforms
-	  where linking order matters, but it's much less likely that the
-	  path to the Perl library will have some other bum version of
-	  another library than vice versa.
-
-2004-07-10 22:53  rra
-
-	* support/: config.guess, config.sub: Merge with mainline to get
-	  the latest imported versions.
-
-2004-06-29 22:43  rra
-
-	* CONTRIBUTORS, innfeed/host.c: Fix an error reporting bug when
-	  checking the bounds of real values.  Reported by Sergey Babitch.
-
-2004-06-29 22:41  rra
-
-	* innfeed/main.c: Log the correct new logging level when it is
-	  being increased or decreased.  Patch from Sergey Babitch.
-
-2004-06-14 14:49  hkehoe
-
-	* configure, configure.in: Add BerkeleyDB 4.2 to configure search
-
-2004-06-10 22:20  hkehoe
-
-	* lib/qio.c: Avoid infinite loop if st_blksize == 0
-
-2004-06-10 22:07  hkehoe
-
-	* expire/makehistory.c: Don't exit if a bad overview line is found,
-	  skip over it instead.
-
-2004-06-10 22:04  hkehoe
-
-	* tests/lib/qio-t.c: Make sure that buffer_size is always at least
-	  as large as QIO_BUFFERSIZE but still a multiple of st_blksize.
-
-2004-06-10 22:04  hkehoe
-
-	* lib/qio.c: Make sure that buffer_size is always at least as large
-	  as QIO_BUFFERSIZE but still a multiple of st_blksize.
-
-	  Change QIO to do something more sane with lines that are too
-	  long.  Rather than returning too long of a line once and then
-	  returning a partial line on the next try, consume all of the
-	  too-long line before returning the first error.  This way, the
-	  next call will still return the next line of the file.
-
-2004-06-08 21:11  hkehoe
-
-	* samples/ovdb.conf, doc/man/ovdb.5, doc/pod/ovdb.pod: Update docs
-	  for nocompact option
-
-2004-06-08 18:54  hkehoe
-
-	* storage/ovdb/ovdb.c: If a group with a large number of overview
-	  records was deleted or compacted, the database could run out of
-	  locks, causing the deletion to fail.	This is because
-	  delete_all_records() was deleting all of the keys in a single
-	  transaction.	Additionally, in the event of a failure of this
-	  type, the records that were to be deleted remain in the database
-	  with no way to remove them (short of rebuilding overview).
-
-	  This fix restructures the code so that delete_all_records() works
-	  in batches of smaller transactions, so it now works with groups
-	  that have arbitrarily large numbers of records to delete.
-	  Further, code was added to insure that records don't get orphaned
-	  in the event that delete_all_records does fail.
-
-2004-06-03 23:58  rra
-
-	* innfeed/main.c: Exit 0 when checking the configuration if the
-	  configuration is fine.  Patch from Sergey Babitch.
-
-2004-06-03 23:52  rra
-
-	* frontends/rnews.c: Fix the comments from the last patch.  It's
-	  not that rnews is setuid root, it's that we want to make sure we
-	  don't write out spool files as root.	The normal case is that
-	  either rnews has no special privileges at all (and can only be
-	  executed by people already in the news group), or is setuid news
-	  (in which case we do nothing, since there's no need to change the
-	  real UID to the news user).
-
-2004-06-03 23:47  rra
-
-	* frontends/rnews.c: The code for changing users was intended to
-	  handle the case where rnews was setuid news, but we don't ever
-	  install it that way (for reasons that I can't remember at the
-	  moment).  Instead, we sometimes install it setuid root.
-
-	  This should be looked at closer in the future, since I think that
-	  setuid news should be sufficient.  But in any event,
-	  setuid(geteuid()) is going to do nothing useful at all in a
-	  setuid root program.	Instead, if either the real or effective
-	  UIDs are 0, figure out the UID of the news user and setuid to it.
-	   If we're setuid news, don't do anything at all.  I believe this
-	  will work in both configurations.
-
-	  Based on a problem reported by Matthias Scheler.
-
-2004-06-02 20:35  hkehoe
-
-	* storage/ovdb/ovdb.c: Bugfix: delete_old_stuff needs to deal with
-	  groupinfo keys that could contain nulls.  This is because of the
-	  way that ovdb_groupadd deals with a deleted (but not yet purged)
-	  group that is re-added (it renames the original groupinfo key to
-	  include a null followed by an integer, in order to hide it).
-
-2004-06-02 20:11  hkehoe
-
-	* history/hisv6/hisv6.c: In hisv6_reopen(), if MMAP_NEEDS_MSYNC and
-	  INND_DBZINCORE are set and nfsreader is false, override INCORE_NO
-	  to INCORE_MMAP
-
-2004-06-02 20:02  hkehoe
-
-	* lib/dbz.c: Put msync call in putcore for INCORE_MMAP Move
-	  writethrough test from dbzsync to putcore because it only applies
-	  to INCORE_MEM
-
-2004-05-27 18:55  rra
-
-	* innd/: art.c, innd.h: Track down more unsigned variables.  Just
-	  make everything signed for this version of INN.  (Wow, I need to
-	  do a better job of backing out of changes.)
-
-2004-05-27 18:52  rra
-
-	* innd/art.c: Switch more variables to a long from a size_t.
-
-2004-05-26 22:27  rra
-
-	* innd/innd.h: The current article parsing code uses Start - 1 as a
-	  marker for various things, and using an unsigned index just isn't
-	  going to work easily.  After reviewing the original patch that
-	  made this change, long should work as well as size_t, so use that
-	  for right now.  This is fixed properly in CURRENT.
-
-2004-05-26 04:34  rra
-
-	* NEWS, doc/pod/news.pod: Flesh out NEWS for the upcoming 2.4.2
-	  release (which will be as soon as STABLE seems, well, stable).
-
-2004-05-26 02:02  rra
-
-	* Makefile, site/Makefile: Automatically create an empty history
-	  database on a first-time install.
-
-2004-05-26 01:47  rra
-
-	* nnrpd/post.c: If the user is not allowed to approve messages,
-	  reject postings containing an Approved header even to unmoderated
-	  groups (some other site may consider the group to be moderated).
-
-2004-05-24 23:14  rra
-
-	* frontends/cnfsstat.in: More fixes for arithmetic on numbers that
-	  are larger than the integer size.  Patch from Christoph Biedl.
-
-2004-05-24 22:41  rra
-
-	* support/install-sh: Don't chown directories that already exist.
-
-2004-05-24 00:12  vinocur
-
-	* innd/art.c: Bugfix from previous changes, supplied by Russ.
-
-2004-05-23 23:56  vinocur
-
-	* frontends/cnfsstat.in: Backport from CURRENT to fix integer
-	  division use that caused incorrect output.
-
-2004-05-20 22:25  rra
-
-	* innd/Makefile, innfeed/Makefile: Fix the output when inndstart
-	  and startinnfeed aren't installed setuid root.
-
-2004-05-20 22:23  rra
-
-	* storage/: Make.methods, buffindexed/buffindexed.c,
-	  buffindexed/ovmethod.mk: Use BUFF_DEBUG rather than DEBUG for
-	  compiling the standalone buffindexed program, since DEBUG is used
-	  by make warnings.
-
-2004-05-20 20:55  rra
-
-	* expire/makehistory.c: Add missing variable declaration.
-
-2004-05-18 12:34  rra
-
-	* innd/art.c: Fix the check for CR without LF, also broken with the
-	  size_t change.
-
-2004-05-18 12:06  rra
-
-	* innd/art.c: Fix another signed vs. unsigned problem in the check
-	  for too large of articles and restructure the code this time to
-	  make it readable.
-
-2004-05-18 09:25  rra
-
-	* doc/compliance-nntp: Fixed overview generation.
-
-2004-05-18 09:22  rra
-
-	* innd/art.c: Fix the overview generation to correctly unfold
-	  headers and handle special characters per the latest NNTP draft.
-
-2004-05-18 09:18  rra
-
-	* expire/makehistory.c: Don't include the name of an additional
-	  header if it's not found in the article; just leave that field
-	  blank (per the latest NNTP draft).
-
-2004-05-18 09:12  rra
-
-	* expire/makehistory.c: Fix the overview generation to correctly
-	  unfold headers and handle special characters per the latest NNTP
-	  draft.
-
-2004-05-18 01:21  rra
-
-	* HACKING, doc/pod/hacking.pod: Remove the note about the INSTALLED
-	  variable in Makefiles, since we don't use that any more.
-
-2004-05-18 01:18  rra
-
-	* authprogs/Makefile, backends/Makefile, control/Makefile,
-	  expire/Makefile, frontends/Makefile, history/Make.methods,
-	  history/Makefile, history/buildconfig.in, innd/Makefile,
-	  innfeed/Makefile, lib/Makefile, nnrpd/Makefile, scripts/Makefile,
-	  storage/Make.methods, storage/Makefile, storage/buildconfig.in,
-	  storage/tradindexed/ovmethod.mk: Drop the idiosyncratic
-	  installation method that would fail to install programs if the
-	  installed version was newer than the built version in favor of a
-	  make install that works the way that people generally expect and
-	  always installs the new binaries.
-
-2004-05-18 01:17  rra
-
-	* Makefile.global.in: Remove the TCL variables, which are no longer
-	  being substituted in by configure.
-
-2004-05-17 12:18  rra
-
-	* doc/: external-auth, pod/external-auth.pod: An external
-	  authenticator must, not may, return a username.
-
-2004-05-17 12:14  rra
-
-	* storage/ovdb/ovdb.c: Change csend to use xwrite and to print a
-	  warning and return an error on failure rather than calling exit
-	  (calling exit was starting a loop, since csend is called by
-	  ovdb_close, which is called out of an atexit handler).  Modify
-	  the other functions to check the return value of csend.  This
-	  needs some more attention later, since we're currently returning
-	  errors that may be indistinguishable from missing articles.
-
-2004-05-17 09:25  rra
-
-	* frontends/mailpost.in: Don't ever take the Date from the "From "
-	  line, since that date will be in ctime format.  Don't require
-	  that a Date header be present; nnrpd can provide one.
-
-2004-05-17 08:52  rra
-
-	* lib/inndcomm.c: Always use the maximum buffer size (64KB - 1).
-	  The previous code generally only used a 4KB buffer to receive
-	  replies from the server, which was too small for the output of
-	  ctlinnd name at busy sites.  Also fix a lot of coding style
-	  issues and formatting.
-
-2004-05-17 08:33  rra
-
-	* include/inndcomm.h: Make the type of the message length unsigned
-	  short; may as well use every bit that we have.
-
-2004-05-17 07:46  rra
-
-	* frontends/pullnews.in: Authenticate after MODE READER, not
-	  before.  Reported by Tim Skirvin.
-
-2004-05-17 07:25  rra
-
-	* lib/uwildmat.c: Matching the UTF-8 character \303\206 against
-	  *[^\303\206] wasn't working properly.  Reported by Andrew Gierth.
-
-2004-05-17 06:23  rra
-
-	* storage/expire.c: Print out the error string from the storage
-	  manager if removing a token during expiration fails.
-
-2004-05-17 05:48  rra
-
-	* doc/: man/active.5, pod/active.pod: Fix an implication that
-	  articles filed in junk are only propagated to sites that receive
-	  junk; they're propagated according to their newsgroups header.
-
-2004-05-17 05:26  rra
-
-	* control/controlchan.in: Always include the system error message
-	  when opening something fails.
-
-2004-05-17 05:11  rra
-
-	* doc/man/dbz.3, include/dbz.h, lib/dbz.c: Use warn, syswarn, and
-	  debug in the dbz code instead of its previous idiosyncratic error
-	  reporting with EDOM errno and its internal DEBUG macro.
-
-2004-05-17 05:09  rra
-
-	* Makefile.global.in: Enable debugging when building with make
-	  warnings.
-
-2004-05-17 04:31  rra
-
-	* control/gpgverify.in: Use the same code for finding the keyring
-	  that pgpverify uses, so that the news administrator can use
-	  ~news/.gnupg if they want.  Reported by Toon van der Pas.
-
-2004-05-17 04:24  rra
-
-	* backends/batcher.c: Use fwrite rather than fprintf to output the
-	  article since it handles embedded nuls correctly.
-
-2004-05-17 04:06  rra
-
-	* INSTALL, configure, configure.in, doc/hook-tcl,
-	  doc/pod/install.pod, include/config.h.in: Remove --with-tcl from
-	  configure, remove the documentation from INSTALL, and comment in
-	  hook-tcl that it has been disabled and will be removed in the
-	  next version of INN.	Compiling with Tcl support was causing
-	  random segfaults even if no Tcl filter was defined.
-
-2004-05-17 00:41  rra
-
-	* INSTALL, doc/pod/install.pod: Add a note about having to restore
-	  the setuid bit on ckpasswd after a make update if you want that
-	  configuration.
-
-2004-05-16 23:41  rra
-
-	* nnrpd/post.c: Use the same code for printing header values as is
-	  used everywhere else in nnrpd when mailing articles so as to
-	  correctly handle the spaces after the colons.  Patch from Andreas
-	  M. Kirchwitz.
-
-2004-05-16 23:05  rra
-
-	* doc/: man/radius.conf.5, pod/radius.conf.pod: The parser has been
-	  fixed so that # can now be included in a radius secret.
-
-2004-05-16 23:01  rra
-
-	* lib/conffile.c: Correctly support # inside quoted strings (not
-	  considering it to be a comment).  Fix a bounds checking error
-	  when parsing a configuration file that contains an unmatched
-	  double quote.  Be a bit more careful about boundary checking.
-	  Based on analysis by Piotr Klaban.
-
-2004-05-16 22:00  rra
-
-	* doc/man/actsync.8: Document the rules for valid newsgroup names.
-
-2004-05-16 21:22  rra
-
-	* CONTRIBUTORS: Add Ilya Voronin.
-
-2004-05-16 21:21  rra
-
-	* frontends/cnfsheadconf.in: Zero-pad length and free values to
-	  exactly seventeen characters.  Based on a patch from Ilya
-	  Voronin.
-
-2004-05-16 21:13  rra
-
-	* CONTRIBUTORS: Add Jacek Konieczny.
-
-2004-05-16 21:12  rra
-
-	* storage/timecaf/caf.c: When retrieving an article, make sure that
-	  it is fully contained in the CAF file (for additional robustness
-	  in the presence of a broken spool).  Patch from Jacek Konieczny.
-
-2004-05-16 20:55  rra
-
-	* innd/art.c: Change some variable types in ARTparse to avoid
-	  signed/unsigned comparison warnings.
-
-2004-05-16 20:54  rra
-
-	* innd/: chan.c, innd.h, nc.c: Use ptrdiff_t for pointer
-	  differences and size_t for all offsets into buffers that are
-	  initialized with pointer differences.  Based on a patch from
-	  Jacek Konieczny and necessary for AMD64 support.
-
-2004-05-16 20:48  rra
-
-	* configure, configure.in, include/acconfig.h, include/config.h.in:
-	  Check for and provide ptrdiff_t if needed.
-
-2004-05-16 20:26  rra
-
-	* backends/innxmit.c, expire/makehistory.c, innd/chan.c, innd/nc.c,
-	  innd/site.c, innfeed/article.c, innfeed/imap_connection.c,
-	  innfeed/innlistener.c, innfeed/tape.c, storage/overdata.c,
-	  storage/cnfs/cnfs.c, storage/timecaf/caf.c: Cast all size_t
-	  values to unsigned long and use %lu when printing them with
-	  printf and friends.  Based on a patch from Jacek Konieczny,
-	  needed for proper functionality on AMD64.  Also fixes one place
-	  where pointers were cast to an int.
-
-2004-05-16 20:19  rra
-
-	* nnrpd/tls.h: Add missing openssl/rand.h include.
-
-2004-05-16 20:18  rra
-
-	* lib/innconf.c: Use an unsigned format to print unsigned values in
-	  the invalid type error message.
-
-2004-05-16 20:04  rra
-
-	* frontends/ovdb_stat.c: Add missing include of time.h.  Cast
-	  size_t to unsigned long for printing.
-
-2004-05-16 19:59  rra
-
-	* expire/expireover.c: Missing include of time.h.
-
-2004-05-16 19:57  rra
-
-	* Makefile.global.in: Update warnings to use the same flags that
-	  CURRENT uses.  No point in fighting noise that we decided to
-	  never do anything about.
-
-2004-05-16 19:53  rra
-
-	* authprogs/smbval/: rfcnb-common.h, rfcnb.h: Move declaration of
-	  RFCNB_Free_Pkt to avoid a warning.
-
-2004-05-16 19:46  rra
-
-	* include/clibrary.h: Fix __format__ attribute for snprintf.
-
-2004-05-16 02:51  rra
+2006-03-20  eagle
 
+	* nnrpd/group.c: Return the correct 0 0 0 response to LISTGROUP
+	  when the group is empty rather than returning no such group.
+	* authprogs/libauth.c: Set the length of the IPv4 sockets on
+	  platforms with a sin_len element in struct sockaddr. Reported by
+	  Gea-Suan Lin.
+	* scripts/innreport_inn.pm: Ignore or parse some log messages from
+	  newer versions, just for better news.notice parsing when
+	  bouncing between versions.
+
+2006-03-19  eagle
+
+	* lib/dbz.c: Various fixes from Heiko Schlichting for DBZTEST
+	  mode: Remove the right file in RemoveDBZ and use concat instead
+	  of a static buffer for filenames. Add a command-line option to
+	  set nfswriter if desired and avoid a core dump from a missing
+	  innconf. Fix debugging output from dbzclose and return checking
+	  from dbzstore. Fix an off-by-one error in the line counter. Fix
+	  a typo in usage.
+	* tests/lib/date-t.c: Skip the Newfoundland time zone test if the
+	  relevant zone is not installed.
+	* tests/Makefile: hstrerror dependency bug. Thanks, Heiko
+	  Schlichting.
+	* tests/lib/date-t.c: Backport the fix from stable to allow for
+	  ambiguous parsing of dates around daylight savings time when
+	  hours repeat.
+	* tests/lib/setenv-t.c, tests/lib/setenv.t: Backport the test
+	  suite change from unstable to use 100KB strings instead, since
+	  too many systems require more than 90KB just to load the dynamic
+	  libraries.
+	* samples/control.ctl: Remove abg.* entry. That maintainer is no
+	  longer active. Update the sfnet.* key fingerprint.
+
+2005-12-25  eagle
+
+	* Makefile: Fix the code to remove prerelease in Makefile.global.
+
+2005-12-24  eagle
+
+	* HACKING, doc/pod/hacking.pod: Update the references section.
+	* MANIFEST: Remove fixlog.
+	* NEWS, doc/pod/news.pod: Add changes for INN 2.4.3.
+	* support/config.guess, support/config.sub: Update config.guess
+	  and config.sub to the latest Debian versions.
+	* storage/overdata.c: Use the last Xref header when generating
+	  overview information if the article has multiple ones.
+	* HACKING, doc/pod/hacking.pod: Update make release instructions
+	  for svn2cl.
+	* support/fixlog, support/mkchangelog: Use svn2cl to generate the
+	  ChangeLog for the release.
+
+2005-12-15  eagle
+
+	* doc/man/inn.conf.5, doc/pod/inn.conf.pod, lib/innconf.c,
+	  nnrpd/line.c: Actually, don't impose a minimum size on
+	  maxartsize and localmaxartsize. That isn't necessary. Just
+	  adjust the nnrpd code so that it doesn't use localmaxartsize for
+	  the max buffer size without checking it first.
+
+2005-12-12  eagle
+
+	* expire/makehistory.c: If there are multiple Xref headers in an
+	  article, use the last one to get article data. This works around
+	  a combination of a bug in other servers that caused them to add
+	  multiple Xref headers and a bug in INN that caused it to accept
+	  such articles and just add yet another Xref header.
+	* backends/send-uucp.in, configure, configure.in,
+	  scripts/innshellvars.in, scripts/innshellvars.pl.in,
+	  scripts/innshellvars.tcl.in: Search the user's path for uux at
+	  configure time and encode the path in innshellvars, using that
+	  path in send-uucp, since apparently there are different uux's
+	  with different options and the administrator needs a way to be
+	  sure that the right one is used.
+	* authprogs/auth_krb5.c: krb5_get_in_tkt_with_password is
+	  deprecated; define the appropriate symbol for right now so that
+	  we can still get a prototype.
+	* authprogs/auth_krb5.c, configure, configure.in: Check for
+	  et/com_err.h before com_err.h; that's where Linux appears to be
+	  moving it to when com_err.h comes from e2fsprogs.
+	* MANIFEST, doc/man/Makefile, doc/man/pullnews.1,
+	  doc/man/pullnews.8, doc/pod/Makefile, doc/pod/pullnews.pod:
+	  Convert the pullnews documentation to POD. Document the ability
+	  to specify a username and password in the configuration file.
+
+2005-12-11  eagle
+
+	* doc/pod/inn.conf.pod, lib/innconf.c: Sanity-check the settings
+	  of maxartsize and localmaxartsize. (Setting the latter too low
+	  causes bizarre behavior in nnrpd.)
+	* doc/man/inn.conf.5, doc/pod/inn.conf.pod, nnrpd/line.c: Allow
+	  localmaxartsize of 0 in nnrpd and update the documentation for
+	  both it and maxartsize to document the 0 setting and note that,
+	  if set to zero, large articles can crash innd or nnrpd by
+	  running them out of system memory.
+	* nnrpd/post.c: Yet *another* problem checking permission to post
+	  to moderated groups. We were clearing the error flag right after
+	  setting it. Reported by Jens Schlegel.
+	* samples/moderators: Update nl.* moderation forwarding.
+	* CONTRIBUTORS, NEWS, doc/pod/news.pod: Document improvements by
+	  Thomas Parmelan to send-uucp.
+	* backends/send-uucp.in: If there is a stray .work file, append it
+	  to the new .work file after flushing and renaming, rather than
+	  before. Patch from Thomas Parmelan.
+	* backends/send-uucp.in: Add a way to specify the funnel or
+	  exploder to flush for a site managed via one. Patch from Thomas
+	  Parmelan.
+	* innd/rc.c: Close the socket for ident callbacks on errors.
+	* configure, configure.in: Move the checks for external libraries
+	  after the checks for networking libraries so that we don't fail
+	  to find OpenSSL because of libsocket and libnsl dependencies.
+	* scripts/rc.news.in: Throttle before shutting down to give Perl
+	  filters a chance to save data. Fixed in a better way in CURRENT.
+	* nnrpd/post.c: Remove write-only WasMailed variable.
+	* samples/innreport.conf.in, scripts/innreport_inn.pm: Report on
+	  the Python filter the same as we do on the Perl filter.
+	* doc/man/fastrm.1: Rebuild.
+	* samples/control.ctl: Resync with upstream version.
+	* nnrpd/perm.c: Fix a stupid paste mistake that caused nnrpd to
+	  ignore Perl scripts unless they were Python scripts.
+
+2005-10-09  eagle
+
+	* frontends/rnews.c: Burn three file descriptors if running
+	  privileged to avoid a strange situation where starting rnews
+	  with closed file descriptors could force error messages to be
+	  written to unexpected places, such as network streams or article
+	  files. Only bother if running privileged; otherwise, the user is
+	  just creating a bizarre bug by doing strange things, which isn't
+	  worth worrying about.
+	* doc/pod/fastrm.pod: Warn that fastrm doesn't care about security.
+	* innfeed/misc.c: Fix format string vulnerability in logOrPrint
+	  (which is only used for configuration data, so not an
+	  exploitable hole).
+	* innd/nc.c: Fix an oddity that I found a while back when auditing
+	  uses of the buffer code in innd but never returned to. If
+	  NCwritereply sends its reply immediately but can only send a
+	  part of it, the count of bytes remaining to send wasn't
+	  decremented. We could then send random junk at the end of the
+	  buffer to the peer later on.
+	* innd/cc.c: Fix an input validation bug that could allow a stack
+	  overwrite on a system that didn't support Unix domain sockets
+	  (do any of those exist any more?).
+	* innd/cc.c, lib/inndcomm.c: Increase the send and receive buffer
+	  sizes of the Unix domain socket used by the control channel,
+	  allowing longer replies on platforms with a low default buffer
+	  size. Patch from MKI.
+	* storage/cnfs/cnfs.c, storage/timecaf/timecaf.c,
+	  storage/timehash/timehash.c, storage/tradspool/tradspool.c: When
+	  retrieving an entire article, use MADV_WILLNEED rather than
+	  MADV_SEQUENTIAL or no madvise hint at all. The performance is
+	  apparently noticably better per MKI.
+	* innd/art.c: Correctly detect headers duplicated an odd number of
+	  times (3 copies, 5 copies, etc.) and distinguish between missing
+	  and duplicated headers when reporting errors.
 	* samples/control.ctl: Update to latest upstream version.
-
-2004-05-04 20:14  rra
-
-	* samples/control.ctl: Add a stub for a.bsu.*.
-
-2004-04-07 06:46  rra
-
-	* lib/vector.c: Fix a memory leak in vector_resize.  Patch from Ray
-	  Miller.
-
-2004-04-07 04:00  rra
-
-	* doc/: man/radius.conf.5, pod/radius.conf.pod: Adjust for the
-	  parser change that requires radius.conf files to consist of
-	  blocks wrapped in server { }.
-
-2004-03-06 18:29  rra
-
-	* doc/: pod/sm.pod, man/sm.1: Document the exit status.
-
-2004-03-06 18:29  rra
-
-	* frontends/sm.c: Return a non-zero exit status if any operation on
-	  one of the provided tokens fails.  Fixes Debian bug #141750.
-
-2004-03-06 05:33  rra
-
-	* nnrpd/perm.c: Distinguish between failures to read data from an
-	  authenticator and reading data from an authenticator that isn't a
-	  complete line, and don't prematurely kill the authenticator in
-	  the latter case.
-
-2004-03-03 18:36  hkehoe
-
-	* backends/inndf.c: inndf -n would get stuck in an infinite loop if
-	  OVgroupstats failed
-
-2004-03-03 01:20  kondou
-
-	* backends/innxmit.c: diablo expects empty line at the end for
-	  header feed
-
-2004-02-25 11:31  kondou
-
-	* innd/: art.c, nc.c: maxartsize did not work correctly.
-
-	  This should have been fixed when CURRENT was fixed, but my
-	  repository for STABLE-2_4 were not updated at that time.
-
-2004-02-25 11:16  kondou
-
-	* nnrpd/post.c: correct Message-ID should be shown in post response
-	  even if spooled
-
-2004-02-24 21:42  hkehoe
-
-	* storage/ovdb/ovdb.c: * Fix to prevent recursion on exit while in
-	  readserver mode.  * Update to track searches, because it's
-	  possible that closesearch does   not get called to match an
-	  opensearch.
-
-2004-02-24 21:41  hkehoe
-
-	* frontends/ovdb_server.c: * If readertab grows, need to initialize
-	  the new elements.  * Update to track searches, because it's
-	  possible that closesearch does   not get called before the client
-	  disconnects.
-
-2004-02-20 21:41  rra
-
-	* samples/control.ctl: Don't pick a particular it-alt.* signer.
-
-2004-01-28 21:07  rra
-
-	* storage/ovdb/ovdb-private.h: Port to the supported transaction
-	  method in BerkeleyDB 4.0 and later.  Earlier versions aren't
-	  affected.
-
-2004-01-26 02:39  rra
-
-	* backends/inndf.c: Work around how ReiserFS reports 0 free inodes
-	  with Linux 2.6.  Patch from Marco d'Itri.
-
-2004-01-26 02:03  rra
-
-	* lib/innconf.c: Ensure hismethod is set in inn.conf.
-
-2004-01-25 23:42  rra
-
-	* frontends/mailpost.in, doc/man/mailpost.8, doc/pod/mailpost.pod:
-	  Add a -p option to specify the port to which to post.
-
-2004-01-25 23:42  rra
-
-	* CONTRIBUTORS: Add Steve Youngs for debugging help.
-
-2004-01-25 23:35  rra
-
-	* frontends/inews.c: Don't use innconf->port to find the port of
-	  the server, since that's actually the port on which innd is
-	  running and nnrpd may be running separately.
-
-2004-01-25 22:33  rra
-
-	* frontends/rnews.c: Add a missing free when unspooling failed
-	  messages.
-
-2004-01-25 22:21  rra
-
-	* innd/python.c: Insufficient memory was being allocated for
-	  PYheaditem, since it also holds the body of the message and the
-	  line count.
-
-2004-01-25 20:06  rra
-
-	* innfeed/: article.c, article.h, buffer.c, buffer.h, connection.c,
-	  connection.h, endpoint.c, endpoint.h, host.c, host.h, innfeed.h,
-	  innlistener.c, innlistener.h, main.c, misc.c, misc.h,
-	  procbatch.in, tape.c, tape.h: Remove the separate license
-	  statements, since the license of all of INN now matches the
-	  license of innfeed.
-
-2004-01-25 20:00  rra
-
-	* README, doc/pod/readme.pod: Insert the acknowledgement of UUNET
-	  and Berkeley (the latter isn't required any more, I know).
-
-2004-01-25 19:59  rra
-
-	* LICENSE: Per Paul Vixie and Rich Salz, change the general INN
-	  license to the current ISC license text, dropping the advertising
-	  clause in the process.
-
-2004-01-15 20:03  rra
-
-	* NEWS, doc/pod/news.pod: Grammar fix.
-
-2004-01-14 19:44  rra
-
-	* LICENSE: Add 2004 to the copyright statement.
-
-2004-01-12 06:42  rra
-
-	* control/pgpverify.in, control/signcontrol.in,
-	  doc/man/pgpverify.1: Update to the latest upstream versions of
-	  pgpverify and signcontrol.  They add support for GnuPG and will
-	  correctly verify signatures generated by GnuPG.  All signature
-	  algorithms are changed to work on detached signatures for
-	  consistency.	These versions pass the upstream test suite.
-
-2004-01-12 06:23  rra
-
-	* .cvsignore: Ignore distribution staging directories and tarballs.
-
-2004-01-12 06:21  rra
-
-	* control/controlchan.in: Always use a local log socket on FreeBSD
-	  to match cnfsstat.
-
-2004-01-12 06:20  rra
-
-	* frontends/cnfsstat.in: Always use a local log socket on Darwin.
-
-2004-01-12 05:18  rra
-
-	* nnrpd/: commands.c, nnrpd.c, nnrpd.h, perm.c, post.c: Move
-	  LLOGenable into nnrpd.h so that it's defined the same everywhere.
-
-2004-01-11 23:21  rra
-
-	* innd/inndstart.c: If bindaddress or bindaddress6 is set in
-	  inn.conf, note this, since it should affect the IPv6 address
-	  binding strategy.
-
-2004-01-10 05:53  rra
-
-	* authprogs/Makefile: Fix the library dependencies for the various
-	  authentication programs.
-
-2004-01-08 02:18  rra
-
-	* Makefile.global.in: Bump revision to INN 2.4.2.
-
-2004-01-07 22:44  rra
-
-	* NEWS, doc/pod/news.pod: Update for the 2.4.1 release.
-
-2004-01-07 22:38  rra
-
-	* configure, configure.in: Only look for sendmail in /usr/sbin and
-	  /usr/lib, not on the user's path.
-
-2004-01-07 22:24  rra
-
-	* innd/art.c: Don't use a static buffer for creating the control
-	  message group to check whether we can store a control message in
-	  a per-type newsgroup.
-
-2004-01-07 03:51  rra
-
-	* samples/control.ctl: Add it-alt.*.
-
-2004-01-05 21:40  rra
-
-	* storage/tradindexed/tdx-group.c: msync_page is called mapcntl in
-	  STABLE.
-
-2004-01-02 00:42  rra
-
-	* storage/tradindexed/tdx-group.c: Make robust against references
-	  to index entries outside of the current length of the group index
-	  when auditing and when doing normal operations.
-
-2004-01-02 00:24  rra
-
-	* storage/tradindexed/tdx-group.c: Improve the auditing a little.
-	  Don't get caught in infinite loops when not fixing when circular
-	  structure is encountered.  Update group flags based on the active
-	  file as well, treating the active file as canonical.	Create
-	  index entries for any groups listed in the active file that
-	  aren't found in the overview database, even though innd does this
-	  on startup anyway.
-
-2004-01-01 22:54  rra
-
-	* control/controlchan.in: Force the Unix syslog socket for Mac OS
-	  X, since otherwise the lack of an IP address in /etc/hosts was
-	  causing difficulties.
-
-2003-12-30 19:55  rra
-
-	* frontends/rnews.c: Provide better error messages after an
-	  unexpected EOF from innd.
-
-2003-12-29 05:02  rra
-
-	* innd/cc.c: Don't close and reopen the history database during
-	  reload if the server isn't running, since the history database is
-	  closed with pause or throttle and reopened with go.
-
-2003-12-27 06:25  rra
-
-	* MANIFEST, doc/man/motd.news.5, doc/pod/Makefile,
-	  doc/pod/motd.news.pod: Rewrite motd.news.5 in POD.
-
-2003-12-27 06:20  rra
-
-	* doc/pod/motd.news.pod: Rewrite motd.news.5 in POD.
-
-2003-12-27 06:15  rra
-
-	* doc/man/send-nntp.8: Don't try to document both send-nntp and
-	  send-ihave on the same line; instead, break them into two
-	  different lines in the SYNOPSIS.  Requested by Eric Raymond.
-
-2003-12-27 04:18  rra
-
-	* samples/storage.conf: Replace with a sample file that does
-	  something sensible by default (stores all articles in tradspool).
-
-2003-12-27 04:17  rra
-
-	* scripts/rc.news.in: Make sure there's always a newline after the
-	  shutdown message for INN, even if it exits quickly.
+	* scripts/innshellvars.in, scripts/innshellvars.pl.in,
+	  scripts/innshellvars.tcl.in: Set HOME to pathnews. This should
+	  resolve Debian Bug#307765.
+	* scripts/innshellvars.pl.in: Avoid a warning if PATH is not
+	  defined in the environment.
+
+2005-07-31  eagle
+
+	* samples/control.ctl: Update to the current ftp.isc.org version.
+
+2005-07-18  eagle
+
+	* doc/man/nnrpd.8, doc/pod/nnrpd.pod: -p instead of -P to specify
+	  a port in the default port description.
+
+2005-07-05  eagle
+
+	* doc/man/readers.conf.5, doc/pod/readers.conf.pod: Document that
+	  at least one of res, auth, perl_auth, python_auth, or default
+	  should be set in any auth group.
+
+2005-07-04  eagle
+
+	* doc/man/innfeed.1: Document ctlinnd flush as the recommended way
+	  of cleanly shutting down and respawning innfeed.
+	* doc/man/innfeed.conf.5: Clarify that the SIGHUP re-read and
+	  bindaddress changes won't affect existing connections.
+
+2005-07-03  eagle
+
+	* frontends/rnews.c: Maintain and pass around the length of the
+	  article and never run strlen on the article. This should fix the
+	  truncationproblems rnews was having with articles that contained
+	  nul characters.
+	* frontends/rnews.c: Don't abort a whole batch on an article
+	  without a mandatory header or an unterminated message ID header.
+	  Instead, fail that one article and continue with the batch.
+	* frontends/rnews.c: Make unknown NNTP replies equivalent to
+	  failure to connect (resulting in a deferral) instead of an
+	  article rejection.
+	* frontends/rnews.c: Remove unneeded variables.
+	* frontends/rnews.c: When we fail to feed articles to the server
+	  when unspooling with -U, don't move the articles off into the
+	  bad directory. Just leave them in place in the spool directory.
+	  Articles that should be rejected aren't handled as failures and
+	  the right thing already happens with them, and retrying later is
+	  exactly what we want for deferrals and 400 errors.
+	* control/pgpverify.in: Import upstream version 1.27, which falls
+	  back on pubring.gpg in the default keyring location if
+	  trustedkeys.gpg isn't present.
+
+2005-07-02  eagle
+
+	* innd/art.c: NULL-terminate GroupPointers when replacing it while
+	  doing Xref slaving. Patch from Chris Caputo.
+	* ., .cvsignore, MANIFEST: Ignore the snapshot.log file and add
+	  mksnapshot to MANIFEST.
+	* Makefile, Makefile.global.in, support/mksnapshot,
+	  support/mkversion: Add support/mksnapshot and make snapshot, and
+	  change the Subversion version information to prerelease from CVS
+	  prerelease.
+
+2005-06-20  eagle
+
+	* nnrpd/nnrpd.h: ARTreadschema is no more.
+	* storage/overdata.c: Free resources properly in
+	  overview_extra_fields. Patch from Chris Caputo.
+	* history/hisv6/hisv6.c: Pass HIS_CREAT to hisv6_new when opening
+	  it for expiration. This fixes expire failing to create a new
+	  history file and also addresses a long- standing problem where
+	  rerunning expire after a failure would cause tons of duplicate
+	  history lines. Patch from Chris Caputo.
+
+2005-06-11  eagle
+
+	* support/mkmanifest: Ignore .svn directories.
+	* authprogs/pam.conf.example: PAM documentation is now in the
+	  ckpasswd man page.
+
+2005-06-07  eagle
+
+	* innfeed/article.c, innfeed/buffer.c, innfeed/buffer.h:
+	  Reference-count the buffers in articles we're sending, since the
+	  article holding a reference to them may be deleted before we
+	  finish sending the article if the peer sends the rejection
+	  message immediately (like Diablo does). Patch from Miquel van
+	  Smoorenburg.
+	* authprogs/smbval, history, lib, storage: Also ignore the *.a
+	  library files; Subversion doesn't ignore those by default the
+	  way that CVS does.
+	* scripts/innreport.in: Remove the ftp.sofaraway.org references,
+	  as the FTP site appears to be no more.
+	* storage/cnfs/cnfs.c: Write out a multiple of CNFS_BLOCKSIZE to
+	  disk by zero-padding the end of the article. We don't use that
+	  data anyway, since we always align the start of articles, and
+	  this saves an unnecessary read if CNFS_BLOCKSIZE matches the
+	  file system block size (writing a partial block requires a disk
+	  read). Patch from Miquel van Smoorenburg.
+	* storage/interface.c: Don't allow storage classes larger than
+	  255; they can't be represented in tokens. Reported by Sebastian
+	  Wiesinger.
+	* doc/man/innfeed.1: The batch files now normally contain storage
+	  tokens rather than file names. Reported by Todd Olson.
+	* history/hisv6/hisv6.c: Fix hisv6_replace so that it actually
+	  works. Open the history file in r+ mode rather than a mode,
+	  since otherwise we can't write to arbitrary locations in the
+	  file. Fix the length check for the new line, and space-fill the
+	  new line at the right offset. Patch from Chris Caputo.
+	* CONTRIBUTORS, history/hisv6/hisv6-private.h,
+	  history/hisv6/hisv6.c: Calling fseeko or ftello does fflush, at
+	  least on Linux, which meant that we were flushing the history
+	  file after every write and not gaining the advantage of stdio
+	  buffering. Stop using fseeko/ftello in favor of using an
+	  internally maintained offset. This breaks multiple processes
+	  writing to the history file at the same time, but in practice we
+	  don't support that right now anyway. We save a significant
+	  number of write and seek syscalls this way. Patch from Chris
+	  Caputo.
+	* doc/man/inn.conf.5, doc/pod/inn.conf.pod, nnrpd/nnrpd.c: Setting
+	  timer to 0 in inn.conf should also disable the timing support in
+	  nnrpd.
+
+2005-06-06  eagle
+
+	* nnrpd/article.c: GetHeader was giving up a bit short of the end
+	  of the article due to using the same limit both for searching
+	  for the header and for searching for the end of the header. Use
+	  separate limits instead. Patch from Chris Caputo.
+	* lib/dbz.c: Fix the length specification for madvise in getcore.
+	  The incorrect value was causing it to pessimize things rather
+	  than optimize. Also factor out the file length calculation to a
+	  separate variable rather than constantly repeating the same
+	  multiplication. Patch from Chris Caputo.
+	* tests/lib/tst-t.c, tests/lib/uwildmat-t.c: Backport test fixes
+	  from trunk.
+	* tests/lib/articles/no-body, tests/lib/articles/strange,
+	  tests/lib/articles/truncated: Restore the CRLF line endings that
+	  were lost in the conversion to Subversion.
+	* lib/wire.c: Backport from the trunk the fix for articles with no
+	  headers.
+
+2005-06-05  eagle
+
+	* ., branches/STABLE-2_4: Rename branches to better names, now
+	  that we're not limited by CVS.
+
+2005-04-16  rra
+
+	* branches/STABLE-2_4/lib/snprintf.c: Add miscellaneous fixes
+	  pointed out by Hrvoje Niksic.
+
+2005-04-11  rra
+
+	* branches/STABLE-2_4/INSTALL,
+	  branches/STABLE-2_4/doc/pod/install.pod: Note that running cron
+	  jobs is incompatible, on Solaris, with having a locked account.
+	* branches/STABLE-2_4/INSTALL,
+	  branches/STABLE-2_4/doc/pod/install.pod: Document the configure
+	  flags to change the INN user and document the use of the usenet
+	  user and --with-news-master.
+	* branches/STABLE-2_4/MANIFEST,
+	  branches/STABLE-2_4/doc/man/ckpasswd.8,
+	  branches/STABLE-2_4/doc/man/readers.conf.5,
+	  branches/STABLE-2_4/doc/pod/ckpasswd.pod,
+	  branches/STABLE-2_4/doc/pod/readers.conf.pod: Move the
+	  documentation for PAM configuration with ckpasswd into its man
+	  page and remove the (not incredibly helpful) example file. Add
+	  more cross-references to ckpasswd to the readers.conf man page.
+	* branches/STABLE-2_4/nnrpd/post.c: If nnrpdauthsender is set and
+	  the user identity assigned is empty, don't use UNKNOWN@hostname;
+	  instead, strip the Sender header completely as the documentation
+	  says.
+	* branches/STABLE-2_4/doc/man/readers.conf.5,
+	  branches/STABLE-2_4/doc/pod/readers.conf.pod: Note that the user
+	  identity is also used by nnrpdauthsender.
+	* branches/STABLE-2_4/doc/man/inn.conf.5,
+	  branches/STABLE-2_4/doc/pod/inn.conf.pod: Typo fix.
+	* branches/STABLE-2_4/doc/man/expire.ctl.5,
+	  branches/STABLE-2_4/doc/pod/expire.ctl.pod: Improve the
+	  documentation of the X flag and try to clarify that expiration
+	  rules are applied to newsgroups one carries, not the Newsgroups
+	  header of articles.
+	* branches/STABLE-2_4/doc/man/nnrpd.8,
+	  branches/STABLE-2_4/doc/pod/nnrpd.pod,
+	  branches/STABLE-2_4/nnrpd/nnrpd.c: Looks like -R (force
+	  read-only) hasn't done anything in quite a while. Since no one
+	  has complained, just remove the option rather than trying to fix
+	  it.
+	* branches/STABLE-2_4/INSTALL,
+	  branches/STABLE-2_4/doc/pod/install.pod: Add more information
+	  about software dependencies and tips for building against shared
+	  libraries.
+	* branches/STABLE-2_4/authprogs/Makefile: Build auth_krb5.o with
+	  $KRB5INC to find include files.
+	* branches/STABLE-2_4/configure, branches/STABLE-2_4/configure.in:
+	  --with-kerberos was putting the -L option after -lkrb5 instead
+	  of before it, which isn't particularly useful. Restructure a
+	  little to fix that. Reported by Todd Olson.
+
+2005-04-10  rra
+
+	* branches/STABLE-2_4/doc/pod/news.pod,
+	  branches/STABLE-2_4/nnrpd/article.c: Remove the optimization
+	  that answers XHDR Newsgroups and XPAT Newsgroups out of the
+	  overview Xref data. It makes things faster, but it breaks the
+	  NNTP protocol specification.
+	* branches/STABLE-2_4/NEWS, trunk/nnrpd/article.c: Remove the
+	  optimization that answers XHDR Newsgroups and XPAT Newsgroups
+	  out of the overview Xref data. It makes things faster, but it
+	  breaks the NNTP protocol specification.
+	* branches/STABLE-2_4/nnrpd/perm.c: When Perl and Python were both
+	  enabled, nnrpd was attempting to parse Python access hooks as
+	  Perl scripts. Fixed by checking the access type. Reported by Ken
+	  Bass.
+	* branches/STABLE-2_4/INSTALL,
+	  branches/STABLE-2_4/doc/pod/install.pod: Add NetBSD to the list
+	  of confirmed platforms.
+	* branches/STABLE-2_4/control/perl-nocem.in: Add a SYNOPSIS to the
+	  documentation, change the existing SYNOPSIS section to
+	  DESCRIPTION, and reformat a little bit.
+	* branches/STABLE-2_4/lib/sendpass.c: If called with a NULL server
+	  argument and innconf->server not set, set errno to something
+	  vaguely appropriate before returning since some callers use
+	  errno in error reporting.
+
+2005-04-07  rra
+
+	* branches/STABLE-2_4/doc/man/expire.ctl.5,
+	  branches/STABLE-2_4/doc/pod/expire.ctl.pod,
+	  branches/STABLE-2_4/samples/expire.ctl: Change the terminology
+	  to <min>:<default>:<max> from <keep> and <purge>.
+
+2005-03-17  vinocur
+
+	* branches/STABLE-2_4/authprogs/domain.c,
+	  branches/STABLE-2_4/doc/external-auth,
+	  branches/STABLE-2_4/doc/pod/external-auth.pod: Fix
+	  inconsistencies between code and documentation about newline
+	  handling for external-auth. Reported by Todd Olson.
+
+2005-03-16  hkehoe
+
+	* branches/STABLE-2_4/storage/tradindexed/tradindexed.c:
+	  tradindexed_add should return "true" if the group doesn't exist,
+	  like the other OV methods
+
+2005-03-11  rra
+
+	* branches/STABLE-2_4/scripts/inncheck.in: Recognize variable
+	  settings in newsfeeds.
+	* branches/STABLE-2_4/lib/date.c: The values array in
+	  parsedate_rfc2822 was too short.
+
+2005-03-05  vinocur
+
+	* branches/STABLE-2_4/doc/hook-python,
+	  branches/STABLE-2_4/doc/man/newsfeeds.5,
+	  branches/STABLE-2_4/doc/pod/hook-python.pod,
+	  branches/STABLE-2_4/doc/pod/newsfeeds.pod, trunk/doc/hook-perl:
+	  Correct typos.
+
+2005-01-18  rra
+
+	* branches/STABLE-2_4/control/pgpverify.in: Return the correct
+	  exit status in the event of known failures instead of always
+	  returning 255. Reported by Awais Riaz.
+
+2004-12-25  rra
+
+	* branches/STABLE-2_4/INSTALL,
+	  branches/STABLE-2_4/doc/pod/install.pod: --enable-uucp-rnews
+	  only installs rnews setuid news, not setuid root.
+	* branches/STABLE-2_4/configure.in: Fix the comment to clarify
+	  that rnews is only installed setuid news.
+	* branches/STABLE-2_4/LICENSE: Add information about
+	  lib/snprintf.c.
+	* branches/STABLE-2_4/LICENSE: The MIT/X Consortium license is no
+	  longer less restrictive than INN's license.
+
+2004-12-24  rra
+
+	* branches/STABLE-2_4/doc/man/inews.1,
+	  branches/STABLE-2_4/doc/pod/inews.pod: NAME, not NEWS.
+
+2004-12-23  rra
+
+	* branches/STABLE-2_4/innfeed/imap_connection.c: Rework
+	  imap_sendAuthenticate to avoid warnings when building without
+	  SASL.
+	* branches/STABLE-2_4/backends/mod-active.in: GNU diff wants -U0
+	  rather than -u0 these days. This seems to be supported for a
+	  while into the past, so let's hope that this doesn't just create
+	  other compatibility problems.
+	* branches/STABLE-2_4/Makefile.global.in: Increase version number
+	  to 2.4.3.
 
diff -ruNp inn-2.4.2/HACKING inn-2.4.3/HACKING
--- inn-2.4.2/HACKING	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/HACKING	Mon Mar 20 04:14:57 2006
@@ -6,7 +6,8 @@ Hacking INN
     contributors, and secondarily as documentation of some of INN's
     internals.
 
-    This is $Revision: 1.26.2.3 $ dated $Date: 2004/10/01 06:41:16 $.
+    This is $Revision: 7486 $ dated $Date: 2005-12-24 13:33:38 -0800 (Sat,
+    24 Dec 2005) $.
 
     First of all, if you plan on working on INN source, please start from
     the current development tree.  There may be significant changes from the
@@ -639,11 +640,10 @@ Making a Release
         generated by configure; if there are any other differences, fix the
         MANIFEST.
 
-    6.  Run "make release".  Note that you need to have a copy of cvs2cl
-        from <http://www.red-bean.com/cvs2cl/> to do this.  You will be
-        prompted for the release branch tag, the date from which to generate
-        the ChangeLog, and the path to cvs2cl.  Start the ChangeLog slightly
-        before the last release (we only ship inter-release change logs).
+    6.  Run "make release".  Note that you need to have a copy of svn2cl
+        from <http://ch.tudelft.nl/~arthur/svn2cl/> to do this.  Start the
+        ChangeLog at the time of the previous release.  (Eventually, the
+        script will be smart enough to do this for you.)
 
     7.  Make the resulting tar file available for testing in a non-listable
         directory on ftp.isc.org and announce its availability on
@@ -675,13 +675,14 @@ References
     Some additional references that may be hard to find and may be of use to
     people working on INN:
 
-    <ftp://ftp.academ.com/pub/nntp/ietf/>
-        The archives for the NNTP IETF working group, containing the latest
-        drafts of the new NNTP standard and the archived mailing list
-        traffic (which contains a lot of interesting discussion of why NNTP
-        is the way it is).
+    <http://www.eyrie.org/~eagle/nntp/>
+        The home page for the IETF NNTP standardization effort, including
+        links to the IETF NNTP working group archives and copies of the
+        latest drafts of the new NNTP standard.  The old archived mailing
+        list traffic contains a lot of interesting discussion of why NNTP is
+        the way it is.
 
-    <http://www.landfield.com/usefor/>
+    <http://www.imc.org/ietf-usefor/>
         The archives for the USEFOR IETF working group, the working group
         for the RFC 1036 replacement (the format of Usenet articles).  Also
         contains a lot of references to other relevant work, such as the RFC
diff -ruNp inn-2.4.2/INSTALL inn-2.4.3/INSTALL
--- inn-2.4.2/INSTALL	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/INSTALL	Mon Mar 20 04:14:57 2006
@@ -52,6 +52,7 @@ Supported Systems
         HP-UX 10.20 and up
         Linux 2.x (tested with libc 5.4, glibc 2.0 and up)
         Mac OS X 10.2 and up
+        NetBSD 1.6 and up
         OpenBSD 2.8 and up
         SCO 5.0.4 (tested with gcc 2.8.1, cc)
         Solaris 2.5.x and up
@@ -124,9 +125,34 @@ Before You Begin
       an educational or non-profit organization, this shouldn't be a
       problem.
 
-    Also, if you want to use the Python embedded hooks, you'll need to have
-    a suitable version of Python installed.  See doc/hook-python for more
-    information.
+    * If you want to use either the Python embedded hooks, you'll need to
+      have a suitable versions of Python installed.  See doc/hook-python for
+      more information.
+
+    * Many of INN's optional features require other packages (primarily
+      libraries) be installed.  If you wish to use any of these optional
+      features, you will need to install those packages first.  Here is a
+      table of configure options enabling optional features and the software
+      and versions you'll need:
+
+          --with-perl         Perl 5.004_03 or higher, 5.6.1+ recommended
+          --with-python       Python 1.5.2 or higher
+          --with-berkeleydb   BerkeleyDB 2.0 or higher, 4.2+ recommended
+          --with-openssl      OpenSSL 0.9.6 or higher
+          --with-sasl         SASL 2.x or higher
+          --with-kerberos     MIT Kerberos v5 1.2.x or higher
+
+      If any of these libraries (other than Perl or Python) are built shared
+      and installed in locations where your system doesn't search for shared
+      libraries by default, you may need to encode the paths to those shared
+      libraries in the INN binaries.  For more information on shared library
+      paths, see:
+
+          <http://www.eyrie.org/~eagle/notes/rpath.html>
+
+      For most systems, setting the environment variable LD_RUN_PATH to a
+      colon-separated list of additional directories in which to look for
+      shared libraries before building INN will be sufficient.
 
 Unpacking the Distribution
 
@@ -157,11 +183,17 @@ Installing INN
 
     Before beginning installation, you should make sure that there is a user
     on your system named "news", and that this user's primary group is set
-    to a group called "news".  The home directory of this user should be set
-    to the directory under which you wish to install INN (/usr/local/news is
-    the default and is a good choice).  INN will install itself as this user
-    and 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.
+    to a group called "news".  You can change these with the
+    --with-news-user and --with-news-group options to configure (see below).
+    The home directory of this user should be set to the directory under
+    which you wish to install INN (/usr/local/news is the default and is a
+    good choice).  INN will install itself as this user and 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.
+
+    By default, INN sends reports to the user "usenet".  This account isn't
+    used for any other purposes.  You can change it with the
+    --with-news-master option to configure (see below).
 
     WARNING: By default, INN installs various configuration files as
     group-writeable, and in general INN is not hardened from a security
@@ -334,13 +366,13 @@ Installing INN
 
     --enable-uucp-rnews
         If this option is given to configure, rnews will be installed setuid
-        root, owned by group uucp, and mode 4550.  This will allow the UUCP
-        subsystem to run rnews to process UUCP batches of news articles
-        (rnews changes UID to the news user right after it starts).  Prior
-        to INN 2.3, installing rnews setuid root was standard; since most
-        sites no longer use UUCP, it is no longer the default as of INN 2.3
-        and must be requested at configure time.  You probably don't want to
-        use this option unless your server accepts UUCP news batches.
+        news, owned by group uucp, and mode 4550.  This will allow the UUCP
+        subsystem to run rnews to process UUCP batches of news articles. 
+        Prior to INN 2.3, installing rnews setuid news was standard; since
+        most sites no longer use UUCP, it is no longer the default as of INN
+        2.3 and must be requested at configure time.  You probably don't
+        want to use this option unless your server accepts UUCP news
+        batches.
 
     --enable-setgid-inews
         If this option is given to configure, inews will be installed setgid
@@ -1355,6 +1387,11 @@ Setting Up the Cron Jobs
 
     If you're using any non-CNFS storage methods, add "delayrm" to the above
     option list for news.daily.
+
+    The news user obviously must be able to run cron jobs.  On Solaris, this
+    means that it must have a valid /etc/shadow entry and must not be locked
+    (although it may be a non-login account).  There may be similar
+    restrictions with other operating systems.
 
     If you use the batching method to send news, also set up a cron job to
     run nntpsend(8) every ten minutes.  nntpsend will run innxmit for all
diff -ruNp inn-2.4.2/LICENSE inn-2.4.3/LICENSE
--- inn-2.4.2/LICENSE	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/LICENSE	Mon Mar 20 04:14:57 2006
@@ -35,6 +35,9 @@ files.  Specifically (but possibly not c
    lib/strlcat.c, lib/strlcpy.c, and lib/strerror.c are in the public
    domain.
 
+   lib/snprintf.c may be used for any purpose as long as the author's
+   notice remains intact in all source code distributions.
+
    control/gpgverify.in, control/pgpverify.in and control/signcontrol.in
    are under a BSD-style license (with the advertising clause) with UUNET
    Technologies, Inc. as the copyright holder.  See the end of those files
@@ -61,8 +64,7 @@ files.  Specifically (but possibly not c
    copyright holder.
 
    tests/runtests.c is covered under a license very similar to the MIT/X
-   Consortium license (less restrictive than INN's licese).  See the
-   beginning of the file for details.
+   Consortium license.  See the beginning of the file for details.
 
 Note that all portions of INN that link with core INN code have to be
 convered by licenses compatible with the license at the top of this file,
diff -ruNp inn-2.4.2/MANIFEST inn-2.4.3/MANIFEST
--- inn-2.4.2/MANIFEST	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/MANIFEST	Mon Mar 20 04:14:57 2006
@@ -20,7 +20,6 @@ authprogs/domain.c                    Ge
 authprogs/ident.c                     Get username from ident
 authprogs/libauth.c                   Library for talking to nnrpd
 authprogs/libauth.h                   Interface for libauth
-authprogs/pam.conf.example            Example pam.conf file for ckpasswd
 authprogs/radius.c                    Authenticator against RADIUS servers
 authprogs/smbval                      The smb auth libraries (Directory)
 authprogs/smbval/Makefile             Libraries for smb auth
@@ -222,7 +221,7 @@ doc/man/passwd.nntp.5                 Ma
 doc/man/perl-nocem.8                  Manpage for perl-nocem
 doc/man/pgpverify.1                   Manpage for pgpverify
 doc/man/prunehistory.8                Manpage for prunehistory
-doc/man/pullnews.8                    Manpage for pullnews
+doc/man/pullnews.1                    Manpage for pullnews
 doc/man/putman.sh                     Install a manpage
 doc/man/qio.3                         Manpage for fast I/O file routines
 doc/man/radius.8                      Manpage for radius authenticator
@@ -294,6 +293,7 @@ doc/pod/ovdb_monitor.pod              Ma
 doc/pod/ovdb_server.pod               Master file for ovdb_server.8
 doc/pod/ovdb_stat.pod                 Master file for ovdb_stat.8
 doc/pod/passwd.nntp.pod               Master file for passwd.nntp.5
+doc/pod/pullnews.pod                  Master file for pullnews.1
 doc/pod/qio.pod                       Master file for qio.3
 doc/pod/radius.conf.pod               Master file for radius.conf.5
 doc/pod/radius.pod                    Master file for radius.8
@@ -664,7 +664,6 @@ storage/trash/trash.h                 He
 support                               Tools for building INN (Directory)
 support/config.guess                  Determine system type for libtool
 support/config.sub                    Canonicalize system type for libtool
-support/fixlog                        Clean up CVS log messages for cvs2cl
 support/fixscript.in                  Interpreter path fixup script
 support/indent                        A mostly working wrapper around indent
 support/install-sh                    Installation utility
@@ -672,6 +671,7 @@ support/ltmain.sh                     So
 support/makedepend                    Generate dependencies for C files
 support/mkchangelog                   Generate ChangeLog from CVS
 support/mkmanifest                    Generate a list of files for the manifest
+support/mksnapshot                    Generate a snapshot of the tree
 support/mksystem                      Generate <inn/system.h> from config.h
 support/mkversion                     Generate <inn/version.h> with INN version
 tests                                 Test suite for INN (Directory)
diff -ruNp inn-2.4.2/Makefile inn-2.4.3/Makefile
--- inn-2.4.2/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.70.2.4 2004/12/19 19:50:51 rra Exp $
+##  $Id: Makefile 7488 2005-12-25 00:26:08Z eagle $
 
 include Makefile.global
 
@@ -27,10 +27,14 @@ CLEANDIRS   = $(ALLDIRS) include tests
 TARDIR      = inn-$(VERSION)
 TARFILE     = $(TARDIR).tar
 
+##  The directory to use when building a snapshot.
+SNAPDIR     = inn-$(SNAPSHOT)-$(SNAPDATE)
+
 ##  DISTDIRS gets all directories from the MANIFEST, and DISTFILES gets all
 ##  regular files.  Anything not listed in the MANIFEST will not be included
 ##  in a distribution.  These are arguments to sed.
 DISTDIRS    = -e 1,2d -e '/(Directory)/!d' -e 's/ .*//' -e 's;^;$(TARDIR)/;'
+SNAPDIRS    = -e 1,2d -e '/(Directory)/!d' -e 's/ .*//' -e 's;^;$(SNAPDIR)/;'
 DISTFILES   = -e 1,2d -e '/(Directory)/d' -e 's/ .*//'
 
 
@@ -173,7 +177,7 @@ release: ChangeLog
 	for f in `sed $(DISTFILES) MANIFEST` ; do \
 	    cp $$f $(TARDIR)/$$f || exit 1 ; \
 	done
-	sed 's/= CVS prerelease/=/' < Makefile.global.in \
+	sed 's/= prerelease/=/' < Makefile.global.in \
 	    > $(TARDIR)/Makefile.global.in
 	cp ChangeLog $(TARDIR)
 	find $(TARDIR) -type f -print | xargs touch -t `date +%m%d%H%M.%S`
@@ -193,3 +197,22 @@ check-manifest:
 	sed -e 1,2d -e 's/ .*//' MANIFEST > LIST.manifest
 	$(PERL) support/mkmanifest > LIST.real
 	diff -u LIST.manifest LIST.real
+
+
+##  Make a snapshot.  This is like making a release, except that we don't do
+##  the ChangeLog thing and we don't change the version number.  We also
+##  assume that SNAPSHOT has been set to the appropriate current branch.
+snapshot:
+	rm -rf $(SNAPDIR)
+	rm -f inn*.tar.gz
+	mkdir $(SNAPDIR)
+	set -e ; for d in `sed $(SNAPDIRS) MANIFEST` ; do mkdir -p $$d ; done
+	set -e ; for f in `sed $(DISTFILES) MANIFEST` ; do \
+	    cp $$f $(SNAPDIR)/$$f ; \
+	done
+	cp README.snapshot $(SNAPDIR)/
+	sed 's/= prerelease/= $(SNAPDATE) snapshot/' \
+	    Makefile.global.in > $(SNAPDIR)/Makefile.global.in
+	find $(SNAPDIR) -type f -print | xargs touch -t `date +%m%d%H%M.%S`
+	tar cf $(SNAPDIR).tar $(SNAPDIR)
+	$(GZIP) -9 $(SNAPDIR).tar
diff -ruNp inn-2.4.2/Makefile.global.in inn-2.4.3/Makefile.global.in
--- inn-2.4.2/Makefile.global.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/Makefile.global.in	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile.global.in,v 1.70.2.6 2004/05/18 01:17:26 rra Exp $
+##  $Id: Makefile.global.in 7345 2005-07-02 05:04:05Z eagle $
 ##
 ##  This file is meant to be the central Makefile that configure works with
 ##  and that all other Makefiles include.  No Makefile other than this one
@@ -14,7 +14,7 @@
 ##  put your own version information in $VERSION_EXTRA.  If it's set to
 ##  "CVS prerelease", the build time will be automatically included.
 
-VERSION         = 2.4.2
+VERSION         = 2.4.3
 VERSION_EXTRA   =
 
 ##  If you want to install INN relative to a root directory other than /,
diff -ruNp inn-2.4.2/NEWS inn-2.4.3/NEWS
--- inn-2.4.2/NEWS	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/NEWS	Mon Mar 20 04:14:57 2006
@@ -1,3 +1,33 @@
+Changes from 2.4.2 to 2.4.3
+
+    * Previous versions of INN had an optimization for handling XHDR
+      Newsgroups that used the Xref header from overview.  While this does
+      make the command much faster, it doesn't produce accurate results and
+      breaks the NNTP protocol, so this optimization has been removed.
+
+    * Fixed a bug in innd that allowed it to accept articles with duplicated
+      headers if the header occurred an odd number of times.  Modified the
+      programs for rebuilding overview to use the last Xref header if there
+      are multiple ones to avoid problems with spools that contain such
+      invalid articles.
+
+    * Fixed yet another problem with verifying that a user has permissions
+      to approve posts to a moderated group.  Thanks, Jens Schlegel.
+
+    * Increase the send and receive buffer on the Unix domain socket used by
+      ctlinnd.  This should allow longer replies (particularly for innstat)
+      on platforms with very low default Unix domain socket buffer sizes.
+
+    * rnews's handling of articles with nul characters, NNTP errors, header
+      problems, and deferrals has been significantly improved.
+
+    * Thomas Parmelan added support to send-uucp for specifying the funnel
+      or exploder site to flush for feeds managed through one and fixed a
+      problem with picking up old stranded work files.
+
+    * Many other more minor bug fixes, optimization improvements, and
+      documentation fixes.
+
 Changes from 2.4.1 to 2.4.2
 
     * INN is now licensed under a less restrictive license (about as
diff -ruNp inn-2.4.2/TODO inn-2.4.3/TODO
--- inn-2.4.2/TODO	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/TODO	Mon Mar 20 04:14:57 2006
@@ -20,7 +20,7 @@ suite, which is currently very minimal. 
 to allow more portions of INN to be automatically tested will make all
 changes easier and will be *greatly* appreciated.
 
-Last modified $Id: TODO,v 1.64 2003/04/16 21:53:37 rra Exp $.
+Last modified $Id: TODO 6296 2003-04-16 21:53:37Z rra $.
 
 
 Scheduled for INN 2.5
diff -ruNp inn-2.4.2/authprogs/Makefile inn-2.4.3/authprogs/Makefile
--- inn-2.4.2/authprogs/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/authprogs/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.34.2.2 2004/05/18 01:18:53 rra Exp $
+##  $Id: Makefile 7193 2005-04-11 07:36:51Z rra $
 
 include ../Makefile.global
 
@@ -64,6 +64,9 @@ ident: ident.o $(LIBAUTH) $(LIBINN)
 
 radius: radius.o $(LIBAUTH) $(LIBINN)
 	$(LINK) radius.o $(LIBAUTH) $(LIBINN) $(LIBS)
+
+auth_krb5.o: auth_krb5.c
+	$(CC) $(CFLAGS) $(KRB5INC) -c $<
 
 $(LIBINN):	; (cd ../lib ; $(MAKE))
 $(LIBSMB):	; (cd smbval ; $(MAKE))
diff -ruNp inn-2.4.2/authprogs/auth_krb5.c inn-2.4.3/authprogs/auth_krb5.c
--- inn-2.4.2/authprogs/auth_krb5.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/authprogs/auth_krb5.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: auth_krb5.c,v 1.2.2.2 2003/10/15 00:09:56 rra Exp $
+/*  $Id: auth_krb5.c 7462 2005-12-12 01:06:54Z eagle $
 **
 **  Check an username and password against Kerberos v5.
 **
@@ -21,7 +21,14 @@
 #include "config.h"
 #include "clibrary.h"
 #include "libauth.h"
-#include <com_err.h>
+#ifdef HAVE_ET_COM_ERR_H
+# include <et/com_err.h>
+#else
+# include <com_err.h>
+#endif
+
+/* krb5_get_in_tkt_with_password is deprecated. */
+#define KRB5_DEPRECATED 1
 #include <krb5.h>
 
 #include "inn/messages.h"
diff -ruNp inn-2.4.2/authprogs/ckpasswd.c inn-2.4.3/authprogs/ckpasswd.c
--- inn-2.4.2/authprogs/ckpasswd.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/authprogs/ckpasswd.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: ckpasswd.c,v 1.27 2003/01/19 19:30:55 rra Exp $
+/*  $Id: ckpasswd.c 6140 2003-01-19 19:30:55Z rra $
 **
 **  The default username/password authenticator.
 **
diff -ruNp inn-2.4.2/authprogs/domain.c inn-2.4.3/authprogs/domain.c
--- inn-2.4.2/authprogs/domain.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/authprogs/domain.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: domain.c,v 1.5 2002/11/16 19:11:32 vinocur Exp $
+/*  $Id: domain.c 7141 2005-03-17 11:42:46Z vinocur $
 **
 **  Domain authenticator.
 **
@@ -44,6 +44,6 @@ main(int argc, char *argv[])
     if (argv[1][0] != '.')
         p--;
     *p = '\0';
-    printf("User:%s", host);
+    printf("User:%s\n", host);
     return 0;
 }
diff -ruNp inn-2.4.2/authprogs/ident.c inn-2.4.3/authprogs/ident.c
--- inn-2.4.2/authprogs/ident.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/authprogs/ident.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: ident.c,v 1.21 2003/01/19 01:15:24 rra Exp $
+/*  $Id: ident.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Ident authenticator.
 */
diff -ruNp inn-2.4.2/authprogs/libauth.c inn-2.4.3/authprogs/libauth.c
--- inn-2.4.2/authprogs/libauth.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/authprogs/libauth.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: libauth.c,v 1.10 2002/11/23 07:26:30 rra Exp $
+/*  $Id: libauth.c 7500 2006-03-20 01:52:44Z eagle $
 **
 **  Common code for authenticators and resolvers.
 **
@@ -140,6 +140,11 @@ get_connection_info(FILE *stream, struct
         if (!inet_aton(sip, &loc_sin->sin_addr))
             goto error;
         loc_sin->sin_port = htons( atoi(sport) );
+
+# ifdef HAVE_SOCKADDR_LEN
+        cli_sin->sin_len = sizeof(struct sockaddr_in);
+        loc_sin->sin_len = sizeof(struct sockaddr_in);
+# endif
 #endif
 
         free(sip);
diff -ruNp inn-2.4.2/authprogs/pam.conf.example inn-2.4.3/authprogs/pam.conf.example
--- inn-2.4.2/authprogs/pam.conf.example	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/authprogs/pam.conf.example	Thu Jan  1 00:00:00 1970
@@ -1,18 +0,0 @@
-#
-# Sample entries for pam.conf for the nnrpd service
-#
-
-# Disallows other than root logins when /etc/nologin exists
-# (Replaces the `NOLOGINS_FILE' option from login.defs)
-nnrpd	auth		requisite	pam_nologin.so
-
-# Ensure that system users cannot login -- this is probably a bit
-# hacky, but it'll do for now.
-nnrpd	auth		required	pam_listfile.so \
-	onerr=succeed item=user sense=deny file=/etc/news/readers.deny
-
-# Standard Un*x authentication. The "nullok" line allows passwordless
-# accounts.
-nnrpd	auth		required	pam_unix.so
-
-nnrpd	account		required	pam_unix.so
diff -ruNp inn-2.4.2/authprogs/radius.c inn-2.4.3/authprogs/radius.c
--- inn-2.4.2/authprogs/radius.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/authprogs/radius.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: radius.c,v 1.37 2003/01/19 19:58:18 rra Exp $
+/*  $Id: radius.c 6155 2003-01-19 19:58:25Z rra $
 **
 **  Authenticate a user against a remote radius server.
 */
diff -ruNp inn-2.4.2/authprogs/smbval/Makefile inn-2.4.3/authprogs/smbval/Makefile
--- inn-2.4.2/authprogs/smbval/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/authprogs/smbval/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.7 2002/09/29 23:34:19 rra Exp $
+##  $Id: Makefile 5789 2002-09-29 23:34:26Z rra $
 
 include ../../Makefile.global
 
diff -ruNp inn-2.4.2/backends/Makefile inn-2.4.3/backends/Makefile
--- inn-2.4.2/backends/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.54.2.2 2004/05/18 01:18:53 rra Exp $
+##  $Id: Makefile 6806 2004-05-18 01:18:57Z rra $
 
 include ../Makefile.global
 
diff -ruNp inn-2.4.2/backends/actmerge.in inn-2.4.3/backends/actmerge.in
--- inn-2.4.2/backends/actmerge.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/actmerge.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-# @(#) $Id: actmerge.in,v 1.2 1999/11/15 06:28:26 rra Exp $
+# @(#) $Id: actmerge.in 2674 1999-11-15 06:28:29Z rra $
 # @(#) Under RCS control in /usr/local/news/src/inn/local/RCS/actmerge.sh,v
 #
 # actmerge - merge two active files
diff -ruNp inn-2.4.2/backends/actsync.c inn-2.4.3/backends/actsync.c
--- inn-2.4.2/backends/actsync.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/actsync.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* @(#) $Id: actsync.c,v 1.40.2.1 2003/05/31 19:48:25 rra Exp $ */
+/* @(#) $Id: actsync.c 6372 2003-05-31 19:48:28Z rra $ */
 /* @(#) Under RCS control in /usr/local/news/src/inn/local/RCS/actsync.c,v */
 /*
  * actsync - sync or merge two active files
diff -ruNp inn-2.4.2/backends/actsyncd.in inn-2.4.3/backends/actsyncd.in
--- inn-2.4.2/backends/actsyncd.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/actsyncd.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-# @(#) $Id: actsyncd.in,v 1.6.2.1 2003/10/18 05:49:04 rra Exp $
+# @(#) $Id: actsyncd.in 6490 2003-10-18 05:49:04Z rra $
 # @(#) Under RCS control in /usr/local/news/src/inn/local/RCS/actsyncd.sh,v
 #
 # actsyncd - actsync daemon
diff -ruNp inn-2.4.2/backends/archive.c inn-2.4.3/backends/archive.c
--- inn-2.4.2/backends/archive.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/archive.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: archive.c,v 1.38 2003/01/19 04:13:44 rra Exp $
+/*  $Id: archive.c 6138 2003-01-19 04:13:51Z rra $
 **
 **  Read batchfiles on standard input and archive them.
 */
diff -ruNp inn-2.4.2/backends/batcher.c inn-2.4.3/backends/batcher.c
--- inn-2.4.2/backends/batcher.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/batcher.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: batcher.c,v 1.34.2.2 2004/05/17 04:24:53 rra Exp $
+/*  $Id: batcher.c 6762 2004-05-17 04:24:53Z rra $
 **
 **  Read batchfiles on standard input and spew out batches.
 */
diff -ruNp inn-2.4.2/backends/buffchan.c inn-2.4.3/backends/buffchan.c
--- inn-2.4.2/backends/buffchan.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/buffchan.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: buffchan.c,v 1.29 2003/01/19 22:56:32 rra Exp $
+/*  $Id: buffchan.c 6163 2003-01-19 22:56:34Z rra $
 **
 **  Buffered file exploder for innd.
 */
diff -ruNp inn-2.4.2/backends/crosspost.c inn-2.4.3/backends/crosspost.c
--- inn-2.4.2/backends/crosspost.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/crosspost.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: crosspost.c,v 1.17 2003/01/19 01:15:26 rra Exp $
+/*  $Id: crosspost.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Parse input to add links for cross posted articles.  Input format is one
 **  line per article.  Dots '.' are changed to '/'.  Commas ',' or blanks
diff -ruNp inn-2.4.2/backends/cvtbatch.c inn-2.4.3/backends/cvtbatch.c
--- inn-2.4.2/backends/cvtbatch.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/cvtbatch.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: cvtbatch.c,v 1.21 2003/01/19 01:15:26 rra Exp $
+/*  $Id: cvtbatch.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Read file list on standard input and spew out batchfiles.
 */
diff -ruNp inn-2.4.2/backends/filechan.c inn-2.4.3/backends/filechan.c
--- inn-2.4.2/backends/filechan.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/filechan.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: filechan.c,v 1.15 2003/01/19 01:15:26 rra Exp $
+/*  $Id: filechan.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  An InterNetNews channel process that splits a funnel entry into
 **  separate files.  Originally from Robert Elz <kre@munnari.oz.au>.
diff -ruNp inn-2.4.2/backends/inndf.c inn-2.4.3/backends/inndf.c
--- inn-2.4.2/backends/inndf.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/inndf.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: inndf.c,v 1.25.2.2 2004/03/03 18:36:07 hkehoe Exp $
+/*  $Id: inndf.c 6677 2004-03-03 18:36:07Z hkehoe $
 **
 **  Reports free kilobytes (not disk blocks) or free inodes.
 **
diff -ruNp inn-2.4.2/backends/innxbatch.c inn-2.4.3/backends/innxbatch.c
--- inn-2.4.2/backends/innxbatch.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/innxbatch.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: innxbatch.c,v 1.23.2.1 2003/05/19 02:00:05 rra Exp $
+/*  $Id: innxbatch.c 6351 2003-05-19 02:00:06Z rra $
 **
 **  Transmit batches to remote site, using the XBATCH command
 **  Modelled after innxmit.c and nntpbatch.c
diff -ruNp inn-2.4.2/backends/innxmit.c inn-2.4.3/backends/innxmit.c
--- inn-2.4.2/backends/innxmit.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/innxmit.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: innxmit.c,v 1.68.2.2 2004/05/16 20:26:53 rra Exp $
+/*  $Id: innxmit.c 6716 2004-05-16 20:26:56Z rra $
 **
 **  Transmit articles to remote site.
 **  Modified for NNTP streaming: 1996-01-03 Jerry Aguirre
diff -ruNp inn-2.4.2/backends/map.c inn-2.4.3/backends/map.c
--- inn-2.4.2/backends/map.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/map.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: map.c,v 1.11 2003/01/19 01:15:26 rra Exp $
+/*  $Id: map.c 6135 2003-01-19 01:15:40Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/backends/map.h inn-2.4.3/backends/map.h
--- inn-2.4.2/backends/map.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/map.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: map.h,v 1.1 2002/03/10 08:59:53 vinocur Exp $
+/*  $Id: map.h 5292 2002-03-10 08:59:54Z vinocur $
 **
 */
 
diff -ruNp inn-2.4.2/backends/mod-active.in inn-2.4.3/backends/mod-active.in
--- inn-2.4.2/backends/mod-active.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/mod-active.in	Mon Mar 20 04:14:57 2006
@@ -28,7 +28,7 @@ $| = 1;                # show output as 
 # checks for alternative operating systems is incomplete.
 unless ($diff_flags) {
   if (`diff -v 2>&1` =~ /GNU/) {
-    $diff_flags = '-u0';
+    $diff_flags = '-U0';
   } elsif ($^O =~ /^(dec_osf|solaris)$/) {
     $diff_flags = '-C0';
   } elsif ($^O eq 'nextstep') {
diff -ruNp inn-2.4.2/backends/ninpaths.c inn-2.4.3/backends/ninpaths.c
--- inn-2.4.2/backends/ninpaths.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/ninpaths.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: ninpaths.c,v 1.2.2.1 2003/05/31 18:35:04 rra Exp $
+/*  $Id: ninpaths.c 6362 2003-05-31 18:35:04Z rra $
 **
 **  New inpaths reporting program.
 **
diff -ruNp inn-2.4.2/backends/nntpget.c inn-2.4.3/backends/nntpget.c
--- inn-2.4.2/backends/nntpget.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/nntpget.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: nntpget.c,v 1.33 2003/01/19 01:15:26 rra Exp $
+/*  $Id: nntpget.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Connect to a remote site, and get news from it to offer to our local
 **  server.  Read list on stdin, or get it via NEWNEWS command.  Writes
diff -ruNp inn-2.4.2/backends/nntpsend.in inn-2.4.3/backends/nntpsend.in
--- inn-2.4.2/backends/nntpsend.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/nntpsend.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-##  $Revision: 1.4 $
+##  $Revision: 5047 $
 ##  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]...
diff -ruNp inn-2.4.2/backends/overchan.c inn-2.4.3/backends/overchan.c
--- inn-2.4.2/backends/overchan.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/overchan.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: overchan.c,v 1.36 2003/01/19 01:15:26 rra Exp $
+/*  $Id: overchan.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Parse input to add to news overview database.
 */
diff -ruNp inn-2.4.2/backends/send-ihave.in inn-2.4.3/backends/send-ihave.in
--- inn-2.4.2/backends/send-ihave.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/send-ihave.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-##  $Revision: 1.2 $
+##  $Revision: 2674 $
 ##  SH script to send IHAVE batches out.
 
 PROGNAME=`basename $0`
diff -ruNp inn-2.4.2/backends/send-nntp.in inn-2.4.3/backends/send-nntp.in
--- inn-2.4.2/backends/send-nntp.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/send-nntp.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-##  $Revision: 1.3 $
+##  $Revision: 4115 $
 ##  SH script to send NNTP news out.
 
 PROGNAME=`basename $0`
diff -ruNp inn-2.4.2/backends/send-uucp.in inn-2.4.3/backends/send-uucp.in
--- inn-2.4.2/backends/send-uucp.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/send-uucp.in	Mon Mar 20 04:14:57 2006
@@ -21,9 +21,10 @@
 use strict;
 use Sys::Syslog;
 
-# for compatibility with INN 1.x
+# for compatibility with earlier versions of INN
 $inn::pathetc ||= '/etc/news';
 $inn::syslog_facility ||= 'news';
+$inn::uux ||= 'uux';
 
 # some default values
 my $MAXSIZE = 500000;
@@ -90,14 +91,15 @@ sub read_cf {
         my ($sitespec, $compress, $size, $time) = split(/\s+/);
         next if not $sitespec;
 
-        my ($site, $host) = split(/:/, $sitespec);
+        my ($site, $host, $funnel) = split(/:/, $sitespec);
         $host = $site if not $host;
+        $funnel = $site if not $funnel;
 
         $compress =~ s/_/ /g if $compress;
 
         if ($site_wanted) {
             if ($site eq $site_wanted) {
-                push @sites, [$site, $host, $compress, $size];
+                push @sites, [$site, $host, $funnel, $compress, $size];
                 last;
             }
             next;
@@ -106,10 +108,10 @@ sub read_cf {
         if ($time) {
             foreach my $time (split(/,/, $time)) {
                 next if $time != $hour;
-                push @sites, [$site, $host, $compress, $size];
+                push @sites, [$site, $host, $funnel, $compress, $size];
             }
         } else {
-            push @sites, [$site, $host, $compress, $size];
+            push @sites, [$site, $host, $funnel, $compress, $size];
         }
     }
     close CF;
@@ -140,7 +142,7 @@ sub unbatcher {
 # batch articles for one site
 sub run_site {
     my ($cfg) = @_;
-    my ($site, $host, $compress, $size) = @$cfg;
+    my ($site, $host, $funnel, $compress, $size) = @$cfg;
 
     logmsg("checking site $site", 'debug');
     my $maxjobs = '';
@@ -156,36 +158,49 @@ sub run_site {
     $compress ||= $inn::compress;
     $size ||= $MAXSIZE;
 
-    # if exists a .work temp file left by a previous invocation, append
-    # it to the current batch file
+    # if exists a .work temp file left by a previous invocation, rename
+    # it to .work.tmp, we'll append it to the current batch file once it
+    # has been renamed and flushed.
     if (-f "$site.work") {
-        my $err = '';
-        open(OUT, ">>$site") or logdie("cannot open $site: $!");
-        open(IN, "$site.work") or logdie("cannot open $site.work: $!");
-        print OUT while <IN>;
-        close IN;
-        close OUT or logdie("cannot close $site: $!");;
+        rename("$site.work", "$site.work.tmp")
+            or logdie("cannot rename $site.work: $!", 'crit');
     }
 
-    if (not -f $site) {
+    if (not -f $site and not -f "$site.work.tmp") {
         logmsg("no batch file for site $site", 'err');
         return;
     }
 
     rename($site, "$site.work") or logdie("cannot rename $site: $!", 'crit');
-    ctlinnd('-t120', 'flush', $site);
+    logmsg("Flushing $funnel for site $site", 'debug');
+    ctlinnd('-t120', 'flush', $funnel);
+
+    # append the old .work temp file to the current batch file if needed
+    if (-f "$site.work.tmp") {
+        my $err = '';
+        open(OUT, ">>$site.work")
+            or logdie("cannot open $site.work: $!", 'crit');
+        open(IN, "$site.work.tmp")
+            or logdie("cannot open $site.work.tmp: $!", 'crit');
+        print OUT while <IN>;
+        close IN;
+        close OUT or logdie("cannot close $site.work: $!");;
+        unlink "$site.work.tmp"
+            or logmsg("cannot delete $site.work.tmp: $!", 'err');
+    }
+
     if (not -s "$site.work") {
         logmsg("no articles for $site", 'debug');
         unlink "$site.work" or logmsg("cannot delete $site.work: $!", 'err');
     } else {
         if ($compress eq 'none') {
             system "batcher -b $size $maxjobs $BATCHER_FLAGS "
-                . "-p\"uux $UUX_FLAGS %s!rnews\" $host $site.work";
+                . "-p\"$inn::uux $UUX_FLAGS %s!rnews\" $host $site.work";
         } else {
             system "batcher -b $size $maxjobs $BATCHER_FLAGS "
                 . "-p\"{ echo '#! " . unbatcher($compress)
                 . "' ; exec $compress; } | "
-                . "uux $UUX_FLAGS %s!rnews\" $host $site.work";
+                . "$inn::uux $UUX_FLAGS %s!rnews\" $host $site.work";
         }
         logmsg("batched articles for $site", 'debug');
     }
@@ -267,7 +282,7 @@ The sites to which articles are to be se
 configuration file F<send-uucp.cf>.  Each site is specified with a line of
 the form:
 
-    site[:host] [compressor [maxsize [batchtime]]]
+    site[:host[:funnel]] [compressor [maxsize [batchtime]]]
 
 =over 4
 
@@ -281,6 +296,14 @@ from newsfeeds(5).
 The UUCP host name to which batches should be sent for this site.
 If omitted, the news site name will be used as the UUCP host name.
 
+=item I<funnel>
+
+In the case of a site configured as a funnel, B<send-uucp> needs to flush
+the channel (or exploder) being used as the target of the funnel instead of
+flushing the site.  This is the way to tell B<send-uucp> the name of the
+channel or exploder to flush for this site.  If not specified, default to
+flushing the site.
+
 =item I<compressor>
 
 The compression method to use for batches.  This should be one of compress,
@@ -317,14 +340,18 @@ Here is an example send-uucp.cf configur
     manhole         compress        1048576         5,18,22
     owl             compress        1048576
     able
+    pern::MYFUNNEL!
 
-This defines seven UUCP sites.  The first four use gzip compression and the
+This defines eight UUCP sites.  The first four use gzip compression and the
 last three use compress.  The first six use a batch size of 1MB, and the
 last site (able) uses the default of 500,000 bytes.  The zoetermeer,
 hoofddorp, pa3ebv, and manhole sites will only have batches generated for
 them during the hours of 05:00, 18:00, and 22:00, and the drinkel site will
 only have batches generated during those hours and 20:00, 00:00, and 02:00.
 There are no restrictions on when batches will be generated for owl or able.
+
+The pern site is configured as a funnel into C<MYFUNNEL!>.  B<send-uucp> will
+issue C<ctlinnd flush MYFUNNEL!> instead of C<ctlinnd flush pern>.
 
 =head1 FILES
 
diff -ruNp inn-2.4.2/backends/sendinpaths.in inn-2.4.3/backends/sendinpaths.in
--- inn-2.4.2/backends/sendinpaths.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/sendinpaths.in	Mon Mar 20 04:14:57 2006
@@ -2,7 +2,7 @@
 # fixscript will replace this line with code to load innshellvars
 #
 # Submit path statistics based on ninpaths
-# $Id: sendinpaths.in,v 1.1 2002/11/25 17:53:04 rra Exp $
+# $Id: sendinpaths.in 5854 2002-11-25 17:53:06Z rra $
 
 # Assuming the ninpaths dump files are in ${MOST_LOGS}/path/inpaths.%d
 
diff -ruNp inn-2.4.2/backends/sendxbatches.in inn-2.4.3/backends/sendxbatches.in
--- inn-2.4.2/backends/sendxbatches.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/sendxbatches.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-# $Id: sendxbatches.in,v 1.2 1999/11/15 06:28:27 rra Exp $ 
+# $Id: sendxbatches.in 2674 1999-11-15 06:28:29Z rra $ 
 # By petri@ibr.cs.tu-bs.de with mods by libove@jerry.alf.dec.com
 #
 #  Script to send xbatches for a site, wrapped around innxbatch
diff -ruNp inn-2.4.2/backends/shlock.c inn-2.4.3/backends/shlock.c
--- inn-2.4.2/backends/shlock.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/shlock.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: shlock.c,v 1.9 2003/01/14 06:03:12 rra Exp $
+/*  $Id: shlock.c 6124 2003-01-14 06:03:29Z rra $
 **
 **  Produce reliable locks for shell scripts, by Peter Honeyman as told
 **  to Rich $alz.
diff -ruNp inn-2.4.2/backends/shrinkfile.c inn-2.4.3/backends/shrinkfile.c
--- inn-2.4.2/backends/shrinkfile.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/backends/shrinkfile.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: shrinkfile.c,v 1.14 2003/01/19 01:15:27 rra Exp $
+/*  $Id: shrinkfile.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Shrink files on line boundaries.
 **
diff -ruNp inn-2.4.2/configure inn-2.4.3/configure
--- inn-2.4.2/configure	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/configure	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.244.2.7 
+# From configure.in Revision: 7461 
 # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
 ## Copyright 1996, 1997, 1998, 1999, 2000, 2001
 ## Free Software Foundation, Inc.
@@ -406,17 +406,17 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-sendmail=PATH    Path to sendmail"
 ac_help="$ac_help
-  --with-berkeleydb[=PATH]  Enable BerkeleyDB (for ovdb overview method)"
-ac_help="$ac_help
-  --with-openssl=PATH     Enable OpenSSL (for NNTP over SSL support)"
-ac_help="$ac_help
-  --with-sasl=PATH        Enable SASL (for imapfeed authentication)"
-ac_help="$ac_help
   --with-kerberos=PATH    Path to Kerberos v5 (for auth_krb5)"
 ac_help="$ac_help
   --with-perl             Embedded Perl script support [default=no]"
 ac_help="$ac_help
   --with-python           Embedded Python module support [default=no]"
+ac_help="$ac_help
+  --with-berkeleydb[=PATH]  Enable BerkeleyDB (for ovdb overview method)"
+ac_help="$ac_help
+  --with-openssl=PATH     Enable OpenSSL (for NNTP over SSL support)"
+ac_help="$ac_help
+  --with-sasl=PATH        Enable SASL (for imapfeed authentication)"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -5793,178 +5793,159 @@ if test "${with_sendmail+set}" = set; th
 fi
 
 
-
-# Check whether --with-berkeleydb or --without-berkeleydb was given.
-if test "${with_berkeleydb+set}" = set; then
-  withval="$with_berkeleydb"
-  BERKELEY_DB_DIR=$with_berkeleydb
-else
-  BERKELEY_DB_DIR=no
+# Check whether --with-kerberos or --without-kerberos was given.
+if test "${with_kerberos+set}" = set; then
+  withval="$with_kerberos"
+  if test x"$with_kerberos" != xno ; then
+         KRB5_LDFLAGS="-L$with_kerberos/lib"
+         KRB5_INC="-I$with_kerberos/include"
+     fi
 fi
 
-echo $ac_n "checking if BerkeleyDB is desired""... $ac_c" 1>&6
-echo "configure:5807: checking if BerkeleyDB is desired" >&5
-if test x"$BERKELEY_DB_DIR" = xno ; then
-    echo "$ac_t""no" 1>&6
-    BERKELEY_DB_LDFLAGS=
-    BERKELEY_DB_CFLAGS=
-    BERKELEY_DB_LIB=
-else
-    echo "$ac_t""yes" 1>&6
-    echo $ac_n "checking for BerkeleyDB location""... $ac_c" 1>&6
-echo "configure:5816: checking for BerkeleyDB location" >&5
-    if test x"$BERKELEY_DB_DIR" = xyes ; then
-        for v in BerkeleyDB BerkeleyDB.3.0 BerkeleyDB.3.1 BerkeleyDB.3.2 \
-                 BerkeleyDB.3.3 BerkeleyDB.4.0 BerkeleyDB.4.1 BerkeleyDB.4.2 BerkeleyDB.4.3 ; do
-            for d in $prefix /usr/local /opt /usr ; do
-                if test -d "$d/$v" ; then
-                    BERKELEY_DB_DIR="$d/$v"
-                    break
-                fi
-	    done
-        done
-    fi
-    if test x"$BERKELEY_DB_DIR" = xyes ; then
-        for v in db43 db42 db41 db4 db3 db2 ; do
-            if test -d "/usr/local/include/$v" ; then
-                BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
-                BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
-                BERKELEY_DB_LIB="-l$v"
-                echo "$ac_t""FreeBSD locations" 1>&6
-                break
-            fi
-        done
-        if test x"$BERKELEY_DB_LIB" = x ; then
-            for v in db43 db42 db41 db4 db3 db2 ; do
-                if test -d "/usr/include/$v" ; then
-                    BERKELEY_DB_CFLAGS="-I/usr/include/$v"
-                    BERKELEY_DB_LIB="-l$v"
-                    echo "$ac_t""Linux locations" 1>&6
-                    break
-                fi
-            done
-            if test x"$BERKELEY_DB_LIB" = x ; then        
-                BERKELEY_DB_LIB=-ldb
-                echo "$ac_t""trying -ldb" 1>&6
-            fi
-        fi
-    else
-        BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
-        BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
-        BERKELEY_DB_LIB="-ldb"
-        echo "$ac_t""$BERKELEY_DB_DIR" 1>&6
-    fi
-    cat >> confdefs.h <<\EOF
-#define USE_BERKELEY_DB 1
+
+# Check whether --with-perl or --without-perl was given.
+if test "${with_perl+set}" = set; then
+  withval="$with_perl"
+  case "${withval}" in
+    yes) DO_PERL=DO
+         cat >> confdefs.h <<\EOF
+#define DO_PERL 1
 EOF
 
+         ;;
+    no)  DO_PERL=DONT ;;
+    *)   { echo "configure: error: invalid argument to --with-perl" 1>&2; exit 1; } ;;
+    esac
+else
+  DO_PERL=DONT
 fi
 
 
+# Check whether --with-python or --without-python was given.
+if test "${with_python+set}" = set; then
+  withval="$with_python"
+  case "${withval}" in
+    yes) DO_PYTHON=define
+         cat >> confdefs.h <<\EOF
+#define DO_PYTHON 1
+EOF
 
-
-
-# Check whether --with-openssl or --without-openssl was given.
-if test "${with_openssl+set}" = set; then
-  withval="$with_openssl"
-  OPENSSL_DIR=$with_openssl
+         ;;
+    no)  DO_PYTHON=DONT ;;
+    *)   { echo "configure: error: invalid argument to --with-python" 1>&2; exit 1; } ;;
+    esac
 else
-  OPENSSL_DIR=no
+  DO_PYTHON=DONT
 fi
 
-echo $ac_n "checking if OpenSSL is desired""... $ac_c" 1>&6
-echo "configure:5877: checking if OpenSSL is desired" >&5
-if test x"$OPENSSL_DIR" = xno ; then
-    echo "$ac_t""no" 1>&6
-    SSL_BIN=
-    SSL_INC=
-    SSL_LIB=
-else
-    echo "$ac_t""yes" 1>&6
-    echo $ac_n "checking for OpenSSL location""... $ac_c" 1>&6
-echo "configure:5886: checking for OpenSSL location" >&5
-    if test x"$OPENSSL_DIR" = xyes ; then
-        for dir in $prefix /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg \
-                   /usr/local /usr ; do
-            if test -f "$dir/include/openssl/ssl.h" ; then
-                OPENSSL_DIR=$dir
-                break
-            fi
-        done
-    fi
-    if test x"$OPENSSL_DIR" = xyes ; then
-        { echo "configure: error: Can not find OpenSSL" 1>&2; exit 1; }
-    else
-        echo "$ac_t""$OPENSSL_DIR" 1>&6
-	SSL_BIN="${OPENSSL_DIR}/bin"
-	SSL_INC="-I${OPENSSL_DIR}/include"
 
-        # This is mildly tricky.  In order to satisfy most linkers, libraries
-        # have to be listed in the right order, which means that libraries
-        # with dependencies on other libraries need to be listed first.  But
-        # the -L flag for the OpenSSL library directory needs to go first of
-        # all.  So put the -L flag into LIBS and accumulate actual libraries
-        # into SSL_LIB, and then at the end, restore LIBS and move -L to the
-        # beginning of SSL_LIB.
-        inn_save_LIBS=$LIBS
-        LIBS="$LIBS -L${OPENSSL_DIR}/lib"
-	SSL_LIB=''
-	echo $ac_n "checking for RSAPublicEncrypt in -lrsaref""... $ac_c" 1>&6
-echo "configure:5914: checking for RSAPublicEncrypt in -lrsaref" >&5
-ac_lib_var=`echo rsaref'_'RSAPublicEncrypt | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+HOSTNAME=`hostname 2> /dev/null || uname -n`
+
+
+if test $ac_cv_prog_gcc = yes; then
+    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+echo "configure:5848: 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_save_LIBS="$LIBS"
-LIBS="-lrsaref  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5922 "configure"
+    ac_pattern="Autoconf.*'x'"
+  cat > conftest.$ac_ext <<EOF
+#line 5854 "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
-    builtin and then its argument prototype would still apply.  */
-char RSAPublicEncrypt();
-
-int main() {
-RSAPublicEncrypt()
-; return 0; }
+#include <sgtty.h>
+Autoconf TIOCGETP
 EOF
-if { (eval echo configure:5933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "$ac_pattern" >/dev/null 2>&1; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  ac_cv_prog_gcc_traditional=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  ac_cv_prog_gcc_traditional=no
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
 
+
+  if test $ac_cv_prog_gcc_traditional = no; then
+    cat > conftest.$ac_ext <<EOF
+#line 5872 "configure"
+#include "confdefs.h"
+#include <termio.h>
+Autoconf TCGETA
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "$ac_pattern" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_prog_gcc_traditional=yes
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for RSAPublicEncrypt in -lRSAglue""... $ac_c" 1>&6
-echo "configure:5949: checking for RSAPublicEncrypt in -lRSAglue" >&5
-ac_lib_var=`echo RSAglue'_'RSAPublicEncrypt | sed 'y%./+-%__p_%'`
+rm -f conftest*
+
+  fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
+  if test $ac_cv_prog_gcc_traditional = yes; then
+    CC="$CC -traditional"
+  fi
+fi
+
+# 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:5896: 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"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
+fi
+fi
+LEX="$ac_cv_prog_LEX"
+if test -n "$LEX"; then
+  echo "$ac_t""$LEX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$LEXLIB"
+then
+  case "$LEX" in
+  flex*) ac_lib=fl ;;
+  *) ac_lib=l ;;
+  esac
+  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
+echo "configure:5930: 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
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lRSAglue -lrsaref $LIBS"
+LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5957 "configure"
+#line 5938 "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
     builtin and then its argument prototype would still apply.  */
-char RSAPublicEncrypt();
+char yywrap();
 
 int main() {
-RSAPublicEncrypt()
+yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:5968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5949: \"$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
@@ -5979,456 +5960,7 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  SSL_LIB="-lRSAglue -lrsaref"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-	echo $ac_n "checking for BIO_new in -lcrypto""... $ac_c" 1>&6
-echo "configure:5993: checking for BIO_new in -lcrypto" >&5
-ac_lib_var=`echo crypto'_'BIO_new | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcrypto $SSL_LIB $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6001 "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
-    builtin and then its argument prototype would still apply.  */
-char BIO_new();
-
-int main() {
-BIO_new()
-; return 0; }
-EOF
-if { (eval echo configure:6012: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for DSO_load in -ldl""... $ac_c" 1>&6
-echo "configure:6028: checking for DSO_load in -ldl" >&5
-ac_lib_var=`echo dl'_'DSO_load | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldl -lcrypto -ldl $SSL_LIB $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6036 "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
-    builtin and then its argument prototype would still apply.  */
-char DSO_load();
-
-int main() {
-DSO_load()
-; return 0; }
-EOF
-if { (eval echo configure:6047: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SSL_LIB="-lcrypto -ldl $SSL_LIB"
-else
-  echo "$ac_t""no" 1>&6
-SSL_LIB="-lcrypto $SSL_LIB"
-fi
-
-else
-  echo "$ac_t""no" 1>&6
-{ echo "configure: error: Can not find OpenSSL" 1>&2; exit 1; }
-fi
-
-	echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6
-echo "configure:6074: checking for SSL_library_init in -lssl" >&5
-ac_lib_var=`echo ssl'_'SSL_library_init | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lssl $SSL_LIB $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6082 "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
-    builtin and then its argument prototype would still apply.  */
-char SSL_library_init();
-
-int main() {
-SSL_library_init()
-; return 0; }
-EOF
-if { (eval echo configure:6093: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SSL_LIB="-lssl $SSL_LIB"
-else
-  echo "$ac_t""no" 1>&6
-{ echo "configure: error: Can not find OpenSSL" 1>&2; exit 1; }
-fi
-
-        SSL_LIB="-L${OPENSSL_DIR}/lib $SSL_LIB"
-        LIBS=$inn_save_LIBS
-        cat >> confdefs.h <<\EOF
-#define HAVE_SSL 1
-EOF
-
-    fi
-fi
-
-
-
-
-
-# Check whether --with-sasl or --without-sasl was given.
-if test "${with_sasl+set}" = set; then
-  withval="$with_sasl"
-  SASL_DIR=$with_sasl
-else
-  SASL_DIR=no
-fi
-
-echo $ac_n "checking if SASL is desired""... $ac_c" 1>&6
-echo "configure:6136: checking if SASL is desired" >&5
-if test x"$SASL_DIR" = xno ; then
-    echo "$ac_t""no" 1>&6
-    SASL_INC=
-    SASL_LIB=
-else
-    echo "$ac_t""yes" 1>&6
-    echo $ac_n "checking for SASL location""... $ac_c" 1>&6
-echo "configure:6144: checking for SASL location" >&5
-    if test x"$SASL_DIR" = xyes ; then
-        for dir in $prefix /usr/local/sasl /usr/sasl /usr/pkg /usr/local ; do
-            if test -f "$dir/include/sasl/sasl.h" ; then
-                SASL_DIR=$dir
-                break
-            fi
-        done
-    fi
-    if test x"$SASL_DIR" = xyes ; then
-        if test -f "/usr/include/sasl/sasl.h" ; then
-            SASL_INC=-I/usr/include/sasl
-            SASL_DIR=/usr
-            echo "$ac_t""$SASL_DIR" 1>&6
-            inn_save_LIBS=$LIBS
-            echo $ac_n "checking for sasl_getprop in -lsasl2""... $ac_c" 1>&6
-echo "configure:6160: checking for sasl_getprop in -lsasl2" >&5
-ac_lib_var=`echo sasl2'_'sasl_getprop | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsasl2  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6168 "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
-    builtin and then its argument prototype would still apply.  */
-char sasl_getprop();
-
-int main() {
-sasl_getprop()
-; return 0; }
-EOF
-if { (eval echo configure:6179: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SASL_LIB=-lsasl2
-else
-  echo "$ac_t""no" 1>&6
-{ echo "configure: error: Can not find SASL" 1>&2; exit 1; }
-fi
-
-            LIBS=$inn_save_LIBS
-            cat >> confdefs.h <<\EOF
-#define HAVE_SASL 1
-EOF
-
-        else
-            { echo "configure: error: Can not find SASL" 1>&2; exit 1; }
-        fi
-    else
-        echo "$ac_t""$SASL_DIR" 1>&6
-	SASL_INC="-I${SASL_DIR}/include"
-
-        inn_save_LIBS=$LIBS
-        LIBS="$LIBS -L${SASL_DIR}/lib"
-	echo $ac_n "checking for sasl_getprop in -lsasl2""... $ac_c" 1>&6
-echo "configure:6215: checking for sasl_getprop in -lsasl2" >&5
-ac_lib_var=`echo sasl2'_'sasl_getprop | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsasl2  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6223 "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
-    builtin and then its argument prototype would still apply.  */
-char sasl_getprop();
-
-int main() {
-sasl_getprop()
-; return 0; }
-EOF
-if { (eval echo configure:6234: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SASL_LIB="-L${SASL_DIR}/lib -lsasl2"
-else
-  echo "$ac_t""no" 1>&6
-{ echo "configure: error: Can not find SASL" 1>&2; exit 1; }
-fi
-
-        LIBS=$inn_save_LIBS
-        cat >> confdefs.h <<\EOF
-#define HAVE_SASL 1
-EOF
-
-    fi
-fi
-
-
-
-# Check whether --with-kerberos or --without-kerberos was given.
-if test "${with_kerberos+set}" = set; then
-  withval="$with_kerberos"
-  if test x"$with_kerberos" != xno ; then
-         KRB5_LIB="-L$with_kerberos/lib"
-         KRB5_INC="-I$with_kerberos/include"
-     fi
-fi
-
-
-# Check whether --with-perl or --without-perl was given.
-if test "${with_perl+set}" = set; then
-  withval="$with_perl"
-  case "${withval}" in
-    yes) DO_PERL=DO
-         cat >> confdefs.h <<\EOF
-#define DO_PERL 1
-EOF
-
-         ;;
-    no)  DO_PERL=DONT ;;
-    *)   { echo "configure: error: invalid argument to --with-perl" 1>&2; exit 1; } ;;
-    esac
-else
-  DO_PERL=DONT
-fi
-
-
-# Check whether --with-python or --without-python was given.
-if test "${with_python+set}" = set; then
-  withval="$with_python"
-  case "${withval}" in
-    yes) DO_PYTHON=define
-         cat >> confdefs.h <<\EOF
-#define DO_PYTHON 1
-EOF
-
-         ;;
-    no)  DO_PYTHON=DONT ;;
-    *)   { echo "configure: error: invalid argument to --with-python" 1>&2; exit 1; } ;;
-    esac
-else
-  DO_PYTHON=DONT
-fi
-
-
-HOSTNAME=`hostname 2> /dev/null || uname -n`
-
-
-if test $ac_cv_prog_gcc = yes; then
-    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:6316: 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 6322 "configure"
-#include "confdefs.h"
-#include <sgtty.h>
-Autoconf TIOCGETP
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "$ac_pattern" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_prog_gcc_traditional=yes
-else
-  rm -rf conftest*
-  ac_cv_prog_gcc_traditional=no
-fi
-rm -f conftest*
-
-
-  if test $ac_cv_prog_gcc_traditional = no; then
-    cat > conftest.$ac_ext <<EOF
-#line 6340 "configure"
-#include "confdefs.h"
-#include <termio.h>
-Autoconf TCGETA
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "$ac_pattern" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_prog_gcc_traditional=yes
-fi
-rm -f conftest*
-
-  fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
-  if test $ac_cv_prog_gcc_traditional = yes; then
-    CC="$CC -traditional"
-  fi
-fi
-
-# 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:6364: 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"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
-fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$LEXLIB"
-then
-  case "$LEX" in
-  flex*) ac_lib=fl ;;
-  *) ac_lib=l ;;
-  esac
-  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:6398: 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
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$ac_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6406 "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
-    builtin and then its argument prototype would still apply.  */
-char yywrap();
-
-int main() {
-yywrap()
-; return 0; }
-EOF
-if { (eval echo configure:6417: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LEXLIB="-l$ac_lib"
+  LEXLIB="-l$ac_lib"
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -6436,7 +5968,7 @@ fi
 fi
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:6440: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:5972: 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
@@ -6465,7 +5997,7 @@ fi
 # 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:6469: checking for $ac_word" >&5
+echo "configure:6001: 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
@@ -6497,7 +6029,7 @@ do
 # 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:6501: checking for $ac_word" >&5
+echo "configure:6033: 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
@@ -6562,7 +6094,7 @@ esac
 # 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:6566: checking for $ac_word" >&5
+echo "configure:6098: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CTAGS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6604,7 +6136,7 @@ fi
 # 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:6608: checking for $ac_word" >&5
+echo "configure:6140: 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
@@ -6642,7 +6174,7 @@ fi
 # 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:6646: checking for $ac_word" >&5
+echo "configure:6178: 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
@@ -6680,7 +6212,7 @@ fi
 # 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:6684: checking for $ac_word" >&5
+echo "configure:6216: 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
@@ -6718,7 +6250,7 @@ fi
 # 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:6722: checking for $ac_word" >&5
+echo "configure:6254: 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
@@ -6756,7 +6288,7 @@ fi
 # 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:6760: checking for $ac_word" >&5
+echo "configure:6292: 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
@@ -6794,7 +6326,7 @@ fi
 # 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:6798: checking for $ac_word" >&5
+echo "configure:6330: 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
@@ -6829,12 +6361,53 @@ fi
 if test -z "${_PATH_SORT}" ; then
     { echo "configure: error: sort was not found in path and is required" 1>&2; exit 1; }
 fi
+for ac_prog in uux
+do
+# 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:6370: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path__PATH_UUX'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$_PATH_UUX" in
+  /*)
+  ac_cv_path__PATH_UUX="$_PATH_UUX" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path__PATH_UUX="$_PATH_UUX" # 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_UUX="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  ;;
+esac
+fi
+_PATH_UUX="$ac_cv_path__PATH_UUX"
+if test -n "$_PATH_UUX"; then
+  echo "$ac_t""$_PATH_UUX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$_PATH_UUX" && break
+done
+test -n "$_PATH_UUX" || _PATH_UUX="uux"
+
 
 inn_perl_command='print $]'
 
 
 echo $ac_n "checking for Perl version""... $ac_c" 1>&6
-echo "configure:6838: checking for Perl version" >&5
+echo "configure:6411: checking for Perl version" >&5
 if eval "test \"`echo '$''{'inn_cv_perl_version'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6853,7 +6426,7 @@ do
 # 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:6857: checking for $ac_word" >&5
+echo "configure:6430: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PATH_GPGV'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6893,7 +6466,7 @@ do
 # 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:6897: checking for $ac_word" >&5
+echo "configure:6470: 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
@@ -6938,7 +6511,7 @@ do
 # 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:6942: checking for $ac_word" >&5
+echo "configure:6515: 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
@@ -6980,7 +6553,7 @@ compress|gzip) ;;
 *)             # Extract the first word of ""$LOG_COMPRESS"", so it can be a program name with args.
 set dummy "$LOG_COMPRESS"; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:6984: checking for $ac_word" >&5
+echo "configure:6557: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LOG_COMPRESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7019,7 +6592,7 @@ esac
 # 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:7023: checking for $ac_word" >&5
+echo "configure:6596: 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
@@ -7061,7 +6634,7 @@ fi
 # Extract the first word of "gzip", so it can be a program name with args.
 set dummy gzip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7065: checking for $ac_word" >&5
+echo "configure:6638: 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
@@ -7110,13 +6683,13 @@ fi
 
 if test "${with_sendmail+set}" = set ; then
     echo $ac_n "checking for sendmail""... $ac_c" 1>&6
-echo "configure:7114: checking for sendmail" >&5
+echo "configure:6687: checking for sendmail" >&5
     echo "$ac_t""$SENDMAIL" 1>&6
 else
     # 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:7120: checking for $ac_word" >&5
+echo "configure:6693: 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
@@ -7156,7 +6729,7 @@ fi
 # Extract the first word of "uustat", so it can be a program name with args.
 set dummy uustat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7160: checking for $ac_word" >&5
+echo "configure:6733: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_UUSTAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7189,7 +6762,7 @@ if test x"$DO_PYTHON" = xdefine ; then
     # Extract the first word of "python", so it can be a program name with args.
 set dummy python; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7193: checking for $ac_word" >&5
+echo "configure:6766: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path__PATH_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7231,14 +6804,14 @@ fi
 
 
 echo $ac_n "checking for library containing setproctitle""... $ac_c" 1>&6
-echo "configure:7235: checking for library containing setproctitle" >&5
+echo "configure:6808: checking for library containing setproctitle" >&5
 if eval "test \"`echo '$''{'ac_cv_search_setproctitle'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_setproctitle="no"
 cat > conftest.$ac_ext <<EOF
-#line 7242 "configure"
+#line 6815 "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
@@ -7249,7 +6822,7 @@ int main() {
 setproctitle()
 ; return 0; }
 EOF
-if { (eval echo configure:7253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_setproctitle="none required"
 else
@@ -7260,7 +6833,7 @@ rm -f conftest*
 test "$ac_cv_search_setproctitle" = "no" && for i in util; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7264 "configure"
+#line 6837 "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
@@ -7271,7 +6844,7 @@ int main() {
 setproctitle()
 ; return 0; }
 EOF
-if { (eval echo configure:7275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_setproctitle="-l$i"
 break
@@ -7296,12 +6869,12 @@ else :
      for ac_func in pstat
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7300: checking for $ac_func" >&5
+echo "configure:6873: 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 7305 "configure"
+#line 6878 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7324,7 +6897,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6901: \"$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
@@ -7352,14 +6925,14 @@ fi
 
 
 echo $ac_n "checking for library containing gethostbyname""... $ac_c" 1>&6
-echo "configure:7356: checking for library containing gethostbyname" >&5
+echo "configure:6929: checking for library containing gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_search_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_gethostbyname="no"
 cat > conftest.$ac_ext <<EOF
-#line 7363 "configure"
+#line 6936 "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
@@ -7370,7 +6943,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:7374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_gethostbyname="none required"
 else
@@ -7381,7 +6954,7 @@ rm -f conftest*
 test "$ac_cv_search_gethostbyname" = "no" && for i in nsl; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7385 "configure"
+#line 6958 "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
@@ -7392,7 +6965,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:7396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_gethostbyname="-l$i"
 break
@@ -7414,14 +6987,14 @@ else :
 fi
 
 echo $ac_n "checking for library containing socket""... $ac_c" 1>&6
-echo "configure:7418: checking for library containing socket" >&5
+echo "configure:6991: checking for library containing socket" >&5
 if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_socket="no"
 cat > conftest.$ac_ext <<EOF
-#line 7425 "configure"
+#line 6998 "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
@@ -7432,7 +7005,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:7436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_socket="none required"
 else
@@ -7443,7 +7016,7 @@ rm -f conftest*
 test "$ac_cv_search_socket" = "no" && for i in socket; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7447 "configure"
+#line 7020 "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
@@ -7454,7 +7027,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:7458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_socket="-l$i"
 break
@@ -7473,7 +7046,7 @@ if test "$ac_cv_search_socket" != "no"; 
   
 else :
   echo $ac_n "checking for socket in -lnsl""... $ac_c" 1>&6
-echo "configure:7477: checking for socket in -lnsl" >&5
+echo "configure:7050: checking for socket in -lnsl" >&5
 ac_lib_var=`echo nsl'_'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
@@ -7481,7 +7054,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl -lsocket $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7485 "configure"
+#line 7058 "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
@@ -7492,7 +7065,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:7496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7069: \"$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
@@ -7516,14 +7089,14 @@ fi
 
 
 echo $ac_n "checking for library containing inet_aton""... $ac_c" 1>&6
-echo "configure:7520: checking for library containing inet_aton" >&5
+echo "configure:7093: checking for library containing inet_aton" >&5
 if eval "test \"`echo '$''{'ac_cv_search_inet_aton'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_inet_aton="no"
 cat > conftest.$ac_ext <<EOF
-#line 7527 "configure"
+#line 7100 "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
@@ -7534,7 +7107,7 @@ int main() {
 inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:7538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_inet_aton="none required"
 else
@@ -7545,7 +7118,7 @@ rm -f conftest*
 test "$ac_cv_search_inet_aton" = "no" && for i in resolv; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7549 "configure"
+#line 7122 "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
@@ -7556,7 +7129,7 @@ int main() {
 inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:7560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_inet_aton="-l$i"
 break
@@ -7581,14 +7154,14 @@ inn_save_LIBS=$LIBS
 LIBS=${CRYPT_LIB}
 
 echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6
-echo "configure:7585: checking for library containing crypt" >&5
+echo "configure:7158: checking for library containing crypt" >&5
 if eval "test \"`echo '$''{'ac_cv_search_crypt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_crypt="no"
 cat > conftest.$ac_ext <<EOF
-#line 7592 "configure"
+#line 7165 "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
@@ -7599,7 +7172,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:7603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_crypt="none required"
 else
@@ -7610,7 +7183,7 @@ rm -f conftest*
 test "$ac_cv_search_crypt" = "no" && for i in crypt; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7614 "configure"
+#line 7187 "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
@@ -7621,7 +7194,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:7625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_crypt="-l$i"
 break
@@ -7648,14 +7221,14 @@ inn_save_LIBS=$LIBS
 LIBS=${SHADOW_LIB}
 
 echo $ac_n "checking for library containing getspnam""... $ac_c" 1>&6
-echo "configure:7652: checking for library containing getspnam" >&5
+echo "configure:7225: checking for library containing getspnam" >&5
 if eval "test \"`echo '$''{'ac_cv_search_getspnam'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_getspnam="no"
 cat > conftest.$ac_ext <<EOF
-#line 7659 "configure"
+#line 7232 "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
@@ -7666,7 +7239,7 @@ int main() {
 getspnam()
 ; return 0; }
 EOF
-if { (eval echo configure:7670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_getspnam="none required"
 else
@@ -7677,7 +7250,7 @@ rm -f conftest*
 test "$ac_cv_search_getspnam" = "no" && for i in shadow; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7681 "configure"
+#line 7254 "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
@@ -7688,7 +7261,7 @@ int main() {
 getspnam()
 ; return 0; }
 EOF
-if { (eval echo configure:7692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_getspnam="-l$i"
 break
@@ -7715,49 +7288,269 @@ inn_save_LIBS=$LIBS
 LIBS=${DBM_LIB}
 
 echo $ac_n "checking for library containing dbm_open""... $ac_c" 1>&6
-echo "configure:7719: checking for library containing dbm_open" >&5
+echo "configure:7292: checking for library containing dbm_open" >&5
 if eval "test \"`echo '$''{'ac_cv_search_dbm_open'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_dbm_open="no"
 cat > conftest.$ac_ext <<EOF
-#line 7726 "configure"
+#line 7299 "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
+    builtin and then its argument prototype would still apply.  */
+char dbm_open();
+
+int main() {
+dbm_open()
+; return 0; }
+EOF
+if { (eval echo configure:7310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_search_dbm_open="none required"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+test "$ac_cv_search_dbm_open" = "no" && for i in ndbm dbm; do
+LIBS="-l$i  $ac_func_search_save_LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7321 "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
+    builtin and then its argument prototype would still apply.  */
+char dbm_open();
+
+int main() {
+dbm_open()
+; return 0; }
+EOF
+if { (eval echo configure:7332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_search_dbm_open="-l$i"
+break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+LIBS="$ac_func_search_save_LIBS"
+fi
+
+echo "$ac_t""$ac_cv_search_dbm_open" 1>&6
+if test "$ac_cv_search_dbm_open" != "no"; then
+  test "$ac_cv_search_dbm_open" = "none required" || LIBS="$ac_cv_search_dbm_open $LIBS"
+  DBM_LIB=$LIBS
+                cat >> confdefs.h <<\EOF
+#define HAVE_DBM 1
+EOF
+
+else :
+  
+fi
+LIBS=$inn_save_LIBS
+
+
+inn_check_pam=1
+for ac_hdr in pam/pam_appl.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:7364: 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 7369 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7374: \"$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"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+ac_safe=`echo "security/pam_appl.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for security/pam_appl.h""... $ac_c" 1>&6
+echo "configure:7399: checking for security/pam_appl.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 7404 "configure"
+#include "confdefs.h"
+#include <security/pam_appl.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7409: \"$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"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+inn_check_pam=0
+fi
+
+fi
+done
+
+if test x"$inn_check_pam" = x1; then
+    inn_save_LIBS=$LIBS
+LIBS=${PAM_LIB}
+
+echo $ac_n "checking for library containing pam_start""... $ac_c" 1>&6
+echo "configure:7439: checking for library containing pam_start" >&5
+if eval "test \"`echo '$''{'ac_cv_search_pam_start'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_pam_start="no"
+cat > conftest.$ac_ext <<EOF
+#line 7446 "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
+    builtin and then its argument prototype would still apply.  */
+char pam_start();
+
+int main() {
+pam_start()
+; return 0; }
+EOF
+if { (eval echo configure:7457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_search_pam_start="none required"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+test "$ac_cv_search_pam_start" = "no" && for i in pam; do
+LIBS="-l$i  $ac_func_search_save_LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7468 "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
+    builtin and then its argument prototype would still apply.  */
+char pam_start();
+
+int main() {
+pam_start()
+; return 0; }
+EOF
+if { (eval echo configure:7479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_search_pam_start="-l$i"
+break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+LIBS="$ac_func_search_save_LIBS"
+fi
+
+echo "$ac_t""$ac_cv_search_pam_start" 1>&6
+if test "$ac_cv_search_pam_start" != "no"; then
+  test "$ac_cv_search_pam_start" = "none required" || LIBS="$ac_cv_search_pam_start $LIBS"
+  PAM_LIB=$LIBS
+                cat >> confdefs.h <<\EOF
+#define HAVE_PAM 1
+EOF
+
+else :
+  
+fi
+LIBS=$inn_save_LIBS
+
+fi
+
+if test x"$inn_enable_keywords" = x1 ; then
+    inn_save_LIBS=$LIBS
+LIBS=${REGEX_LIB}
+
+echo $ac_n "checking for library containing regexec""... $ac_c" 1>&6
+echo "configure:7512: checking for library containing regexec" >&5
+if eval "test \"`echo '$''{'ac_cv_search_regexec'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_regexec="no"
+cat > conftest.$ac_ext <<EOF
+#line 7519 "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
     builtin and then its argument prototype would still apply.  */
-char dbm_open();
+char regexec();
 
 int main() {
-dbm_open()
+regexec()
 ; return 0; }
 EOF
-if { (eval echo configure:7737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_search_dbm_open="none required"
+  ac_cv_search_regexec="none required"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
-test "$ac_cv_search_dbm_open" = "no" && for i in ndbm dbm; do
+test "$ac_cv_search_regexec" = "no" && for i in regex; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7748 "configure"
+#line 7541 "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
     builtin and then its argument prototype would still apply.  */
-char dbm_open();
+char regexec();
 
 int main() {
-dbm_open()
+regexec()
 ; return 0; }
 EOF
-if { (eval echo configure:7759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_search_dbm_open="-l$i"
+  ac_cv_search_regexec="-l$i"
 break
 else
   echo "configure: failed program was:" >&5
@@ -7768,250 +7561,498 @@ done
 LIBS="$ac_func_search_save_LIBS"
 fi
 
-echo "$ac_t""$ac_cv_search_dbm_open" 1>&6
-if test "$ac_cv_search_dbm_open" != "no"; then
-  test "$ac_cv_search_dbm_open" = "none required" || LIBS="$ac_cv_search_dbm_open $LIBS"
-  DBM_LIB=$LIBS
-                cat >> confdefs.h <<\EOF
-#define HAVE_DBM 1
-EOF
-
+echo "$ac_t""$ac_cv_search_regexec" 1>&6
+if test "$ac_cv_search_regexec" != "no"; then
+  test "$ac_cv_search_regexec" = "none required" || LIBS="$ac_cv_search_regexec $LIBS"
+  REGEX_LIB=$LIBS
+                
 else :
-  
+  { echo "configure: error: no usable regular expression library found" 1>&2; exit 1; }
 fi
 LIBS=$inn_save_LIBS
 
+fi
 
-inn_check_pam=1
-for ac_hdr in pam/pam_appl.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7791: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+
+# Check whether --with-berkeleydb or --without-berkeleydb was given.
+if test "${with_berkeleydb+set}" = set; then
+  withval="$with_berkeleydb"
+  BERKELEY_DB_DIR=$with_berkeleydb
+else
+  BERKELEY_DB_DIR=no
+fi
+
+echo $ac_n "checking if BerkeleyDB is desired""... $ac_c" 1>&6
+echo "configure:7587: checking if BerkeleyDB is desired" >&5
+if test x"$BERKELEY_DB_DIR" = xno ; then
+    echo "$ac_t""no" 1>&6
+    BERKELEY_DB_LDFLAGS=
+    BERKELEY_DB_CFLAGS=
+    BERKELEY_DB_LIB=
+else
+    echo "$ac_t""yes" 1>&6
+    echo $ac_n "checking for BerkeleyDB location""... $ac_c" 1>&6
+echo "configure:7596: checking for BerkeleyDB location" >&5
+    if test x"$BERKELEY_DB_DIR" = xyes ; then
+        for v in BerkeleyDB BerkeleyDB.3.0 BerkeleyDB.3.1 BerkeleyDB.3.2 \
+                 BerkeleyDB.3.3 BerkeleyDB.4.0 BerkeleyDB.4.1 BerkeleyDB.4.2 BerkeleyDB.4.3 ; do
+            for d in $prefix /usr/local /opt /usr ; do
+                if test -d "$d/$v" ; then
+                    BERKELEY_DB_DIR="$d/$v"
+                    break
+                fi
+	    done
+        done
+    fi
+    if test x"$BERKELEY_DB_DIR" = xyes ; then
+        for v in db43 db42 db41 db4 db3 db2 ; do
+            if test -d "/usr/local/include/$v" ; then
+                BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
+                BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
+                BERKELEY_DB_LIB="-l$v"
+                echo "$ac_t""FreeBSD locations" 1>&6
+                break
+            fi
+        done
+        if test x"$BERKELEY_DB_LIB" = x ; then
+            for v in db43 db42 db41 db4 db3 db2 ; do
+                if test -d "/usr/include/$v" ; then
+                    BERKELEY_DB_CFLAGS="-I/usr/include/$v"
+                    BERKELEY_DB_LIB="-l$v"
+                    echo "$ac_t""Linux locations" 1>&6
+                    break
+                fi
+            done
+            if test x"$BERKELEY_DB_LIB" = x ; then        
+                BERKELEY_DB_LIB=-ldb
+                echo "$ac_t""trying -ldb" 1>&6
+            fi
+        fi
+    else
+        BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
+        BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
+        BERKELEY_DB_LIB="-ldb"
+        echo "$ac_t""$BERKELEY_DB_DIR" 1>&6
+    fi
+    cat >> confdefs.h <<\EOF
+#define USE_BERKELEY_DB 1
+EOF
+
+fi
+
+
+
+
+
+# Check whether --with-openssl or --without-openssl was given.
+if test "${with_openssl+set}" = set; then
+  withval="$with_openssl"
+  OPENSSL_DIR=$with_openssl
+else
+  OPENSSL_DIR=no
+fi
+
+echo $ac_n "checking if OpenSSL is desired""... $ac_c" 1>&6
+echo "configure:7657: checking if OpenSSL is desired" >&5
+if test x"$OPENSSL_DIR" = xno ; then
+    echo "$ac_t""no" 1>&6
+    SSL_BIN=
+    SSL_INC=
+    SSL_LIB=
+else
+    echo "$ac_t""yes" 1>&6
+    echo $ac_n "checking for OpenSSL location""... $ac_c" 1>&6
+echo "configure:7666: checking for OpenSSL location" >&5
+    if test x"$OPENSSL_DIR" = xyes ; then
+        for dir in $prefix /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg \
+                   /usr/local /usr ; do
+            if test -f "$dir/include/openssl/ssl.h" ; then
+                OPENSSL_DIR=$dir
+                break
+            fi
+        done
+    fi
+    if test x"$OPENSSL_DIR" = xyes ; then
+        { echo "configure: error: Can not find OpenSSL" 1>&2; exit 1; }
+    else
+        echo "$ac_t""$OPENSSL_DIR" 1>&6
+	SSL_BIN="${OPENSSL_DIR}/bin"
+	SSL_INC="-I${OPENSSL_DIR}/include"
+
+        # This is mildly tricky.  In order to satisfy most linkers, libraries
+        # have to be listed in the right order, which means that libraries
+        # with dependencies on other libraries need to be listed first.  But
+        # the -L flag for the OpenSSL library directory needs to go first of
+        # all.  So put the -L flag into LIBS and accumulate actual libraries
+        # into SSL_LIB, and then at the end, restore LIBS and move -L to the
+        # beginning of SSL_LIB.
+        inn_save_LIBS=$LIBS
+        LIBS="$LIBS -L${OPENSSL_DIR}/lib"
+	SSL_LIB=''
+	echo $ac_n "checking for RSAPublicEncrypt in -lrsaref""... $ac_c" 1>&6
+echo "configure:7694: checking for RSAPublicEncrypt in -lrsaref" >&5
+ac_lib_var=`echo rsaref'_'RSAPublicEncrypt | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 7796 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lrsaref  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7702 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char RSAPublicEncrypt();
+
+int main() {
+RSAPublicEncrypt()
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7801: \"$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
+if { (eval echo configure:7713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
+LIBS="$ac_save_LIBS"
+
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-ac_safe=`echo "security/pam_appl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for security/pam_appl.h""... $ac_c" 1>&6
-echo "configure:7826: checking for security/pam_appl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "checking for RSAPublicEncrypt in -lRSAglue""... $ac_c" 1>&6
+echo "configure:7729: checking for RSAPublicEncrypt in -lRSAglue" >&5
+ac_lib_var=`echo RSAglue'_'RSAPublicEncrypt | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 7831 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lRSAglue -lrsaref $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7737 "configure"
 #include "confdefs.h"
-#include <security/pam_appl.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char RSAPublicEncrypt();
+
+int main() {
+RSAPublicEncrypt()
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7836: \"$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
+if { (eval echo configure:7748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
+LIBS="$ac_save_LIBS"
+
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  :
+  SSL_LIB="-lRSAglue -lrsaref"
 else
   echo "$ac_t""no" 1>&6
-inn_check_pam=0
 fi
 
+else
+  echo "$ac_t""no" 1>&6
 fi
-done
 
-if test x"$inn_check_pam" = x1; then
-    inn_save_LIBS=$LIBS
-LIBS=${PAM_LIB}
+	echo $ac_n "checking for BIO_new in -lcrypto""... $ac_c" 1>&6
+echo "configure:7773: checking for BIO_new in -lcrypto" >&5
+ac_lib_var=`echo crypto'_'BIO_new | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lcrypto $SSL_LIB $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7781 "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
+    builtin and then its argument prototype would still apply.  */
+char BIO_new();
 
-echo $ac_n "checking for library containing pam_start""... $ac_c" 1>&6
-echo "configure:7866: checking for library containing pam_start" >&5
-if eval "test \"`echo '$''{'ac_cv_search_pam_start'+set}'`\" = set"; then
+int main() {
+BIO_new()
+; return 0; }
+EOF
+if { (eval echo configure:7792: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for DSO_load in -ldl""... $ac_c" 1>&6
+echo "configure:7808: checking for DSO_load in -ldl" >&5
+ac_lib_var=`echo dl'_'DSO_load | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_func_search_save_LIBS="$LIBS"
-ac_cv_search_pam_start="no"
+  ac_save_LIBS="$LIBS"
+LIBS="-ldl -lcrypto -ldl $SSL_LIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7873 "configure"
+#line 7816 "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
     builtin and then its argument prototype would still apply.  */
-char pam_start();
+char DSO_load();
 
 int main() {
-pam_start()
+DSO_load()
 ; return 0; }
 EOF
-if { (eval echo configure:7884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_search_pam_start="none required"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-test "$ac_cv_search_pam_start" = "no" && for i in pam; do
-LIBS="-l$i  $ac_func_search_save_LIBS"
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SSL_LIB="-lcrypto -ldl $SSL_LIB"
+else
+  echo "$ac_t""no" 1>&6
+SSL_LIB="-lcrypto $SSL_LIB"
+fi
+
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Can not find OpenSSL" 1>&2; exit 1; }
+fi
+
+	echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6
+echo "configure:7854: checking for SSL_library_init in -lssl" >&5
+ac_lib_var=`echo ssl'_'SSL_library_init | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lssl $SSL_LIB $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7895 "configure"
+#line 7862 "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
     builtin and then its argument prototype would still apply.  */
-char pam_start();
+char SSL_library_init();
 
 int main() {
-pam_start()
+SSL_library_init()
 ; return 0; }
 EOF
-if { (eval echo configure:7906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_search_pam_start="-l$i"
-break
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-done
-LIBS="$ac_func_search_save_LIBS"
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SSL_LIB="-lssl $SSL_LIB"
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Can not find OpenSSL" 1>&2; exit 1; }
 fi
 
-echo "$ac_t""$ac_cv_search_pam_start" 1>&6
-if test "$ac_cv_search_pam_start" != "no"; then
-  test "$ac_cv_search_pam_start" = "none required" || LIBS="$ac_cv_search_pam_start $LIBS"
-  PAM_LIB=$LIBS
-                cat >> confdefs.h <<\EOF
-#define HAVE_PAM 1
+        SSL_LIB="-L${OPENSSL_DIR}/lib $SSL_LIB"
+        LIBS=$inn_save_LIBS
+        cat >> confdefs.h <<\EOF
+#define HAVE_SSL 1
 EOF
 
-else :
-  
+    fi
 fi
-LIBS=$inn_save_LIBS
 
-fi
 
-if test x"$inn_enable_keywords" = x1 ; then
-    inn_save_LIBS=$LIBS
-LIBS=${REGEX_LIB}
 
-echo $ac_n "checking for library containing regexec""... $ac_c" 1>&6
-echo "configure:7939: checking for library containing regexec" >&5
-if eval "test \"`echo '$''{'ac_cv_search_regexec'+set}'`\" = set"; then
+
+
+# Check whether --with-sasl or --without-sasl was given.
+if test "${with_sasl+set}" = set; then
+  withval="$with_sasl"
+  SASL_DIR=$with_sasl
+else
+  SASL_DIR=no
+fi
+
+echo $ac_n "checking if SASL is desired""... $ac_c" 1>&6
+echo "configure:7916: checking if SASL is desired" >&5
+if test x"$SASL_DIR" = xno ; then
+    echo "$ac_t""no" 1>&6
+    SASL_INC=
+    SASL_LIB=
+else
+    echo "$ac_t""yes" 1>&6
+    echo $ac_n "checking for SASL location""... $ac_c" 1>&6
+echo "configure:7924: checking for SASL location" >&5
+    if test x"$SASL_DIR" = xyes ; then
+        for dir in $prefix /usr/local/sasl /usr/sasl /usr/pkg /usr/local ; do
+            if test -f "$dir/include/sasl/sasl.h" ; then
+                SASL_DIR=$dir
+                break
+            fi
+        done
+    fi
+    if test x"$SASL_DIR" = xyes ; then
+        if test -f "/usr/include/sasl/sasl.h" ; then
+            SASL_INC=-I/usr/include/sasl
+            SASL_DIR=/usr
+            echo "$ac_t""$SASL_DIR" 1>&6
+            inn_save_LIBS=$LIBS
+            echo $ac_n "checking for sasl_getprop in -lsasl2""... $ac_c" 1>&6
+echo "configure:7940: checking for sasl_getprop in -lsasl2" >&5
+ac_lib_var=`echo sasl2'_'sasl_getprop | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_func_search_save_LIBS="$LIBS"
-ac_cv_search_regexec="no"
+  ac_save_LIBS="$LIBS"
+LIBS="-lsasl2  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7946 "configure"
+#line 7948 "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
     builtin and then its argument prototype would still apply.  */
-char regexec();
+char sasl_getprop();
 
 int main() {
-regexec()
+sasl_getprop()
 ; return 0; }
 EOF
-if { (eval echo configure:7957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_search_regexec="none required"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-test "$ac_cv_search_regexec" = "no" && for i in regex; do
-LIBS="-l$i  $ac_func_search_save_LIBS"
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SASL_LIB=-lsasl2
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Can not find SASL" 1>&2; exit 1; }
+fi
+
+            LIBS=$inn_save_LIBS
+            cat >> confdefs.h <<\EOF
+#define HAVE_SASL 1
+EOF
+
+        else
+            { echo "configure: error: Can not find SASL" 1>&2; exit 1; }
+        fi
+    else
+        echo "$ac_t""$SASL_DIR" 1>&6
+	SASL_INC="-I${SASL_DIR}/include"
+
+        inn_save_LIBS=$LIBS
+        LIBS="$LIBS -L${SASL_DIR}/lib"
+	echo $ac_n "checking for sasl_getprop in -lsasl2""... $ac_c" 1>&6
+echo "configure:7995: checking for sasl_getprop in -lsasl2" >&5
+ac_lib_var=`echo sasl2'_'sasl_getprop | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lsasl2  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7968 "configure"
+#line 8003 "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
     builtin and then its argument prototype would still apply.  */
-char regexec();
+char sasl_getprop();
 
 int main() {
-regexec()
+sasl_getprop()
 ; return 0; }
 EOF
-if { (eval echo configure:7979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_search_regexec="-l$i"
-break
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-done
-LIBS="$ac_func_search_save_LIBS"
-fi
+LIBS="$ac_save_LIBS"
 
-echo "$ac_t""$ac_cv_search_regexec" 1>&6
-if test "$ac_cv_search_regexec" != "no"; then
-  test "$ac_cv_search_regexec" = "none required" || LIBS="$ac_cv_search_regexec $LIBS"
-  REGEX_LIB=$LIBS
-                
-else :
-  { echo "configure: error: no usable regular expression library found" 1>&2; exit 1; }
 fi
-LIBS=$inn_save_LIBS
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  SASL_LIB="-L${SASL_DIR}/lib -lsasl2"
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Can not find SASL" 1>&2; exit 1; }
+fi
+
+        LIBS=$inn_save_LIBS
+        cat >> confdefs.h <<\EOF
+#define HAVE_SASL 1
+EOF
 
+    fi
 fi
 
+
+
 inn_save_LIBS=$LIBS
 LIBS=${KRB5_LIB}
 
 echo $ac_n "checking for library containing krb5_parse_name""... $ac_c" 1>&6
-echo "configure:8008: checking for library containing krb5_parse_name" >&5
+echo "configure:8049: checking for library containing krb5_parse_name" >&5
 if eval "test \"`echo '$''{'ac_cv_search_krb5_parse_name'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_krb5_parse_name="no"
 cat > conftest.$ac_ext <<EOF
-#line 8015 "configure"
+#line 8056 "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
@@ -8022,7 +8063,7 @@ int main() {
 krb5_parse_name()
 ; return 0; }
 EOF
-if { (eval echo configure:8026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_krb5_parse_name="none required"
 else
@@ -8033,7 +8074,7 @@ rm -f conftest*
 test "$ac_cv_search_krb5_parse_name" = "no" && for i in krb5; do
 LIBS="-l$i $LIBS -lk5crypto -lcom_err $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8037 "configure"
+#line 8078 "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
@@ -8044,7 +8085,7 @@ int main() {
 krb5_parse_name()
 ; return 0; }
 EOF
-if { (eval echo configure:8048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_search_krb5_parse_name="-l$i"
 break
@@ -8062,9 +8103,49 @@ if test "$ac_cv_search_krb5_parse_name" 
   test "$ac_cv_search_krb5_parse_name" = "none required" || LIBS="$ac_cv_search_krb5_parse_name $LIBS"
   KRB5_LIB=$LIBS
                 KRB5_AUTH="auth_krb5"
-     KRB5_LIB="$KRB5_LIB -lk5crypto -lcom_err"
+     KRB5_LIB="$KRB5_LDFLAGS $KRB5_LIB -lk5crypto -lcom_err"
      
      
+     for ac_hdr in et/com_err.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:8114: 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 8119 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8124: \"$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"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
 else :
   
 fi
@@ -8076,12 +8157,12 @@ LIBS=$KRB5_LIB
 for ac_func in krb5_init_ets
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8080: checking for $ac_func" >&5
+echo "configure:8161: 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 8085 "configure"
+#line 8166 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8104,7 +8185,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8189: \"$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
@@ -8132,7 +8213,7 @@ LIBS=$inn_save_LIBS
 
 if test x"$DO_PERL" = xDO ; then
     echo $ac_n "checking for Perl linkage""... $ac_c" 1>&6
-echo "configure:8136: checking for Perl linkage" >&5
+echo "configure:8217: checking for Perl linkage" >&5
     inn_perl_core_path=`$_PATH_PERL -MConfig -e 'print $Config{archlibexp}'`
     inn_perl_core_flags=`$_PATH_PERL -MExtUtils::Embed -e ccopts`
     inn_perl_core_libs=`$_PATH_PERL -MExtUtils::Embed -e ldopts 2>&1 | tail -1`
@@ -8173,7 +8254,7 @@ fi
 
 if test x"$DO_PYTHON" = xdefine ; then
     echo $ac_n "checking for Python linkage""... $ac_c" 1>&6
-echo "configure:8177: checking for Python linkage" >&5
+echo "configure:8258: checking for Python linkage" >&5
     py_prefix=`$_PATH_PYTHON -c 'import sys; print sys.prefix'`
     py_ver=`$_PATH_PYTHON -c 'import sys; print sys.version[:3]'`
     py_libdir="${py_prefix}/lib/python${py_ver}"
@@ -8197,7 +8278,7 @@ fi
 
 if test x"$inn_enable_largefiles" = xyes ; then
     echo $ac_n "checking for largefile linkage""... $ac_c" 1>&6
-echo "configure:8201: checking for largefile linkage" >&5
+echo "configure:8282: checking for largefile linkage" >&5
     case "$host" in
     *-aix4.01*)
         echo "$ac_t""no" 1>&6
@@ -8234,7 +8315,7 @@ EOF
         # 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:8238: checking for $ac_word" >&5
+echo "configure:8319: 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
@@ -8286,12 +8367,12 @@ fi
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:8290: checking for ANSI C header files" >&5
+echo "configure:8371: 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 8295 "configure"
+#line 8376 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -8299,7 +8380,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8384: \"$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*
@@ -8316,7 +8397,7 @@ rm -f conftest*
 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 8320 "configure"
+#line 8401 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -8334,7 +8415,7 @@ fi
 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 8338 "configure"
+#line 8419 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -8355,7 +8436,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 8359 "configure"
+#line 8440 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -8366,7 +8447,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
 exit (0); }
 
 EOF
-if { (eval echo configure:8370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -8395,17 +8476,17 @@ if test x"$ac_cv_header_stdc" = xno ; th
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8399: checking for $ac_hdr" >&5
+echo "configure:8480: 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 8404 "configure"
+#line 8485 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8490: \"$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*
@@ -8434,12 +8515,12 @@ done
     for ac_func in memcpy strchr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8438: checking for $ac_func" >&5
+echo "configure:8519: 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 8443 "configure"
+#line 8524 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8462,7 +8543,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8547: \"$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
@@ -8493,12 +8574,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di
 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:8497: checking for $ac_hdr that defines DIR" >&5
+echo "configure:8578: 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 8502 "configure"
+#line 8583 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -8506,7 +8587,7 @@ int main() {
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:8510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -8531,7 +8612,7 @@ done
 # 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:8535: checking for opendir in -ldir" >&5
+echo "configure:8616: 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
@@ -8539,7 +8620,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8543 "configure"
+#line 8624 "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
@@ -8550,7 +8631,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:8554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8635: \"$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
@@ -8572,7 +8653,7 @@ fi
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:8576: checking for opendir in -lx" >&5
+echo "configure:8657: 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
@@ -8580,7 +8661,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8584 "configure"
+#line 8665 "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
@@ -8591,7 +8672,7 @@ int main() {
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:8595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8676: \"$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
@@ -8614,12 +8695,12 @@ fi
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:8618: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:8699: 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 8623 "configure"
+#line 8704 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -8628,7 +8709,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:8632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -8649,12 +8730,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:8653: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:8734: 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 8658 "configure"
+#line 8739 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -8670,7 +8751,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:8674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -8698,17 +8779,17 @@ for ac_hdr in crypt.h inttypes.h limits.
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8702: checking for $ac_hdr" >&5
+echo "configure:8783: 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 8707 "configure"
+#line 8788 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8793: \"$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*
@@ -8740,17 +8821,17 @@ if test x"$ac_cv_header_ndbm_h" = xno ; 
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8744: checking for $ac_hdr" >&5
+echo "configure:8825: 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 8749 "configure"
+#line 8830 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8835: \"$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*
@@ -8780,19 +8861,19 @@ fi
 
 
 echo $ac_n "checking whether h_errno must be declared""... $ac_c" 1>&6
-echo "configure:8784: checking whether h_errno must be declared" >&5
+echo "configure:8865: checking whether h_errno must be declared" >&5
 if eval "test \"`echo '$''{'inn_cv_herrno_need_decl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8789 "configure"
+#line 8870 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 h_errno = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:8796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_herrno_need_decl=no
 else
@@ -8816,12 +8897,12 @@ fi
 
 
 echo $ac_n "checking whether inet_aton must be declared""... $ac_c" 1>&6
-echo "configure:8820: checking whether inet_aton must be declared" >&5
+echo "configure:8901: checking whether inet_aton must be declared" >&5
 if eval "test \"`echo '$''{'inn_cv_decl_needed_inet_aton'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8825 "configure"
+#line 8906 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -8856,7 +8937,7 @@ int main() {
 char *(*pfn) = (char *(*)) inet_aton
 ; return 0; }
 EOF
-if { (eval echo configure:8860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_decl_needed_inet_aton=no
 else
@@ -8878,12 +8959,12 @@ else
     echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking whether inet_ntoa must be declared""... $ac_c" 1>&6
-echo "configure:8882: checking whether inet_ntoa must be declared" >&5
+echo "configure:8963: checking whether inet_ntoa must be declared" >&5
 if eval "test \"`echo '$''{'inn_cv_decl_needed_inet_ntoa'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8887 "configure"
+#line 8968 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -8918,7 +8999,7 @@ int main() {
 char *(*pfn) = (char *(*)) inet_ntoa
 ; return 0; }
 EOF
-if { (eval echo configure:8922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_decl_needed_inet_ntoa=no
 else
@@ -8940,12 +9021,12 @@ else
     echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking whether snprintf must be declared""... $ac_c" 1>&6
-echo "configure:8944: checking whether snprintf must be declared" >&5
+echo "configure:9025: checking whether snprintf must be declared" >&5
 if eval "test \"`echo '$''{'inn_cv_decl_needed_snprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8949 "configure"
+#line 9030 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -8979,7 +9060,7 @@ int main() {
 char *(*pfn) = (char *(*)) snprintf
 ; return 0; }
 EOF
-if { (eval echo configure:8983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_decl_needed_snprintf=no
 else
@@ -9001,12 +9082,12 @@ else
     echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking whether vsnprintf must be declared""... $ac_c" 1>&6
-echo "configure:9005: checking whether vsnprintf must be declared" >&5
+echo "configure:9086: checking whether vsnprintf must be declared" >&5
 if eval "test \"`echo '$''{'inn_cv_decl_needed_vsnprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9010 "configure"
+#line 9091 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -9040,7 +9121,7 @@ int main() {
 char *(*pfn) = (char *(*)) vsnprintf
 ; return 0; }
 EOF
-if { (eval echo configure:9044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_decl_needed_vsnprintf=no
 else
@@ -9063,14 +9144,14 @@ else
 fi
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:9067: checking whether byte ordering is bigendian" >&5
+echo "configure:9148: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 9074 "configure"
+#line 9155 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -9081,11 +9162,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 9089 "configure"
+#line 9170 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -9096,7 +9177,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:9100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -9116,7 +9197,7 @@ 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 9120 "configure"
+#line 9201 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -9129,7 +9210,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:9133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -9153,12 +9234,12 @@ EOF
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:9157: checking for working const" >&5
+echo "configure:9238: 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 9162 "configure"
+#line 9243 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -9207,7 +9288,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:9211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -9228,12 +9309,12 @@ EOF
 fi
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:9232: checking for st_blksize in struct stat" >&5
+echo "configure:9313: 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 9237 "configure"
+#line 9318 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -9241,7 +9322,7 @@ int main() {
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF
-if { (eval echo configure:9245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else
@@ -9262,12 +9343,12 @@ EOF
 fi
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:9266: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:9347: 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 9271 "configure"
+#line 9352 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -9275,7 +9356,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:9279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -9296,12 +9377,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:9300: checking for size_t" >&5
+echo "configure:9381: 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 9305 "configure"
+#line 9386 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9329,12 +9410,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:9333: checking for uid_t in sys/types.h" >&5
+echo "configure:9414: 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 9338 "configure"
+#line 9419 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -9363,12 +9444,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:9367: checking for off_t" >&5
+echo "configure:9448: 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 9372 "configure"
+#line 9453 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9396,12 +9477,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:9400: checking for pid_t" >&5
+echo "configure:9481: 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 9405 "configure"
+#line 9486 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9429,12 +9510,12 @@ EOF
 fi
 
 echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
-echo "configure:9433: checking for ptrdiff_t" >&5
+echo "configure:9514: checking for ptrdiff_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_ptrdiff_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9438 "configure"
+#line 9519 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9462,12 +9543,12 @@ EOF
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:9466: checking for ssize_t" >&5
+echo "configure:9547: checking for ssize_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9471 "configure"
+#line 9552 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -9497,12 +9578,12 @@ fi
 
 
 echo $ac_n "checking for C99 variadic macros""... $ac_c" 1>&6
-echo "configure:9501: checking for C99 variadic macros" >&5
+echo "configure:9582: checking for C99 variadic macros" >&5
 if eval "test \"`echo '$''{'inn_cv_c_c99_vamacros'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9506 "configure"
+#line 9587 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #define error(...) fprintf(stderr, __VA_ARGS__)
@@ -9510,7 +9591,7 @@ int main() {
 error("foo"); error("foo %d", 0); return 0;
 ; return 0; }
 EOF
-if { (eval echo configure:9514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_c_c99_vamacros=yes
 else
@@ -9532,12 +9613,12 @@ fi
 
 
 echo $ac_n "checking for GNU-style variadic macros""... $ac_c" 1>&6
-echo "configure:9536: checking for GNU-style variadic macros" >&5
+echo "configure:9617: checking for GNU-style variadic macros" >&5
 if eval "test \"`echo '$''{'inn_cv_c_gnu_vamacros'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9541 "configure"
+#line 9622 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #define error(args...) fprintf(stderr, args)
@@ -9545,7 +9626,7 @@ int main() {
 error("foo"); error("foo %d", 0); return 0;
 ; return 0; }
 EOF
-if { (eval echo configure:9549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_c_gnu_vamacros=yes
 else
@@ -9567,19 +9648,19 @@ fi
 
 
 echo $ac_n "checking for long long int""... $ac_c" 1>&6
-echo "configure:9571: checking for long long int" >&5
+echo "configure:9652: checking for long long int" >&5
 if eval "test \"`echo '$''{'inn_cv_c_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9576 "configure"
+#line 9657 "configure"
 #include "confdefs.h"
 
 int main() {
 long long int i;
 ; return 0; }
 EOF
-if { (eval echo configure:9583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_c_long_long=yes
 else
@@ -9603,12 +9684,12 @@ fi
 
 
 echo $ac_n "checking for sig_atomic_t""... $ac_c" 1>&6
-echo "configure:9607: checking for sig_atomic_t" >&5
+echo "configure:9688: checking for sig_atomic_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_sig_atomic_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9612 "configure"
+#line 9693 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef STDC_HEADERS
@@ -9639,12 +9720,12 @@ EOF
 fi
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:9643: checking for socklen_t" >&5
+echo "configure:9724: checking for socklen_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9648 "configure"
+#line 9729 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef STDC_HEADERS
@@ -9678,7 +9759,7 @@ fi
 
 
 echo $ac_n "checking value of IOV_MAX""... $ac_c" 1>&6
-echo "configure:9682: checking value of IOV_MAX" >&5
+echo "configure:9763: checking value of IOV_MAX" >&5
 if eval "test \"`echo '$''{'inn_cv_macro_iov_max'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9686,7 +9767,7 @@ else
   16
 else
   cat > conftest.$ac_ext <<EOF
-#line 9690 "configure"
+#line 9771 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <stdio.h>
@@ -9734,7 +9815,7 @@ main ()
   return 0;
 }
 EOF
-if { (eval echo configure:9738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   inn_cv_macro_iov_max=`cat conftestval`
 else
@@ -9762,12 +9843,12 @@ fi
 
 
 echo $ac_n "checking for SUN_LEN""... $ac_c" 1>&6
-echo "configure:9766: checking for SUN_LEN" >&5
+echo "configure:9847: checking for SUN_LEN" >&5
 if eval "test \"`echo '$''{'inn_cv_macro_sun_len'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9771 "configure"
+#line 9852 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/un.h>
@@ -9778,7 +9859,7 @@ int i;
 i = SUN_LEN(&sun);
 ; return 0; }
 EOF
-if { (eval echo configure:9782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   inn_cv_macro_sun_len=yes
 else
@@ -9800,19 +9881,19 @@ fi
 
 
 echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:9804: checking for tm_gmtoff in struct tm" >&5
+echo "configure:9885: checking for tm_gmtoff in struct tm" >&5
 if eval "test \"`echo '$''{'inn_cv_struct_tm_gmtoff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9809 "configure"
+#line 9890 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 struct tm t; t.tm_gmtoff = 3600
 ; return 0; }
 EOF
-if { (eval echo configure:9816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   inn_cv_struct_tm_gmtoff=yes
 else
@@ -9834,19 +9915,19 @@ fi
 
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:9838: checking for tm_zone in struct tm" >&5
+echo "configure:9919: checking for tm_zone in struct tm" >&5
 if eval "test \"`echo '$''{'inn_cv_struct_tm_zone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9843 "configure"
+#line 9924 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 struct tm t; t.tm_zone = "UTC"
 ; return 0; }
 EOF
-if { (eval echo configure:9850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   inn_cv_struct_tm_zone=yes
 else
@@ -9868,19 +9949,19 @@ fi
 
 
 echo $ac_n "checking for timezone variable""... $ac_c" 1>&6
-echo "configure:9872: checking for timezone variable" >&5
+echo "configure:9953: checking for timezone variable" >&5
 if eval "test \"`echo '$''{'inn_cv_var_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9877 "configure"
+#line 9958 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 timezone = 3600; altzone = 7200
 ; return 0; }
 EOF
-if { (eval echo configure:9884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   inn_cv_var_timezone=yes
 else
@@ -9902,19 +9983,19 @@ fi
 
 
 echo $ac_n "checking for tzname variable""... $ac_c" 1>&6
-echo "configure:9906: checking for tzname variable" >&5
+echo "configure:9987: checking for tzname variable" >&5
 if eval "test \"`echo '$''{'inn_cv_var_tzname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9911 "configure"
+#line 9992 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 *tzname = "UTC"
 ; return 0; }
 EOF
-if { (eval echo configure:9918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   inn_cv_var_tzname=yes
 else
@@ -9937,7 +10018,7 @@ fi
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:9941: checking size of int" >&5
+echo "configure:10022: 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
@@ -9945,7 +10026,7 @@ else
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 9949 "configure"
+#line 10030 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -9956,7 +10037,7 @@ main()
     exit(0);
 }
 EOF
-if { (eval echo configure:9960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10041: \"$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
@@ -9975,7 +10056,7 @@ if test x"$ac_cv_sizeof_int" = x"4" ; th
     INN_INT32=int
 else
     echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:9979: checking size of long" >&5
+echo "configure:10060: 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
@@ -9983,7 +10064,7 @@ else
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 9987 "configure"
+#line 10068 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -9994,7 +10075,7 @@ main()
     exit(0);
 }
 EOF
-if { (eval echo configure:9998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10079: \"$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
@@ -10013,7 +10094,7 @@ if test x"$ac_cv_sizeof_long" = x"4" ; t
     INN_INT32=long
 else
     echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:10017: checking size of short" >&5
+echo "configure:10098: 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
@@ -10021,7 +10102,7 @@ else
   ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 10025 "configure"
+#line 10106 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10032,7 +10113,7 @@ main()
     exit(0);
 }
 EOF
-if { (eval echo configure:10036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10117: \"$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
@@ -10059,12 +10140,12 @@ fi
 
 
 echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-echo "configure:10063: checking for int32_t" >&5
+echo "configure:10144: checking for int32_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_int32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10068 "configure"
+#line 10149 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef STDC_HEADERS
@@ -10102,12 +10183,12 @@ fi
 
 
 echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
-echo "configure:10106: checking for uint32_t" >&5
+echo "configure:10187: checking for uint32_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uint32_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10111 "configure"
+#line 10192 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef STDC_HEADERS
@@ -10144,7 +10225,7 @@ EOF
 fi
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
-echo "configure:10148: checking for 8-bit clean memcmp" >&5
+echo "configure:10229: 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
@@ -10152,7 +10233,7 @@ else
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 10156 "configure"
+#line 10237 "configure"
 #include "confdefs.h"
 
 main()
@@ -10162,7 +10243,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:10166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10247: \"$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
@@ -10180,12 +10261,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:10184: checking return type of signal handlers" >&5
+echo "configure:10265: 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 10189 "configure"
+#line 10270 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -10202,7 +10283,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:10206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -10225,7 +10306,7 @@ EOF
 
 
 echo $ac_n "checking for working inet_ntoa""... $ac_c" 1>&6
-echo "configure:10229: checking for working inet_ntoa" >&5
+echo "configure:10310: checking for working inet_ntoa" >&5
 if eval "test \"`echo '$''{'inn_cv_func_inet_ntoa_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10233,7 +10314,7 @@ else
   inn_cv_func_inet_ntoa_works=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 10237 "configure"
+#line 10318 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -10251,7 +10332,7 @@ main ()
   return (!strcmp (inet_ntoa (in), "127.0.0.0") ? 0 : 1);
 }
 EOF
-if { (eval echo configure:10255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   inn_cv_func_inet_ntoa_works=yes
 else
@@ -10277,12 +10358,12 @@ fi
 
 
 echo $ac_n "checking whether struct sockaddr has sa_len""... $ac_c" 1>&6
-echo "configure:10281: checking whether struct sockaddr has sa_len" >&5
+echo "configure:10362: checking whether struct sockaddr has sa_len" >&5
 if eval "test \"`echo '$''{'inn_cv_struct_sockaddr_sa_len'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10286 "configure"
+#line 10367 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 			#include <sys/socket.h>
@@ -10291,7 +10372,7 @@ int main() {
 struct sockaddr sa; int x = sa.sa_len;
 ; return 0; }
 EOF
-if { (eval echo configure:10295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_struct_sockaddr_sa_len=yes
 else
@@ -10313,12 +10394,12 @@ fi
 
 
 echo $ac_n "checking for SA_LEN(s) macro""... $ac_c" 1>&6
-echo "configure:10317: checking for SA_LEN(s) macro" >&5
+echo "configure:10398: checking for SA_LEN(s) macro" >&5
 if eval "test \"`echo '$''{'inn_cv_sa_len_macro'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10322 "configure"
+#line 10403 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 			#include <sys/socket.h>
@@ -10327,7 +10408,7 @@ int main() {
 struct sockaddr sa; int x = SA_LEN(&sa);
 ; return 0; }
 EOF
-if { (eval echo configure:10331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   inn_cv_sa_len_macro=yes
 else
@@ -10351,12 +10432,12 @@ fi
 
 
 echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6
-echo "configure:10355: checking for struct sockaddr_storage" >&5
+echo "configure:10436: checking for struct sockaddr_storage" >&5
 if eval "test \"`echo '$''{'inn_cv_struct_sockaddr_storage'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10360 "configure"
+#line 10441 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 			#include <sys/socket.h>
@@ -10365,7 +10446,7 @@ int main() {
 struct sockaddr_storage ss;
 ; return 0; }
 EOF
-if { (eval echo configure:10369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_struct_sockaddr_storage=yes
 else
@@ -10384,12 +10465,12 @@ if test "$inn_cv_struct_sockaddr_storage
 EOF
 
     echo $ac_n "checking for RFC 2553 style sockaddr_storage member names""... $ac_c" 1>&6
-echo "configure:10388: checking for RFC 2553 style sockaddr_storage member names" >&5
+echo "configure:10469: checking for RFC 2553 style sockaddr_storage member names" >&5
 if eval "test \"`echo '$''{'inn_cv_2553_ss_family'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10393 "configure"
+#line 10474 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 			#include <sys/socket.h>
@@ -10398,7 +10479,7 @@ int main() {
 struct sockaddr_storage ss; int x=ss.ss_family;
 ; return 0; }
 EOF
-if { (eval echo configure:10402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_2553_ss_family=no
 else
@@ -10424,7 +10505,7 @@ fi
 
 if test "$inn_enable_ipv6_tests" = yes ; then
     echo $ac_n "checking whether IN6_ARE_ADDR_EQUAL macro is broken""... $ac_c" 1>&6
-echo "configure:10428: checking whether IN6_ARE_ADDR_EQUAL macro is broken" >&5
+echo "configure:10509: checking whether IN6_ARE_ADDR_EQUAL macro is broken" >&5
 if eval "test \"`echo '$''{'inn_cv_in6_are_addr_equal_broken'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10432,7 +10513,7 @@ else
   inn_cv_in6_are_addr_equal_broken=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 10436 "configure"
+#line 10517 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -10450,7 +10531,7 @@ main ()
   return IN6_ARE_ADDR_EQUAL(&a,&b) ? 0 : 1;
 }
 EOF
-if { (eval echo configure:10454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   inn_cv_in6_are_addr_equal_broken=no
 else
@@ -10477,7 +10558,7 @@ fi
 
 
 echo $ac_n "checking for working snprintf""... $ac_c" 1>&6
-echo "configure:10481: checking for working snprintf" >&5
+echo "configure:10562: checking for working snprintf" >&5
 if eval "test \"`echo '$''{'inn_cv_func_snprintf_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10485,7 +10566,7 @@ else
   inn_cv_func_snprintf_works=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 10489 "configure"
+#line 10570 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <stdarg.h>
@@ -10511,7 +10592,7 @@ main ()
            && snprintf(NULL, 0, "%s", "abcd") == 4) ? 0 : 1);
 }
 EOF
-if { (eval echo configure:10515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   inn_cv_func_snprintf_works=yes
 else
@@ -10540,12 +10621,12 @@ for ac_func in atexit getloadavg getrlim
                strncasecmp strtoul symlink sysconf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10544: checking for $ac_func" >&5
+echo "configure:10625: 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 10549 "configure"
+#line 10630 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10568,7 +10649,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10653: \"$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
@@ -10597,12 +10678,12 @@ if test x"$ac_cv_func_getrlimit" = xno ;
     for ac_func in getdtablesize ulimit
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10601: checking for $ac_func" >&5
+echo "configure:10682: 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 10606 "configure"
+#line 10687 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10625,7 +10706,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10710: \"$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
@@ -10655,12 +10736,12 @@ if test x"$ac_cv_func_statvfs" = xno ; t
     for ac_func in statfs
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10659: checking for $ac_func" >&5
+echo "configure:10740: 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 10664 "configure"
+#line 10745 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10683,7 +10764,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10768: \"$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
@@ -10711,17 +10792,17 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10715: checking for $ac_hdr" >&5
+echo "configure:10796: 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 10720 "configure"
+#line 10801 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10806: \"$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*
@@ -10754,12 +10835,12 @@ for ac_func in fseeko ftello getpagesize
                  strspn setenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10758: checking for $ac_func" >&5
+echo "configure:10839: 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 10763 "configure"
+#line 10844 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10782,7 +10863,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10867: \"$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
@@ -10815,7 +10896,7 @@ done
 
 if test "$ac_cv_func_fseeko" = no || test "$ac_cv_func_ftello" = no ; then
    echo $ac_n "checking for off_t-compatible fpos_t""... $ac_c" 1>&6
-echo "configure:10819: checking for off_t-compatible fpos_t" >&5
+echo "configure:10900: checking for off_t-compatible fpos_t" >&5
 if eval "test \"`echo '$''{'inn_cv_type_fpos_t_large'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10823,7 +10904,7 @@ else
   inn_cv_type_fpos_t_large=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 10827 "configure"
+#line 10908 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -10837,7 +10918,7 @@ main ()
   exit(off == (off_t) 9223372036854775807ULL ? 0 : 1);
 }
 EOF
-if { (eval echo configure:10841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   inn_cv_type_fpos_t_large=yes
 else
@@ -10876,7 +10957,7 @@ fi
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:10880: checking for working mmap" >&5
+echo "configure:10961: checking for working mmap" >&5
 if eval "test \"`echo '$''{'inn_cv_func_mmap'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10884,7 +10965,7 @@ else
   inn_cv_func_mmap=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 10888 "configure"
+#line 10969 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -10948,7 +11029,7 @@ main()
   return 0;
 }
 EOF
-if { (eval echo configure:10952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   inn_cv_func_mmap=yes
 else
@@ -10973,12 +11054,12 @@ if test x"$inn_cv_func_mmap" = xyes ; th
     for ac_func in madvise
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10977: checking for $ac_func" >&5
+echo "configure:11058: 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 10982 "configure"
+#line 11063 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11001,7 +11082,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11086: \"$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
@@ -11026,7 +11107,7 @@ fi
 done
 
     echo $ac_n "checking whether mmap sees writes""... $ac_c" 1>&6
-echo "configure:11030: checking whether mmap sees writes" >&5
+echo "configure:11111: checking whether mmap sees writes" >&5
 if eval "test \"`echo '$''{'inn_cv_func_mmap_sees_writes'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11034,7 +11115,7 @@ else
   inn_cv_func_mmap_sees_writes=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 11038 "configure"
+#line 11119 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <sys/types.h>
@@ -11070,7 +11151,7 @@ main ()
   return 0;
 }
 EOF
-if { (eval echo configure:11074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   inn_cv_func_mmap_sees_writes=yes
 else
@@ -11092,7 +11173,7 @@ EOF
 
 fi
     echo $ac_n "checking whether msync is needed""... $ac_c" 1>&6
-echo "configure:11096: checking whether msync is needed" >&5
+echo "configure:11177: checking whether msync is needed" >&5
 if eval "test \"`echo '$''{'inn_cv_func_mmap_need_msync'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11100,7 +11181,7 @@ else
   inn_cv_func_mmap_need_msync=yes
 else
   cat > conftest.$ac_ext <<EOF
-#line 11104 "configure"
+#line 11185 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -11171,7 +11252,7 @@ main()
   return 0;
 }
 EOF
-if { (eval echo configure:11175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   inn_cv_func_mmap_need_msync=no
 else
@@ -11193,12 +11274,12 @@ EOF
 
 fi
     echo $ac_n "checking how many arguments msync takes""... $ac_c" 1>&6
-echo "configure:11197: checking how many arguments msync takes" >&5
+echo "configure:11278: checking how many arguments msync takes" >&5
 if eval "test \"`echo '$''{'inn_cv_func_msync_args'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11202 "configure"
+#line 11283 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -11206,7 +11287,7 @@ int main() {
 char *p; int psize; msync (p, psize, MS_ASYNC);
 ; return 0; }
 EOF
-if { (eval echo configure:11210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   inn_cv_func_msync_args=3
 else
@@ -11229,12 +11310,12 @@ fi
 
 
 echo $ac_n "checking for Unix domain sockets""... $ac_c" 1>&6
-echo "configure:11233: checking for Unix domain sockets" >&5
+echo "configure:11314: checking for Unix domain sockets" >&5
 if eval "test \"`echo '$''{'inn_cv_sys_unix_sockets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11238 "configure"
+#line 11319 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 #ifdef AF_UNIX
@@ -11263,12 +11344,12 @@ fi
 
 
 echo $ac_n "checking log facility for news""... $ac_c" 1>&6
-echo "configure:11267: checking log facility for news" >&5
+echo "configure:11348: checking log facility for news" >&5
 if eval "test \"`echo '$''{'inn_cv_log_facility'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11272 "configure"
+#line 11353 "configure"
 #include "confdefs.h"
 #include <syslog.h>
 #ifdef LOG_NEWS
@@ -11496,14 +11577,6 @@ s%@RNEWSMODE@%$RNEWSMODE%g
 s%@LOG_COMPRESS@%$LOG_COMPRESS%g
 s%@LOG_COMPRESSEXT@%$LOG_COMPRESSEXT%g
 s%@DO_DBZ_TAGGED_HASH@%$DO_DBZ_TAGGED_HASH%g
-s%@BERKELEY_DB_LDFLAGS@%$BERKELEY_DB_LDFLAGS%g
-s%@BERKELEY_DB_CFLAGS@%$BERKELEY_DB_CFLAGS%g
-s%@BERKELEY_DB_LIB@%$BERKELEY_DB_LIB%g
-s%@SSL_BIN@%$SSL_BIN%g
-s%@SSL_INC@%$SSL_INC%g
-s%@SSL_LIB@%$SSL_LIB%g
-s%@SASL_INC@%$SASL_INC%g
-s%@SASL_LIB@%$SASL_LIB%g
 s%@HOSTNAME@%$HOSTNAME%g
 s%@LEX@%$LEX%g
 s%@LEXLIB@%$LEXLIB%g
@@ -11516,6 +11589,7 @@ s%@_PATH_PERL@%$_PATH_PERL%g
 s%@_PATH_SH@%$_PATH_SH%g
 s%@_PATH_SED@%$_PATH_SED%g
 s%@_PATH_SORT@%$_PATH_SORT%g
+s%@_PATH_UUX@%$_PATH_UUX%g
 s%@PATH_GPGV@%$PATH_GPGV%g
 s%@_PATH_PGP@%$_PATH_PGP%g
 s%@pgpverify@%$pgpverify%g
@@ -11531,6 +11605,14 @@ s%@SHADOW_LIB@%$SHADOW_LIB%g
 s%@DBM_LIB@%$DBM_LIB%g
 s%@PAM_LIB@%$PAM_LIB%g
 s%@REGEX_LIB@%$REGEX_LIB%g
+s%@BERKELEY_DB_LDFLAGS@%$BERKELEY_DB_LDFLAGS%g
+s%@BERKELEY_DB_CFLAGS@%$BERKELEY_DB_CFLAGS%g
+s%@BERKELEY_DB_LIB@%$BERKELEY_DB_LIB%g
+s%@SSL_BIN@%$SSL_BIN%g
+s%@SSL_INC@%$SSL_INC%g
+s%@SSL_LIB@%$SSL_LIB%g
+s%@SASL_INC@%$SASL_INC%g
+s%@SASL_LIB@%$SASL_LIB%g
 s%@KRB5_AUTH@%$KRB5_AUTH%g
 s%@KRB5_INC@%$KRB5_INC%g
 s%@KRB5_LIB@%$KRB5_LIB%g
diff -ruNp inn-2.4.2/configure.in inn-2.4.3/configure.in
--- inn-2.4.2/configure.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/configure.in	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Id: configure.in,v 1.244.2.8 2004/12/20 01:43:09 hkehoe Exp $
+dnl $Id: configure.in 7466 2005-12-12 03:04:08Z eagle $
 dnl
 dnl Please try to follow GNU conventions and autoconf manual conventions as
 dnl much as possible in this file so that any macros we develop can be easily
@@ -34,7 +34,7 @@ dnl bother checking for it.  Compile-tim
 dnl useful information for someone debugging a problem than configure-time
 dnl errors.
 
-AC_REVISION($Revision: 1.244.2.8 $)dnl
+AC_REVISION($Revision: 7466 $)dnl
 AC_PREREQ(2.13)
 AC_INIT(Makefile.global.in)
 AC_CONFIG_AUX_DIR(support)
@@ -253,8 +253,8 @@ AC_SUBST(INEWSMODE)
 
 dnl rnews used to be installed setuid root so that it could be run by the uucp
 dnl user for incoming batches, but this isn't necessary unless you're using
-dnl UUCP (which most people aren't).  Only do this if it's explicitly
-dnl requested at configure time.
+dnl UUCP (which most people aren't) and only setuid news is required.  Only do
+dnl this if it's explicitly requested at configure time.
 RNEWSGRP=$NEWSGRP
 RNEWSMODE=0500
 AC_ARG_ENABLE(uucp-rnews,
@@ -347,196 +347,13 @@ AC_ARG_WITH(sendmail,
     [  --with-sendmail=PATH    Path to sendmail],
     SENDMAIL=$with_sendmail)
 
-dnl Check for whether the user wants to compile with BerkeleyDB, and if so
-dnl what the path to the various components of it is.
-AC_DEFUN([INN_LIB_BERKELEYDB],
-[AC_ARG_WITH(berkeleydb,
-    [  --with-berkeleydb[=PATH]  Enable BerkeleyDB (for ovdb overview method)],
-    BERKELEY_DB_DIR=$with_berkeleydb,
-    BERKELEY_DB_DIR=no)
-AC_MSG_CHECKING(if BerkeleyDB is desired)
-if test x"$BERKELEY_DB_DIR" = xno ; then
-    AC_MSG_RESULT(no)
-    BERKELEY_DB_LDFLAGS=
-    BERKELEY_DB_CFLAGS=
-    BERKELEY_DB_LIB=
-else
-    AC_MSG_RESULT(yes)
-    AC_MSG_CHECKING(for BerkeleyDB location)
-    if test x"$BERKELEY_DB_DIR" = xyes ; then
-        for v in BerkeleyDB BerkeleyDB.3.0 BerkeleyDB.3.1 BerkeleyDB.3.2 \
-                 BerkeleyDB.3.3 BerkeleyDB.4.0 BerkeleyDB.4.1 BerkeleyDB.4.2 BerkeleyDB.4.3 ; do
-            for d in $prefix /usr/local /opt /usr ; do
-                if test -d "$d/$v" ; then
-                    BERKELEY_DB_DIR="$d/$v"
-                    break
-                fi
-	    done
-        done
-    fi
-    if test x"$BERKELEY_DB_DIR" = xyes ; then
-        for v in db43 db42 db41 db4 db3 db2 ; do
-            if test -d "/usr/local/include/$v" ; then
-                BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
-                BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
-                BERKELEY_DB_LIB="-l$v"
-                AC_MSG_RESULT(FreeBSD locations)
-                break
-            fi
-        done
-        if test x"$BERKELEY_DB_LIB" = x ; then
-            for v in db43 db42 db41 db4 db3 db2 ; do
-                if test -d "/usr/include/$v" ; then
-                    BERKELEY_DB_CFLAGS="-I/usr/include/$v"
-                    BERKELEY_DB_LIB="-l$v"
-                    AC_MSG_RESULT(Linux locations)
-                    break
-                fi
-            done
-            if test x"$BERKELEY_DB_LIB" = x ; then        
-                BERKELEY_DB_LIB=-ldb
-                AC_MSG_RESULT(trying -ldb)
-            fi
-        fi
-    else
-        BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
-        BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
-        BERKELEY_DB_LIB="-ldb"
-        AC_MSG_RESULT($BERKELEY_DB_DIR)
-    fi
-    AC_DEFINE(USE_BERKELEY_DB, 1, [Define if BerkeleyDB is available.])
-fi
-AC_SUBST(BERKELEY_DB_LDFLAGS)
-AC_SUBST(BERKELEY_DB_CFLAGS)
-AC_SUBST(BERKELEY_DB_LIB)])
-INN_LIB_BERKELEYDB
-
-dnl Check for whether the user wants to compile with OpenSSL, and if so what
-dnl the path to the various components of it is.
-AC_DEFUN([INN_LIB_OPENSSL],
-[AC_ARG_WITH(openssl,
-    [  --with-openssl=PATH     Enable OpenSSL (for NNTP over SSL support)],
-    OPENSSL_DIR=$with_openssl,
-    OPENSSL_DIR=no)
-AC_MSG_CHECKING(if OpenSSL is desired)
-if test x"$OPENSSL_DIR" = xno ; then
-    AC_MSG_RESULT(no)
-    SSL_BIN=
-    SSL_INC=
-    SSL_LIB=
-else
-    AC_MSG_RESULT(yes)
-    AC_MSG_CHECKING(for OpenSSL location)
-    if test x"$OPENSSL_DIR" = xyes ; then
-        for dir in $prefix /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg \
-                   /usr/local /usr ; do
-            if test -f "$dir/include/openssl/ssl.h" ; then
-                OPENSSL_DIR=$dir
-                break
-            fi
-        done
-    fi
-    if test x"$OPENSSL_DIR" = xyes ; then
-        AC_MSG_ERROR(Can not find OpenSSL)
-    else
-        AC_MSG_RESULT($OPENSSL_DIR)
-	SSL_BIN="${OPENSSL_DIR}/bin"
-	SSL_INC="-I${OPENSSL_DIR}/include"
-
-        # This is mildly tricky.  In order to satisfy most linkers, libraries
-        # have to be listed in the right order, which means that libraries
-        # with dependencies on other libraries need to be listed first.  But
-        # the -L flag for the OpenSSL library directory needs to go first of
-        # all.  So put the -L flag into LIBS and accumulate actual libraries
-        # into SSL_LIB, and then at the end, restore LIBS and move -L to the
-        # beginning of SSL_LIB.
-        inn_save_LIBS=$LIBS
-        LIBS="$LIBS -L${OPENSSL_DIR}/lib"
-	SSL_LIB=''
-	AC_CHECK_LIB(rsaref, RSAPublicEncrypt,
-	    [AC_CHECK_LIB(RSAglue, RSAPublicEncrypt,
-                          [SSL_LIB="-lRSAglue -lrsaref"], , -lrsaref)])
-	AC_CHECK_LIB(crypto, BIO_new,
-                     [AC_CHECK_LIB(dl, DSO_load,
-		                   SSL_LIB="-lcrypto -ldl $SSL_LIB",
-		                   SSL_LIB="-lcrypto $SSL_LIB",
-                                   -lcrypto -ldl $SSL_LIB)],
-                     [AC_MSG_ERROR(Can not find OpenSSL)],
-                     $SSL_LIB)
-	AC_CHECK_LIB(ssl, SSL_library_init,
-                     [SSL_LIB="-lssl $SSL_LIB"],
-                     [AC_MSG_ERROR(Can not find OpenSSL)],
-                     $SSL_LIB)
-        SSL_LIB="-L${OPENSSL_DIR}/lib $SSL_LIB"
-        LIBS=$inn_save_LIBS
-        AC_DEFINE(HAVE_SSL, 1, [Define if OpenSSL is available.])
-    fi
-fi
-AC_SUBST(SSL_BIN)
-AC_SUBST(SSL_INC)
-AC_SUBST(SSL_LIB)])
-INN_LIB_OPENSSL
-
-dnl Check for whether the user wants to compile with SASL, and if so what
-dnl the path to the various components of it is.
-AC_DEFUN([INN_LIB_SASL],
-[AC_ARG_WITH(sasl,
-    [  --with-sasl=PATH        Enable SASL (for imapfeed authentication)],
-    SASL_DIR=$with_sasl,
-    SASL_DIR=no)
-AC_MSG_CHECKING(if SASL is desired)
-if test x"$SASL_DIR" = xno ; then
-    AC_MSG_RESULT(no)
-    SASL_INC=
-    SASL_LIB=
-else
-    AC_MSG_RESULT(yes)
-    AC_MSG_CHECKING(for SASL location)
-    if test x"$SASL_DIR" = xyes ; then
-        for dir in $prefix /usr/local/sasl /usr/sasl /usr/pkg /usr/local ; do
-            if test -f "$dir/include/sasl/sasl.h" ; then
-                SASL_DIR=$dir
-                break
-            fi
-        done
-    fi
-    if test x"$SASL_DIR" = xyes ; then
-        if test -f "/usr/include/sasl/sasl.h" ; then
-            SASL_INC=-I/usr/include/sasl
-            SASL_DIR=/usr
-            AC_MSG_RESULT($SASL_DIR)
-            inn_save_LIBS=$LIBS
-            AC_CHECK_LIB(sasl2, sasl_getprop,
-                 [SASL_LIB=-lsasl2], [AC_MSG_ERROR(Can not find SASL)])
-            LIBS=$inn_save_LIBS
-            AC_DEFINE(HAVE_SASL, 1, [Define if SASL is available.])
-        else
-            AC_MSG_ERROR(Can not find SASL)
-        fi
-    else
-        AC_MSG_RESULT($SASL_DIR)
-	SASL_INC="-I${SASL_DIR}/include"
-
-        inn_save_LIBS=$LIBS
-        LIBS="$LIBS -L${SASL_DIR}/lib"
-	AC_CHECK_LIB(sasl2, sasl_getprop,
-                     [SASL_LIB="-L${SASL_DIR}/lib -lsasl2"],
-                     [AC_MSG_ERROR(Can not find SASL)],)
-        LIBS=$inn_save_LIBS
-        AC_DEFINE(HAVE_SASL, 1, [Define if SASL is available.])
-    fi
-fi
-AC_SUBST(SASL_INC)
-AC_SUBST(SASL_LIB)])
-INN_LIB_SASL
-
 dnl Specify the path to the Kerberos libraries if the user wants to build
 dnl auth_krb5.  Note that we don't search far and wide for the libraries if
 dnl the user doesn't specify the path.
 AC_ARG_WITH(kerberos,
     [  --with-kerberos=PATH    Path to Kerberos v5 (for auth_krb5)],
     [if test x"$with_kerberos" != xno ; then
-         KRB5_LIB="-L$with_kerberos/lib"
+         KRB5_LDFLAGS="-L$with_kerberos/lib"
          KRB5_INC="-I$with_kerberos/include"
      fi])
 
@@ -639,6 +456,7 @@ INN_ENSURE_PATH_PROG(_PATH_PERL,perl)
 INN_ENSURE_PATH_PROG(_PATH_SH,sh)
 INN_ENSURE_PATH_PROG(_PATH_SED,sed)
 INN_ENSURE_PATH_PROG(_PATH_SORT,sort)
+AC_PATH_PROGS(_PATH_UUX,uux,uux)
 
 dnl Check for a required version of Perl.  The separate shell variable and
 dnl the changequotes are necessary for autoconf 2.13; autoconf 2.50 will
@@ -801,13 +619,197 @@ if test x"$inn_enable_keywords" = x1 ; t
         [AC_MSG_ERROR(no usable regular expression library found)])
 fi
 
+dnl Check for whether the user wants to compile with BerkeleyDB, and if so
+dnl what the path to the various components of it is.
+AC_DEFUN([INN_LIB_BERKELEYDB],
+[AC_ARG_WITH(berkeleydb,
+    [  --with-berkeleydb[=PATH]  Enable BerkeleyDB (for ovdb overview method)],
+    BERKELEY_DB_DIR=$with_berkeleydb,
+    BERKELEY_DB_DIR=no)
+AC_MSG_CHECKING(if BerkeleyDB is desired)
+if test x"$BERKELEY_DB_DIR" = xno ; then
+    AC_MSG_RESULT(no)
+    BERKELEY_DB_LDFLAGS=
+    BERKELEY_DB_CFLAGS=
+    BERKELEY_DB_LIB=
+else
+    AC_MSG_RESULT(yes)
+    AC_MSG_CHECKING(for BerkeleyDB location)
+    if test x"$BERKELEY_DB_DIR" = xyes ; then
+        for v in BerkeleyDB BerkeleyDB.3.0 BerkeleyDB.3.1 BerkeleyDB.3.2 \
+                 BerkeleyDB.3.3 BerkeleyDB.4.0 BerkeleyDB.4.1 BerkeleyDB.4.2 BerkeleyDB.4.3 ; do
+            for d in $prefix /usr/local /opt /usr ; do
+                if test -d "$d/$v" ; then
+                    BERKELEY_DB_DIR="$d/$v"
+                    break
+                fi
+	    done
+        done
+    fi
+    if test x"$BERKELEY_DB_DIR" = xyes ; then
+        for v in db43 db42 db41 db4 db3 db2 ; do
+            if test -d "/usr/local/include/$v" ; then
+                BERKELEY_DB_LDFLAGS="-L/usr/local/lib"
+                BERKELEY_DB_CFLAGS="-I/usr/local/include/$v"
+                BERKELEY_DB_LIB="-l$v"
+                AC_MSG_RESULT(FreeBSD locations)
+                break
+            fi
+        done
+        if test x"$BERKELEY_DB_LIB" = x ; then
+            for v in db43 db42 db41 db4 db3 db2 ; do
+                if test -d "/usr/include/$v" ; then
+                    BERKELEY_DB_CFLAGS="-I/usr/include/$v"
+                    BERKELEY_DB_LIB="-l$v"
+                    AC_MSG_RESULT(Linux locations)
+                    break
+                fi
+            done
+            if test x"$BERKELEY_DB_LIB" = x ; then        
+                BERKELEY_DB_LIB=-ldb
+                AC_MSG_RESULT(trying -ldb)
+            fi
+        fi
+    else
+        BERKELEY_DB_LDFLAGS="-L$BERKELEY_DB_DIR/lib"
+        BERKELEY_DB_CFLAGS="-I$BERKELEY_DB_DIR/include"
+        BERKELEY_DB_LIB="-ldb"
+        AC_MSG_RESULT($BERKELEY_DB_DIR)
+    fi
+    AC_DEFINE(USE_BERKELEY_DB, 1, [Define if BerkeleyDB is available.])
+fi
+AC_SUBST(BERKELEY_DB_LDFLAGS)
+AC_SUBST(BERKELEY_DB_CFLAGS)
+AC_SUBST(BERKELEY_DB_LIB)])
+INN_LIB_BERKELEYDB
+
+dnl Check for whether the user wants to compile with OpenSSL, and if so what
+dnl the path to the various components of it is.
+AC_DEFUN([INN_LIB_OPENSSL],
+[AC_ARG_WITH(openssl,
+    [  --with-openssl=PATH     Enable OpenSSL (for NNTP over SSL support)],
+    OPENSSL_DIR=$with_openssl,
+    OPENSSL_DIR=no)
+AC_MSG_CHECKING(if OpenSSL is desired)
+if test x"$OPENSSL_DIR" = xno ; then
+    AC_MSG_RESULT(no)
+    SSL_BIN=
+    SSL_INC=
+    SSL_LIB=
+else
+    AC_MSG_RESULT(yes)
+    AC_MSG_CHECKING(for OpenSSL location)
+    if test x"$OPENSSL_DIR" = xyes ; then
+        for dir in $prefix /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg \
+                   /usr/local /usr ; do
+            if test -f "$dir/include/openssl/ssl.h" ; then
+                OPENSSL_DIR=$dir
+                break
+            fi
+        done
+    fi
+    if test x"$OPENSSL_DIR" = xyes ; then
+        AC_MSG_ERROR(Can not find OpenSSL)
+    else
+        AC_MSG_RESULT($OPENSSL_DIR)
+	SSL_BIN="${OPENSSL_DIR}/bin"
+	SSL_INC="-I${OPENSSL_DIR}/include"
+
+        # This is mildly tricky.  In order to satisfy most linkers, libraries
+        # have to be listed in the right order, which means that libraries
+        # with dependencies on other libraries need to be listed first.  But
+        # the -L flag for the OpenSSL library directory needs to go first of
+        # all.  So put the -L flag into LIBS and accumulate actual libraries
+        # into SSL_LIB, and then at the end, restore LIBS and move -L to the
+        # beginning of SSL_LIB.
+        inn_save_LIBS=$LIBS
+        LIBS="$LIBS -L${OPENSSL_DIR}/lib"
+	SSL_LIB=''
+	AC_CHECK_LIB(rsaref, RSAPublicEncrypt,
+	    [AC_CHECK_LIB(RSAglue, RSAPublicEncrypt,
+                          [SSL_LIB="-lRSAglue -lrsaref"], , -lrsaref)])
+	AC_CHECK_LIB(crypto, BIO_new,
+                     [AC_CHECK_LIB(dl, DSO_load,
+		                   SSL_LIB="-lcrypto -ldl $SSL_LIB",
+		                   SSL_LIB="-lcrypto $SSL_LIB",
+                                   -lcrypto -ldl $SSL_LIB)],
+                     [AC_MSG_ERROR(Can not find OpenSSL)],
+                     $SSL_LIB)
+	AC_CHECK_LIB(ssl, SSL_library_init,
+                     [SSL_LIB="-lssl $SSL_LIB"],
+                     [AC_MSG_ERROR(Can not find OpenSSL)],
+                     $SSL_LIB)
+        SSL_LIB="-L${OPENSSL_DIR}/lib $SSL_LIB"
+        LIBS=$inn_save_LIBS
+        AC_DEFINE(HAVE_SSL, 1, [Define if OpenSSL is available.])
+    fi
+fi
+AC_SUBST(SSL_BIN)
+AC_SUBST(SSL_INC)
+AC_SUBST(SSL_LIB)])
+INN_LIB_OPENSSL
+
+dnl Check for whether the user wants to compile with SASL, and if so what
+dnl the path to the various components of it is.
+AC_DEFUN([INN_LIB_SASL],
+[AC_ARG_WITH(sasl,
+    [  --with-sasl=PATH        Enable SASL (for imapfeed authentication)],
+    SASL_DIR=$with_sasl,
+    SASL_DIR=no)
+AC_MSG_CHECKING(if SASL is desired)
+if test x"$SASL_DIR" = xno ; then
+    AC_MSG_RESULT(no)
+    SASL_INC=
+    SASL_LIB=
+else
+    AC_MSG_RESULT(yes)
+    AC_MSG_CHECKING(for SASL location)
+    if test x"$SASL_DIR" = xyes ; then
+        for dir in $prefix /usr/local/sasl /usr/sasl /usr/pkg /usr/local ; do
+            if test -f "$dir/include/sasl/sasl.h" ; then
+                SASL_DIR=$dir
+                break
+            fi
+        done
+    fi
+    if test x"$SASL_DIR" = xyes ; then
+        if test -f "/usr/include/sasl/sasl.h" ; then
+            SASL_INC=-I/usr/include/sasl
+            SASL_DIR=/usr
+            AC_MSG_RESULT($SASL_DIR)
+            inn_save_LIBS=$LIBS
+            AC_CHECK_LIB(sasl2, sasl_getprop,
+                 [SASL_LIB=-lsasl2], [AC_MSG_ERROR(Can not find SASL)])
+            LIBS=$inn_save_LIBS
+            AC_DEFINE(HAVE_SASL, 1, [Define if SASL is available.])
+        else
+            AC_MSG_ERROR(Can not find SASL)
+        fi
+    else
+        AC_MSG_RESULT($SASL_DIR)
+	SASL_INC="-I${SASL_DIR}/include"
+
+        inn_save_LIBS=$LIBS
+        LIBS="$LIBS -L${SASL_DIR}/lib"
+	AC_CHECK_LIB(sasl2, sasl_getprop,
+                     [SASL_LIB="-L${SASL_DIR}/lib -lsasl2"],
+                     [AC_MSG_ERROR(Can not find SASL)],)
+        LIBS=$inn_save_LIBS
+        AC_DEFINE(HAVE_SASL, 1, [Define if SASL is available.])
+    fi
+fi
+AC_SUBST(SASL_INC)
+AC_SUBST(SASL_LIB)])
+INN_LIB_SASL
+
 dnl Check for Kerberos libraries for auth_krb5, and if found define KRB5_AUTH
 dnl to the relevant object file, which will enable compilation of it.
 INN_SEARCH_AUX_LIBS(krb5_parse_name, krb5, KRB5_LIB,
     [KRB5_AUTH="auth_krb5"
-     KRB5_LIB="$KRB5_LIB -lk5crypto -lcom_err"
+     KRB5_LIB="$KRB5_LDFLAGS $KRB5_LIB -lk5crypto -lcom_err"
      AC_SUBST(KRB5_AUTH)
-     AC_SUBST(KRB5_INC)], , [$LIBS -lk5crypto -lcom_err])
+     AC_SUBST(KRB5_INC)
+     AC_CHECK_HEADERS([et/com_err.h])], , [$LIBS -lk5crypto -lcom_err])
 
 dnl Check for necessity of krb5_init_ets
 dnl OSX does not require this function
diff -ruNp inn-2.4.2/contrib/Makefile inn-2.4.3/contrib/Makefile
--- inn-2.4.2/contrib/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/contrib/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.11 2003/04/20 19:04:11 vinocur Exp $
+##  $Id: Makefile 6299 2003-04-20 19:04:14Z vinocur $
 ##
 ##  There are no installation rules or other top-level rules for this
 ##  directory as it's not properly part of INN.  Installation should be
diff -ruNp inn-2.4.2/contrib/archivegz.in inn-2.4.3/contrib/archivegz.in
--- inn-2.4.2/contrib/archivegz.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/contrib/archivegz.in	Mon Mar 20 04:14:57 2006
@@ -5,9 +5,9 @@
 # Filename: archivegz.pl
 # Author: Stephen M. Benoit (benoits@servicepro.com)
 # Created: Wed Apr 14 13:56:01 1999
-# Version: $Id: archivegz.in,v 1.1 2001/01/14 13:47:51 rra Exp $
+# Version: $Id: archivegz.in 4329 2001-01-14 13:47:52Z rra $
 #
-$RCSID='$Id: archivegz.in,v 1.1 2001/01/14 13:47:51 rra Exp $ ';
+$RCSID='$Id: archivegz.in 4329 2001-01-14 13:47:52Z rra $ ';
 
 # Specify command line options, and decode the command line.
 
diff -ruNp inn-2.4.2/contrib/auth_pass.c inn-2.4.3/contrib/auth_pass.c
--- inn-2.4.2/contrib/auth_pass.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/contrib/auth_pass.c	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 /*
- *      auth_pass.c  ( $Revision: 1.4 $ )
+ *      auth_pass.c  ( $Revision: 6141 $ )
  *
  * Abstract: 
  *
diff -ruNp inn-2.4.2/contrib/mlockfile.c inn-2.4.3/contrib/mlockfile.c
--- inn-2.4.2/contrib/mlockfile.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/contrib/mlockfile.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: mlockfile.c,v 1.4 2002/12/16 11:28:07 alexk Exp $ */
+/* $Id: mlockfile.c 6014 2002-12-16 11:28:07Z alexk $ */
 
 /* Locks the files given on the command line into memory using mlock.
    This code has only been tested on Solaris and may not work on other
diff -ruNp inn-2.4.2/contrib/thdexpire.in inn-2.4.3/contrib/thdexpire.in
--- inn-2.4.2/contrib/thdexpire.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/contrib/thdexpire.in	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # fixscript will replace this line with require innshellvars.pl
-$ID='$Id: thdexpire.in,v 1.1 2001/02/24 22:31:05 rra Exp $$';
+$ID='$Id: thdexpire.in 4572 2001-02-24 22:31:05Z rra $$';
 
 use POSIX ":fcntl_h";
 use SDBM_File;
diff -ruNp inn-2.4.2/contrib/tunefeed.in inn-2.4.3/contrib/tunefeed.in
--- inn-2.4.2/contrib/tunefeed.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/contrib/tunefeed.in	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-$version = q$Id: tunefeed.in,v 1.1 2001/01/14 13:47:50 rra Exp $;
+$version = q$Id: tunefeed.in 4329 2001-01-14 13:47:52Z rra $;
 #
 # tunefeed -- Compare active files with a remote site to tune a feed.
 #             Copyright 1998 by Russ Allbery <rra@stanford.edu>
diff -ruNp inn-2.4.2/control/Makefile inn-2.4.3/control/Makefile
--- inn-2.4.2/control/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.11.2.1 2004/05/18 01:18:54 rra Exp $
+##  $Id: Makefile 6806 2004-05-18 01:18:57Z rra $
 
 include ../Makefile.global
 
diff -ruNp inn-2.4.2/control/controlchan.in inn-2.4.3/control/controlchan.in
--- inn-2.4.2/control/controlchan.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/controlchan.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /usr/bin/perl -w
 require "/usr/local/news/lib/innshellvars.pl";
 
-##  $Id: controlchan.in,v 1.7.2.3 2004/05/17 05:26:36 rra Exp $
+##  $Id: controlchan.in 6771 2004-05-17 05:26:36Z rra $
 ##
 ##  Channel feed program to route control messages to an appropriate handler.
 ##
diff -ruNp inn-2.4.2/control/docheckgroups.in inn-2.4.3/control/docheckgroups.in
--- inn-2.4.2/control/docheckgroups.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/docheckgroups.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-##  $Revision: 1.1 $
+##  $Revision: 4716 $
 ##  Script to execute checkgroups text; results to stdout.
 
 T=${TMPDIR}
diff -ruNp inn-2.4.2/control/modules/checkgroups.pl inn-2.4.3/control/modules/checkgroups.pl
--- inn-2.4.2/control/modules/checkgroups.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/modules/checkgroups.pl	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: checkgroups.pl,v 1.3 2002/12/29 20:49:08 rra Exp $
+##  $Id: checkgroups.pl 6099 2002-12-29 20:49:08Z rra $
 ##
 ##  checkgroups control message handler.
 ##
diff -ruNp inn-2.4.2/control/modules/ihave.pl inn-2.4.3/control/modules/ihave.pl
--- inn-2.4.2/control/modules/ihave.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/modules/ihave.pl	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: ihave.pl,v 1.3 2001/07/19 00:32:56 rra Exp $
+##  $Id: ihave.pl 4932 2001-07-19 00:32:56Z rra $
 ##
 ##  ihave control message handler.
 ##
diff -ruNp inn-2.4.2/control/modules/newgroup.pl inn-2.4.3/control/modules/newgroup.pl
--- inn-2.4.2/control/modules/newgroup.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/modules/newgroup.pl	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: newgroup.pl,v 1.3 2001/07/19 00:32:56 rra Exp $
+##  $Id: newgroup.pl 4932 2001-07-19 00:32:56Z rra $
 ##
 ##  newgroup control message handler.
 ##
diff -ruNp inn-2.4.2/control/modules/rmgroup.pl inn-2.4.3/control/modules/rmgroup.pl
--- inn-2.4.2/control/modules/rmgroup.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/modules/rmgroup.pl	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: rmgroup.pl,v 1.3 2001/07/19 00:32:56 rra Exp $
+##  $Id: rmgroup.pl 4932 2001-07-19 00:32:56Z rra $
 ##
 ##  rmgroup control message handler.
 ##
diff -ruNp inn-2.4.2/control/modules/sendme.pl inn-2.4.3/control/modules/sendme.pl
--- inn-2.4.2/control/modules/sendme.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/modules/sendme.pl	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: sendme.pl,v 1.3 2001/07/19 00:32:56 rra Exp $
+##  $Id: sendme.pl 4932 2001-07-19 00:32:56Z rra $
 ##
 ##  sendme control message handler.
 ##
diff -ruNp inn-2.4.2/control/modules/sendsys.pl inn-2.4.3/control/modules/sendsys.pl
--- inn-2.4.2/control/modules/sendsys.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/modules/sendsys.pl	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: sendsys.pl,v 1.2 2001/07/19 00:32:56 rra Exp $
+##  $Id: sendsys.pl 4932 2001-07-19 00:32:56Z rra $
 ##
 ##  sendsys control message handler.
 ##
diff -ruNp inn-2.4.2/control/modules/senduuname.pl inn-2.4.3/control/modules/senduuname.pl
--- inn-2.4.2/control/modules/senduuname.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/modules/senduuname.pl	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: senduuname.pl,v 1.2 2001/07/19 00:32:56 rra Exp $
+##  $Id: senduuname.pl 4932 2001-07-19 00:32:56Z rra $
 ##
 ##  senduuname control message handler.
 ##
diff -ruNp inn-2.4.2/control/modules/version.pl inn-2.4.3/control/modules/version.pl
--- inn-2.4.2/control/modules/version.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/modules/version.pl	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: version.pl,v 1.2 2001/07/19 00:32:56 rra Exp $
+##  $Id: version.pl 4932 2001-07-19 00:32:56Z rra $
 ##
 ##  version control message handler.
 ##
diff -ruNp inn-2.4.2/control/perl-nocem.in inn-2.4.3/control/perl-nocem.in
--- inn-2.4.2/control/perl-nocem.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/perl-nocem.in	Mon Mar 20 04:14:57 2006
@@ -469,10 +469,14 @@ __END__
 
 =head1 NAME
 
-perl-nocem - a NoCeM-on-spool implementation for INN 2.x
+perl-nocem - A NoCeM-on-spool implementation for INN 2.x
 
 =head1 SYNOPSIS
 
+perl-nocem < I<message>
+
+=head1 DESCRIPTION
+
 Add to the newsfeeds file an entry like this one:
 
     nocem:!*,alt.nocem.misc,news.lists.filter\
@@ -496,8 +500,10 @@ The nocem.ctl config file contains lines
 
 The Subject header is not checked for the @@NCM string and there is no
 check for the presence of the References header.
+
 The Newsgroups pseudo header is not checked, but this can be done in
 local_want_cancel_id().
+
 The Hierarchies header is ignored.
 
 =head1 HISTORY
diff -ruNp inn-2.4.2/control/pgpverify.in inn-2.4.3/control/pgpverify.in
--- inn-2.4.2/control/pgpverify.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/control/pgpverify.in	Mon Mar 20 04:14:57 2006
@@ -2,9 +2,9 @@
 # do '@LIBDIR@/innshellvars.pl';
 # If running inside INN, uncomment the above and point to innshellvars.pl.
 #
-# written April 1996, tale@isc.org (David C Lawrence)
+# Written April 1996, tale@isc.org (David C Lawrence)
 # Currently maintained by Russ Allbery <rra@stanford.edu>
-# Version 1.25, 2003-12-10
+# Version 1.27, 2005-07-02
 #
 # NOTICE TO INN MAINTAINERS:  The version that is shipped with INN is the
 # same as the version that I make available to the rest of the world
@@ -16,6 +16,14 @@
 # me about it; I want to know what old versions of Perl are still used in
 # practice.
 #
+# Changes from 1.26 -> 1.27
+# -- Default to pubring.gpg when trustedkeys.gpg is not found in the
+#    default key location, for backward compatibility.
+#
+# Changes from 1.25 -> 1.26
+# -- Return the correct status code when the message isn't verified
+#    instead of always returning 255.
+#
 # Changes from 1.24 -> 1.25
 # -- Fix the -test switch to actually do something.
 # -- Improve date generation when logging to standard output.
@@ -253,7 +261,7 @@ unless ($gpgv) {
 }
 print "$signer\n" if $signer;
 unless ($ok == 0) {
-  &fail("$0: verification failed\n");
+  &errmsg("$0: verification failed\n");
 }
 exit $ok;
 
@@ -426,9 +434,23 @@ sub pgp_verify {
   # everything out to a file, this is actually fairly simple; all we need
   # to do is grab stdout.  PGP prints its banner information to stderr, so
   # just ignore stderr.  Set PGPPATH if desired.
+  #
+  # For GnuPG, use pubring.gpg if an explicit keyring was configured or
+  # found.  Otherwise, use trustedkeys.gpg in the default keyring location
+  # if found and non-zero, or fall back on pubring.gpg.  This is
+  # definitely not the logic that I would use if writing this from
+  # scratch, but it has the most backward compatibility.
   local $ENV{PGPPATH} = $keyring if ($keyring && $pgpstyle ne 'GPG');
-  if ($keyring && $pgpstyle eq 'GPG') {
-    push (@command, "--keyring=$keyring/pubring.gpg");
+  if ($pgpstyle eq 'GPG') {
+    if ($keyring) {
+      push (@command, "--keyring=$keyring/pubring.gpg");
+    } else {
+      my $home = $ENV{GNUPGHOME} || $ENV{HOME};
+      $home .= '/.gnupg' if $home;
+      if ($home && ! -s "$home/trustedkeys.gpg" && -f "$home/pubring.gpg") {
+        push (@command, "--keyring=pubring.gpg");
+      }
+    }
   }
   push (@command, "$filename.asc");
   push (@command, $filename);
@@ -686,6 +708,15 @@ signatures).  If that directory doesn't 
 the default key ring, which is in a F<.pgp> or F<.gnupg> subdirectory of
 the running user's home directory.
 
+INN, when using GnuPG, configures B<pgpverify> to use B<gpgv>, which by
+default expects keys to be in a keyring named F<trustedkeys.gpg>, since it
+doesn't implement trust checking directly.  B<pgpverify> uses that file if
+present but falls back to F<pubring.gpg> if it's not found.  This bypasses
+the trust model for checking keys, but is compatible with the way that
+B<pgpverify> used to behave.  Of course, if a keyring is found in
+I<pathetc>/pgp or configured at the top of the script, that overrides all of
+this behavior.
+
 =head1 OPTIONS
 
 The B<-test> flag causes B<pgpverify> to print out the input that it is
@@ -771,14 +802,6 @@ could forge a validly-signed control mes
 public key encryption algorithm, which (at least at this time) is believed
 to be prohibitively difficult for PGP keys of a sufficient bit length.
 
-=head1 SEE ALSO
-
-gpgv(1), pgp(1)
-
-L<ftp://ftp.isc.org/pub/pgpcontrol/> is where the most recent versions of
-B<signcontrol> and B<pgpverify> live, along with PGP public keys used for
-hierarchy administration.
-
 =head1 HISTORY
 
 B<pgpverify> was written by David C Lawrence <tale@isc.org>.  Manual page
@@ -836,6 +859,14 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEV
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=head1 SEE ALSO
+
+gpgv(1), pgp(1)
+
+L<ftp://ftp.isc.org/pub/pgpcontrol/> is where the most recent versions of
+B<signcontrol> and B<pgpverify> live, along with PGP public keys used for
+hierarchy administration.
 
 =cut
 
diff -ruNp inn-2.4.2/doc/IPv6-info inn-2.4.3/doc/IPv6-info
--- inn-2.4.2/doc/IPv6-info	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/IPv6-info	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 Notes about IPv6 support in INN:
 
-   This is $Revision: 1.6 $, dated $Date: 2002/04/14 14:05:36 $.
+   This is $Revision: 5416 $, dated $Date: 2002-04-14 07:05:36 -0700 (Sun, 14 Apr 2002) $.
 
    This document contains some notes about the status of IPv6 support in
    INN (see also the parts of the code marked FIXME):
diff -ruNp inn-2.4.2/doc/Makefile inn-2.4.3/doc/Makefile
--- inn-2.4.2/doc/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.50 2002/12/16 12:08:38 alexk Exp $
+##  $Id: Makefile 6017 2002-12-16 12:08:38Z alexk $
 ##
 ##  The only target that this Makefile need support is install.  Everything
 ##  else is a null target (and the top level Makefile shouldn't even attempt
diff -ruNp inn-2.4.2/doc/checklist inn-2.4.3/doc/checklist
--- inn-2.4.2/doc/checklist	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/checklist	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 Introduction
 
-    $Id: checklist,v 1.4 2002/12/03 05:31:09 vinocur Exp $
+    $Id: checklist 5912 2002-12-03 05:31:11Z vinocur $
 
     This is an installation checklist written by Rebecca Ore, intended to be
     the beginning of a different presentation of the information in INSTALL,
diff -ruNp inn-2.4.2/doc/compliance-nntp inn-2.4.3/doc/compliance-nntp
--- inn-2.4.2/doc/compliance-nntp	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/compliance-nntp	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-$Id: compliance-nntp,v 1.19.2.2 2004/05/18 09:25:55 rra Exp $
+$Id: compliance-nntp 6817 2004-05-18 09:25:55Z rra $
 
 The following are outstanding issues regarding INN's compliance with the
 NNTP standard.  The reference documents used in this analysis are the
diff -ruNp inn-2.4.2/doc/config-design inn-2.4.3/doc/config-design
--- inn-2.4.2/doc/config-design	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/config-design	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-$Id: config-design,v 1.2 2001/06/21 10:52:27 rra Exp $
+$Id: config-design 4805 2001-06-21 10:52:27Z rra $
 
 This file is documentation of the design principles that went into INN's
 configuration file syntax, and some rationale for why those principles
diff -ruNp inn-2.4.2/doc/config-semantics inn-2.4.3/doc/config-semantics
--- inn-2.4.2/doc/config-semantics	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/config-semantics	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-$Id: config-semantics,v 1.1 2001/06/21 08:59:39 rra Exp $
+$Id: config-semantics 4792 2001-06-21 08:59:39Z rra $
 
 Groups in a configuration file have a well-defined order, namely the order
 in which the groups would be encountered in a depth-first traversal of the
diff -ruNp inn-2.4.2/doc/config-syntax inn-2.4.3/doc/config-syntax
--- inn-2.4.2/doc/config-syntax	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/config-syntax	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-$Id: config-syntax,v 1.3 2002/11/19 00:08:18 rra Exp $
+$Id: config-syntax 5843 2002-11-19 00:08:18Z rra $
 
 This file documents the standardized syntax for INN configuration files.
 This is the syntax that the parsing code in libinn will understand and the
diff -ruNp inn-2.4.2/doc/external-auth inn-2.4.3/doc/external-auth
--- inn-2.4.2/doc/external-auth	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/external-auth	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 NNRPD External Authentication Support
 
-    This is $Revision: 1.2.2.1 $ dated $Date: 2004/05/17 12:18:18 $.
+    This is $Revision: 7141 $ dated $Date: 2005-03-17 03:42:46 -0800 (Thu, 17 Mar 2005) $.
 
     A fundamental part of the readers.conf(5)-based authorization mechanism
     is the interface to external authenticator and resolver programs.  This
@@ -32,8 +32,8 @@ Reading information from nnrpd
 
     When nnrpd calls an authenticator, the lines it passes are
 
-        ClientAuthname: user\r
-        ClientPassword: pass\r
+        ClientAuthname: user\r\n
+        ClientPassword: pass\r\n
 
     where *user* and *pass* are the username and password provided by the
     client (e.g. using AUTHINFO).  In addition, nnrpd generally also passes
@@ -44,12 +44,12 @@ Reading information from nnrpd
 
     When nnrpd calls a resolver, the lines it passes are
 
-        ClientHost: hostname\r
-        ClientIP: IP-address\r
-        ClientPort: port\r
-        LocalIP: IP-address\r
-        LocalPort: port\r
-        .\r
+        ClientHost: hostname\r\n
+        ClientIP: IP-address\r\n
+        ClientPort: port\r\n
+        LocalIP: IP-address\r\n
+        LocalPort: port\r\n
+        .\r\n
 
     where *hostname* indicates a string representing the hostname if
     available, *IP-address* is a numeric IP address (dotted-quad for IPv4,
@@ -80,7 +80,7 @@ Returning information to nnrpd
     with a domain appended) by writing to standard output.  The line it
     should write is exactly:
 
-        user:username\r
+        user:username\r\n
 
     where *username* is the string that nnrpd should use in matching
     readers.conf access blocks.
diff -ruNp inn-2.4.2/doc/history inn-2.4.3/doc/history
--- inn-2.4.2/doc/history	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/history	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-$Revision: 1.1 $
+$Revision: 4165 $
 This file contains a few messages of historical interest.  Some of the
 information in these messages is out of date (e.g., you don't need any
 other software, ihave/sendme is suported, etc); see the README and
diff -ruNp inn-2.4.2/doc/hook-perl inn-2.4.3/doc/hook-perl
--- inn-2.4.2/doc/hook-perl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/hook-perl	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 INN Perl Filtering and Authentication Support
 
-    This is $Revision: 1.9 $ dated $Date: 2003/02/10 03:21:25 $.
+    This is $Revision: 6221 $ dated $Date: 2003-02-09 19:21:27 -0800 (Sun, 09 Feb 2003) $.
 
     This file documents INN's built-in support for Perl filtering and reader
     authentication.  The code is based very heavily on work by Christophe
diff -ruNp inn-2.4.2/doc/hook-python inn-2.4.3/doc/hook-python
--- inn-2.4.2/doc/hook-python	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/hook-python	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 INN Python Filtering and Authentication Support
 
-    This is $Revision: 1.8 $, dated $Date: 2003/04/04 16:47:21 $.
+    This is $Revision: 7134 $, dated $Date: 2005-03-05 13:19:44 -0800 (Sat, 05 Mar 2005) $.
 
     This file documents INN's built-in optional support for Python article
     filtering.  It is patterned after the TCL and Perl hooks previously
@@ -304,7 +304,7 @@ NNRPD
     Python script. If a connection matches an auth group which has a
     python_access parameter, all access groups in readers.conf are ignored;
     instead the procedure described below is used to generate an access
-    group. This concept is due to Jeffery M. Vinocur.
+    group. This concept is due to Jeffrey M. Vinocur.
 
     In the old implementation, the authorization method allowed for access
     control on a per-group basis. That functionality is preserved in the new
diff -ruNp inn-2.4.2/doc/man/Makefile inn-2.4.3/doc/man/Makefile
--- inn-2.4.2/doc/man/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.45 2003/03/10 00:03:05 rra Exp $
+##  $Id: Makefile 7458 2005-12-12 00:25:05Z eagle $
 
 include ../../Makefile.global
 
@@ -8,8 +8,8 @@ top	= ../..
 MANFLAGS = -c $(OWNER) -m 0444 -B .OLD
 
 SEC1	= convdate.1 fastrm.1 getlist.1 grephistory.1 inews.1 innconfval.1 \
-	innfeed.1 innmail.1 nntpget.1 pgpverify.1 rnews.1 shlock.1 \
-	shrinkfile.1 simpleftp.1 sm.1 startinnfeed.1
+	innfeed.1 innmail.1 nntpget.1 pgpverify.1 pullnews.1 rnews.1 \
+	shlock.1 shrinkfile.1 simpleftp.1 sm.1 startinnfeed.1
 
 SEC3	= clientlib.3 dbz.3 inndcomm.3 libauth.3 libinn.3 libinnhist.3 \
 	libstorage.3 list.3 parsedate.3 qio.3 tst.3 uwildmat.3
@@ -28,8 +28,8 @@ SEC8	= actsync.8 actsyncd.8 archive.8 au
 	innupgrade.8 innwatch.8 innxbatch.8 innxmit.8 mailpost.8 makedbz.8 \
 	makehistory.8 mod-active.8 news.daily.8 news2mail.8 ninpaths.8 \
 	nnrpd.8 nntpsend.8 ovdb_init.8 ovdb_monitor.8 ovdb_server.8 \
-	ovdb_stat.8 overchan.8 perl-nocem.8 prunehistory.8 pullnews.8 \
-	radius.8 rc.news.8 scanlogs.8 send-nntp.8 send-uucp.8 sendinpaths.8 \
+	ovdb_stat.8 overchan.8 perl-nocem.8 prunehistory.8 radius.8 \
+	rc.news.8 scanlogs.8 send-nntp.8 send-uucp.8 sendinpaths.8 \
 	tally.control.8 tdx-util.8 writelog.8
 
 COPY	= $(SHELL) ./putman.sh $(MANPAGESTYLE) "$(MANFLAGS)"
diff -ruNp inn-2.4.2/doc/man/active.5 inn-2.4.3/doc/man/active.5
--- inn-2.4.2/doc/man/active.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/active.5	Mon Mar 20 04:14:57 2006
@@ -214,7 +214,7 @@ alias.
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews.  Converted to
 \&\s-1POD\s0 by Russ Allbery <rra@stanford.edu>.
 .PP
-$Id: active.5,v 1.12.2.1 2004/05/17 05:48:54 rra Exp $
+$Id: active.5 6773 2004-05-17 05:48:54Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIactive.times\fR\|(5), \fIcontrolchan\fR\|(8), \fIctlinnd\fR\|(8), \fIinn.conf\fR\|(5), \fIinnd\fR\|(8),
diff -ruNp inn-2.4.2/doc/man/active.times.5 inn-2.4.3/doc/man/active.times.5
--- inn-2.4.2/doc/man/active.times.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/active.times.5	Mon Mar 20 04:14:57 2006
@@ -157,7 +157,7 @@ given to \fBctlinnd\fR.
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews.  Converted to
 \&\s-1POD\s0 by Russ Allbery <rra@stanford.edu>
 .PP
-$Id: active.times.5,v 1.2 2003/04/06 21:50:06 rra Exp $
+$Id: active.times.5 6282 2003-04-06 21:50:07Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIactive\fR\|(5), \fIctlinnd\fR\|(8), \fIinn.conf\fR\|(5), \fIinnd\fR\|(8), \fInnrpd\fR\|(8)
diff -ruNp inn-2.4.2/doc/man/actsync.8 inn-2.4.3/doc/man/actsync.8
--- inn-2.4.2/doc/man/actsync.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/actsync.8	Mon Mar 20 04:14:57 2006
@@ -6,7 +6,7 @@
 .\" Permission to use and modify is hereby granted so long as this
 .\" notice remains.  Use at your own risk.  No warranty is implied.
 .\"
-.\" @(#) $Id: actsync.8,v 1.17.2.1 2004/05/16 22:00:46 rra Exp $
+.\" @(#) $Id: actsync.8 6731 2004-05-16 22:00:46Z rra $
 .\" @(#) Under RCS control in /usr/local/news/src/inn/local/RCS/actsync.8,v
 .\"
 .TH ACTSYNC 8
diff -ruNp inn-2.4.2/doc/man/archive.8 inn-2.4.3/doc/man/archive.8
--- inn-2.4.2/doc/man/archive.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/archive.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.10 $
+.\" $Revision: 5909 $
 .TH ARCHIVE 8
 .SH NAME
 archive \- Usenet article archiver
@@ -145,7 +145,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: archive.8,v 1.10 2002/12/03 05:17:12 vinocur Exp $
+.R$ $Id: archive.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 inn.conf(5),
 newsfeeds(5).
diff -ruNp inn-2.4.2/doc/man/auth_krb5.8 inn-2.4.3/doc/man/auth_krb5.8
--- inn-2.4.2/doc/man/auth_krb5.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/auth_krb5.8	Mon Mar 20 04:14:57 2006
@@ -200,7 +200,7 @@ Originally written by Christopher P. Lin
 written by Russ Allbery <rra@stanford.edu> based on Christopher's original
 \&\s-1README\s0 file.
 .PP
-$Id: auth_krb5.8,v 1.2 2002/12/03 05:31:09 vinocur Exp $
+$Id: auth_krb5.8 5912 2002-12-03 05:31:11Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fInnrpd\fR\|(8), \fIreaders.conf\fR\|(5)
diff -ruNp inn-2.4.2/doc/man/auth_smb.8 inn-2.4.3/doc/man/auth_smb.8
--- inn-2.4.2/doc/man/auth_smb.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/auth_smb.8	Mon Mar 20 04:14:57 2006
@@ -176,7 +176,7 @@ Originally written October 2000 by Krisc
 based heavily on pam_smb v1.1.6 by David Airlie <airlied@samba.org>.
 This documentation was written by Jeffrey M. Vinocur <jeff@litech.org>.
 .PP
-$Id: auth_smb.8,v 1.1 2002/12/12 23:07:49 vinocur Exp $
+$Id: auth_smb.8 5989 2002-12-12 23:07:49Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fInnrpd\fR\|(8), \fIreaders.conf\fR\|(5)
diff -ruNp inn-2.4.2/doc/man/batcher.8 inn-2.4.3/doc/man/batcher.8
--- inn-2.4.2/doc/man/batcher.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/batcher.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.7.2.1 $
+.\" $Revision: 6491 $
 .TH BATCHER 8
 .SH NAME
 batcher \- article-batching backend for InterNetNews
@@ -188,7 +188,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: batcher.8,v 1.7.2.1 2003/10/18 05:56:37 rra Exp $
+.R$ $Id: batcher.8 6491 2003-10-18 05:56:37Z rra $
 .SH "SEE ALSO"
 ctlinnd(8),
 inn.conf(5),
diff -ruNp inn-2.4.2/doc/man/buffchan.8 inn-2.4.3/doc/man/buffchan.8
--- inn-2.4.2/doc/man/buffchan.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/buffchan.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.8 $
+.\" $Revision: 5909 $
 .TH BUFFCHAN 8
 .SH NAME
 buffchan \- buffered file-writing backend for InterNetNews
@@ -188,7 +188,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: buffchan.8,v 1.8 2002/12/03 05:17:12 vinocur Exp $
+.R$ $Id: buffchan.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 ctlinnd(8),
 filechan(8),
diff -ruNp inn-2.4.2/doc/man/buffindexed.conf.5 inn-2.4.3/doc/man/buffindexed.conf.5
--- inn-2.4.2/doc/man/buffindexed.conf.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/buffindexed.conf.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.7 $
+.\" $Revision: 5909 $
 .TH BUFFINDEXED.CONF 5
 .SH NAME
 buffindexed.conf \- configuration file for buffindexed ovmethod
@@ -115,6 +115,6 @@ Written by Katsuhiro Kondou <kondou@nec.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: buffindexed.conf.5,v 1.7 2002/12/03 05:17:13 vinocur Exp $
+.R$ $Id: buffindexed.conf.5 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 inn.conf(5).
diff -ruNp inn-2.4.2/doc/man/ckpasswd.8 inn-2.4.3/doc/man/ckpasswd.8
--- inn-2.4.2/doc/man/ckpasswd.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/ckpasswd.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.13
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "CKPASSWD 8"
-.TH CKPASSWD 8 "2003-07-30" "INN 2.4.1" "InterNetNews Documentation"
+.TH CKPASSWD 8 "2005-04-11" "INN 2.4.3" "InterNetNews Documentation"
 .SH "NAME"
 ckpasswd \- nnrpd password authenticator
 .SH "SYNOPSIS"
@@ -151,10 +151,18 @@ these days most systems no longer make r
 \&\fIgetpwnam\fR\|(3) (some still do if and only if the program calling \fIgetpwnam\fR\|(3)
 is running as root).
 .PP
-Note that \fBckpasswd\fR expects all passwords to be stored encrypted by the
-system \fIcrypt\fR\|(3) function and calls \fIcrypt\fR\|(3) on the supplied password
-before comparing it to the expected password (when using any method other
-than \s-1PAM\s0).
+When using \s-1PAM\s0, \fBckpasswd\fR identifies itself as \f(CW\*(C`nnrpd\*(C'\fR, not as
+\&\f(CW\*(C`ckpasswd\*(C'\fR, and the \s-1PAM\s0 configuration must be set up accordingly.  The
+details of \s-1PAM\s0 configuration are different on different operating systems
+(and even different Linux distributions); see \s-1EXAMPLES\s0 below for help
+getting started, and look for a \fIpam\fR\|(7) or \fIpam.conf\fR\|(4) manual page on your
+system.
+.PP
+When using any method other than \s-1PAM\s0, \fBckpasswd\fR expects all passwords to
+be stored encrypted by the system \fIcrypt\fR\|(3) function and calls \fIcrypt\fR\|(3) on
+the supplied password before comparing it to the expected password.  \s-1IF\s0
+you're using a different password hash scheme (like \s-1MD5\s0), you must use
+\&\s-1PAM\s0.
 .SH "OPTIONS"
 .IX Header "OPTIONS"
 .IP "\fB\-d\fR \fIdatabase\fR" 4
@@ -252,6 +260,29 @@ also be given.
 See \fIreaders.conf\fR\|(5) for examples of \fInnrpd\fR\|(8) authentication configuration
 that uses \fBckpasswd\fR to check passwords.
 .PP
+An example \s-1PAM\s0 configuration for \fI/etc/pam.conf\fR that tells \fBckpasswd\fR
+to check usernames and passwords against system accounts is:
+.PP
+.Vb 2
+\&    nnrpd auth    required pam_unix.so
+\&    nnrpd account required pam_unix.so
+.Ve
+.PP
+Your system may want you to instead create a file named \fInnrpd\fR in
+\&\fI/etc/pam.d\fR with lines like:
+.PP
+.Vb 2
+\&    auth    required pam_unix.so
+\&    account required pam_unix.so
+.Ve
+.PP
+This is only the simplest configuration.  You may be able to include
+common shared files, and you may want to stack other modules, either to
+allow different authentication methods or to apply restrictions like lists
+of users who can't authenticate using \fBckpasswd\fR.  The best guide is the
+documentation for your system and the other \s-1PAM\s0 configurations you're
+already using.
+.PP
 To test to make sure that \fBckpasswd\fR is working correctly, you can run it
 manually and then give it the username (prefixed with \f(CW\*(C`ClientAuthname:\*(C'\fR)
 and password (prefixed with \f(CW\*(C`ClientPassword:\*(C'\fR) on standard input.  For
@@ -259,7 +290,7 @@ example:
 .PP
 .Vb 2
 \&    (echo 'ClientAuthname: test' ; echo 'ClientPassword: testing') \e
-\&        | ckpasswd -f /path/to/passwd/file
+\&        | ckpasswd \-f /path/to/passwd/file
 .Ve
 .PP
 will check a username of \f(CW\*(C`test\*(C'\fR and a password of \f(CW\*(C`testing\*(C'\fR against the
@@ -270,7 +301,11 @@ it will print some sort of error message
 .IX Header "HISTORY"
 Written by Russ Allbery <rra@stanford.edu> for InterNetNews.
 .PP
-$Id: ckpasswd.8,v 1.2.2.2 2003/08/08 22:02:42 vinocur Exp $
+$Id: ckpasswd.8 7215 2005-04-11 20:43:21Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIreaders.conf\fR\|(5), \fInnrpd\fR\|(8)
+.PP
+Linux users who want to use \s-1PAM\s0 should read the Linux-PAM System
+Administrator's Guide at
+<http://www.kernel.org/pub/linux/libs/pam/Linux\-PAM\-html/pam.html>.
diff -ruNp inn-2.4.2/doc/man/clientlib.3 inn-2.4.3/doc/man/clientlib.3
--- inn-2.4.2/doc/man/clientlib.3	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/clientlib.3	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.1.1.1 $
+.\" $Revision: 6312 $
 .TH CLIENTLIB 3
 .SH NAME
 clientlib \- NNTP clientlib part of InterNetNews library
@@ -100,6 +100,6 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: clientlib.3,v 1.1.1.1 1997/08/04 04:03:45 gpalmer Exp $
+.R$ $Id: clientlib.3 6312 2003-05-04 21:40:11Z rra $
 .SH "SEE ALSO"
 libinn(3).
diff -ruNp inn-2.4.2/doc/man/cnfsheadconf.8 inn-2.4.3/doc/man/cnfsheadconf.8
--- inn-2.4.2/doc/man/cnfsheadconf.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/cnfsheadconf.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.4 $
+.\" $Revision: 5909 $
 .TH CNFSHEADCONF 8
 .SH NAME
 cnfsheadconf \- set CNFS header
@@ -39,7 +39,7 @@ Written by Katsuhiro Kondou <kondou@nec.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: cnfsheadconf.8,v 1.4 2002/12/03 05:17:13 vinocur Exp $
+.R$ $Id: cnfsheadconf.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 cycbuff.conf(5),
 inn.conf(5),
diff -ruNp inn-2.4.2/doc/man/cnfsstat.8 inn-2.4.3/doc/man/cnfsstat.8
--- inn-2.4.2/doc/man/cnfsstat.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/cnfsstat.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.7 $
+.\" $Revision: 5909 $
 .TH CNFSSTAT 8
 .SH NAME
 cnfsstat \- show usage of cycbuffs
@@ -92,7 +92,7 @@ Written by Katsuhiro Kondou <kondou@nec.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: cnfsstat.8,v 1.7 2002/12/03 05:17:13 vinocur Exp $
+.R$ $Id: cnfsstat.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 cycbuff.conf(5),
 inn.conf(5),
diff -ruNp inn-2.4.2/doc/man/control.ctl.5 inn-2.4.3/doc/man/control.ctl.5
--- inn-2.4.2/doc/man/control.ctl.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/control.ctl.5	Mon Mar 20 04:14:57 2006
@@ -301,7 +301,7 @@ probably intended to do (yet).
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews.  Rewritten in
 \&\s-1POD\s0 by Russ Allbery <rra@stanford.edu>.
 .PP
-$Id: control.ctl.5,v 1.15 2002/12/03 05:31:09 vinocur Exp $
+$Id: control.ctl.5 5912 2002-12-03 05:31:11Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIcontrolchan\fR\|(8), \fIinn.conf\fR\|(5), \fIinnd\fR\|(8), \fInewsfeeds\fR\|(5), \fIpgpverify\fR\|(8), \fIsh\fR\|(1).
diff -ruNp inn-2.4.2/doc/man/controlchan.8 inn-2.4.3/doc/man/controlchan.8
--- inn-2.4.2/doc/man/controlchan.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/controlchan.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.5 $
+.\" $Revision: 5909 $
 .TH CONTROLCHAN 8
 .SH NAME
 controlchan \- channel\-fed control message handler
@@ -74,7 +74,7 @@ Written by Katsuhiro Kondou <kondou@nec.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: controlchan.8,v 1.5 2002/12/03 05:17:13 vinocur Exp $
+.R$ $Id: controlchan.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 control.ctl(5),
 inn.conf(5).
diff -ruNp inn-2.4.2/doc/man/convdate.1 inn-2.4.3/doc/man/convdate.1
--- inn-2.4.2/doc/man/convdate.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/convdate.1	Mon Mar 20 04:14:57 2006
@@ -230,7 +230,7 @@ determine (or at least override) the loc
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net>, rewritten and updated by Russ
 Allbery <rra@stanford.edu> for the \fB\-d\fR and \fB\-l\fR flags.
 .PP
-$Id: convdate.1,v 1.5 2002/02/22 20:39:04 vinocur Exp $
+$Id: convdate.1 5132 2002-02-22 20:39:19Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIparsedate\fR\|(3).
diff -ruNp inn-2.4.2/doc/man/ctlinnd.8 inn-2.4.3/doc/man/ctlinnd.8
--- inn-2.4.2/doc/man/ctlinnd.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/ctlinnd.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.24.2.2 $
+.\" $Revision: 7062 $
 .TH CTLINND 8
 .SH NAME
 ctlinnd \- control the InterNetNews daemon
@@ -649,7 +649,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: ctlinnd.8,v 1.24.2.2 2004/12/19 21:41:05 rra Exp $
+.R$ $Id: ctlinnd.8 7062 2004-12-19 21:41:05Z rra $
 .SH "SEE ALSO"
 active(5),
 active.times(5),
diff -ruNp inn-2.4.2/doc/man/cvtbatch.8 inn-2.4.3/doc/man/cvtbatch.8
--- inn-2.4.2/doc/man/cvtbatch.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/cvtbatch.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.6 $
+.\" $Revision: 5909 $
 .TH CVTBATCH 8
 .SH NAME
 cvtbatch \- convert Usenet batch file to INN format
@@ -46,7 +46,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: cvtbatch.8,v 1.6 2002/12/03 05:17:13 vinocur Exp $
+.R$ $Id: cvtbatch.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 grephistory(1),
 inn.conf(5),
diff -ruNp inn-2.4.2/doc/man/cycbuff.conf.5 inn-2.4.3/doc/man/cycbuff.conf.5
--- inn-2.4.2/doc/man/cycbuff.conf.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/cycbuff.conf.5	Mon Mar 20 04:14:57 2006
@@ -314,7 +314,7 @@ where \s-1ONE\s0 will be whatever you ca
 Written by Katsuhiro Kondou <kondou@nec.co.jp> for InterNetNews.
 Rewritten into \s-1POD\s0 by Russ Allbery <rra@stanford.edu>.
 .PP
-$Id: cycbuff.conf.5,v 1.17 2003/02/28 00:05:36 kondou Exp $
+$Id: cycbuff.conf.5 6247 2003-02-28 00:05:40Z kondou $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIctlinnd\fR\|(8), \fIinnd\fR\|(8), \fInnrpd\fR\|(8), \fIsm\fR\|(1), \fIstorage.conf\fR\|(5)
diff -ruNp inn-2.4.2/doc/man/distrib.pats.5 inn-2.4.3/doc/man/distrib.pats.5
--- inn-2.4.2/doc/man/distrib.pats.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/distrib.pats.5	Mon Mar 20 04:14:57 2006
@@ -168,7 +168,7 @@ header will be added.
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews.  Converted to
 \&\s-1POD\s0 by Russ Allbery <rra@stanford.edu>.
 .PP
-$Id: distrib.pats.5,v 1.9 2003/04/06 21:50:06 rra Exp $
+$Id: distrib.pats.5 6282 2003-04-06 21:50:07Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIinn.conf\fR\|(5), \fInnrpd\fR\|(8), \fIuwildmat\fR\|(3)
diff -ruNp inn-2.4.2/doc/man/domain.8 inn-2.4.3/doc/man/domain.8
--- inn-2.4.2/doc/man/domain.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/domain.8	Mon Mar 20 04:14:57 2006
@@ -181,7 +181,7 @@ If so, the example above should reflect 
 .IX Header "HISTORY"
 This documentation was written by Jeffrey M. Vinocur <jeff@litech.org>.
 .PP
-$Id: domain.8,v 1.1 2002/12/12 23:07:49 vinocur Exp $
+$Id: domain.8 5989 2002-12-12 23:07:49Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fInnrpd\fR\|(8), \fIreaders.conf\fR\|(5)
diff -ruNp inn-2.4.2/doc/man/expire.8 inn-2.4.3/doc/man/expire.8
--- inn-2.4.2/doc/man/expire.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/expire.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.22 $
+.\" $Revision: 5909 $
 .TH EXPIRE 8
 .SH NAME
 expire \- Usenet article and history expiration program
@@ -240,7 +240,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: expire.8,v 1.22 2002/12/03 05:17:13 vinocur Exp $
+.R$ $Id: expire.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 ctlinnd(8),
 dbz(3),
diff -ruNp inn-2.4.2/doc/man/expire.ctl.5 inn-2.4.3/doc/man/expire.ctl.5
--- inn-2.4.2/doc/man/expire.ctl.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/expire.ctl.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.36, Pod::Parser v1.13
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "EXPIRE.CTL 5"
-.TH EXPIRE.CTL 5 "2003-04-06" "INN 2.4.0" "InterNetNews Documentation"
+.TH EXPIRE.CTL 5 "2005-04-11" "INN 2.4.3" "InterNetNews Documentation"
 .SH "NAME"
 expire.ctl \- Configuration file for article expiration
 .SH "DESCRIPTION"
@@ -177,13 +177,13 @@ Most of the lines in this file will be i
 consists of either four or five colon-separated fields:
 .PP
 .Vb 1
-\&    <pattern>:<flag>:<keep>:<default>:<purge>
+\&    <pattern>:<flag>:<min>:<default>:<max>
 .Ve
 .PP
 if \fIgroupbaseexpiry\fR is true in \fIinn.conf\fR (the default), and otherwise:
 .PP
 .Vb 1
-\&    <classnum>:<keep>:<default>:<purge>
+\&    <classnum>:<min>:<default>:<max>
 .Ve
 .PP
 All lines must be in the correct format given the current setting of
@@ -207,10 +207,16 @@ applies, and should be chosen from the f
 \&    X   Remove the article from all groups it appears in
 .Ve
 .PP
-Normally, articles are not completely deleted until they expire out of
-every group to which they were posted, but if an article is expired
-following a rule where <flag> is X, it is deleted out of all newsgroups to
-which it was posted immediately.
+One of M, U, or A must be specified.  X should be used in combination with
+one of the other letters, not by itself.
+.PP
+An expiration policy is applied to every article in a newsgroup it
+matches.  There is no way to set an expiration policy for articles
+crossposted to groups you don't carry that's different than other articles
+in the same group.  Normally, articles are not completely deleted until
+they expire out of every group to which they were posted, but if an
+article is expired following a rule where <flag> contains X, it is deleted
+out of all newsgroups to which it was posted immediately.
 .PP
 If \fIgroupbaseexpiry\fR is instead set to false, there is no <pattern> and
 <flag> field and the above does not apply.  Instead, there is a single
@@ -228,15 +234,15 @@ that articles are only removed when \fBe
 normally once a day by \fBnews.daily\fR) or the word \f(CW\*(C`never\*(C'\fR.
 .PP
 The middle field, <default>, will be used as the expiration period for
-most articles.  The other two fields, <keep> and <purge>, only come into
+most articles.  The other two fields, <min> and <max>, only come into
 play if the article requests a particular expiration date with an Expires
 header.  Articles with an Expires header will be expired at the date given
 in that header, subject to the constraints that they will be retained at
-least <keep> days and no longer than <purge> days.
+least <min> days and no longer than <max> days.
 .PP
-If <keep> is set to \f(CW\*(C`never\*(C'\fR, no article matching that line will ever be
+If <min> is set to \f(CW\*(C`never\*(C'\fR, no article matching that line will ever be
 expired.  If <default> is set to \f(CW\*(C`never\*(C'\fR, no article matching that line
-without an explicit Expires header will ever be expired.  If <purge> is
+without an explicit Expires header will ever be expired.  If <max> is
 set to \f(CW\*(C`never\*(C'\fR, Expires headers will be honored no matter how far into
 the future they are.
 .PP
@@ -254,8 +260,8 @@ file (except for \f(CW\*(C`/remember/\*(
 override it.
 .PP
 It is often useful to honor the Expires header in articles, especially
-those in moderated groups.  To do this, set <keep> to zero, <default> to
-whatever normal expiration you wish, and <purge> to \f(CW\*(C`never\*(C'\fR or some large
+those in moderated groups.  To do this, set <min> to zero, <default> to
+whatever normal expiration you wish, and <max> to \f(CW\*(C`never\*(C'\fR or some large
 number, like 365 days for a maximum article life of a year.
 .PP
 To ignore any Expires header, set all three fields to the same value.
@@ -306,7 +312,7 @@ When \fIgroupbaseexpiry\fR is false, for
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews.  Converted to
 \&\s-1POD\s0 by Russ Allbery <rra@stanford.edu>.
 .PP
-$Id: expire.ctl.5,v 1.19 2003/04/06 21:50:06 rra Exp $
+$Id: expire.ctl.5 7207 2005-04-11 18:18:40Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIexpire\fR\|(8), \fIexpireover\fR\|(8), \fIinn.conf\fR\|(5), \fIinnd\fR\|(8), \fInews.daily\fR\|(8),
diff -ruNp inn-2.4.2/doc/man/expireover.8 inn-2.4.3/doc/man/expireover.8
--- inn-2.4.2/doc/man/expireover.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/expireover.8	Mon Mar 20 04:14:57 2006
@@ -260,7 +260,7 @@ Written by Rob Robertson <rob@violet.ber
 <rsalz@uunet.uu.net> (with help from Dave Lawrence <tale@uunet.uu.net>)
 for InterNetNews.
 .PP
-$Id: expireover.8,v 1.15 2002/12/03 05:31:09 vinocur Exp $
+$Id: expireover.8 5912 2002-12-03 05:31:11Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIactive\fR\|(5), \fIctlinnd\fR\|(8), \fIexpire\fR\|(8), \fIexpire.ctl\fR\|(5), \fIinn.conf\fR\|(5),
diff -ruNp inn-2.4.2/doc/man/fastrm.1 inn-2.4.3/doc/man/fastrm.1
--- inn-2.4.2/doc/man/fastrm.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/fastrm.1	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "FASTRM 1"
-.TH FASTRM 1 "2002-12-03" "INN 2.4.0" "InterNetNews Documentation"
+.TH FASTRM 1 "2005-10-08" "INN 2.4.3" "InterNetNews Documentation"
 .SH "NAME"
 fastrm \- Quickly remove a list of files
 .SH "SYNOPSIS"
@@ -140,7 +140,11 @@ fastrm \- Quickly remove a list of files
 .IX Header "DESCRIPTION"
 \&\fBfastrm\fR reads a list of either file names or storage \s-1API\s0 tokens, one per
 line, from its standard input and removes them.  Storage \s-1API\s0 tokens are
-removed via the \fISMcancel()\fR interface.
+removed via the \fISMcancel()\fR interface.  \fBfastrm\fR does not delete files
+safely or with an eye to security, but rather cuts every corner it can to
+delete files as fast as it can.  It should therefore never be run on
+publically writable directories, or in any other environment where a
+hostile party may control the directory structure in which it is working.
 .PP
 If a file name is not an absolute path name, it is considered to be
 relative to \fIbase-directory\fR as given on the command line.  The
@@ -258,27 +262,35 @@ that does not exist is not considered a 
 like:
 .PP
 .Vb 1
-\&    fastrm -e /usr/local/news/spool/articles < expire.list
+\&    fastrm \-e /usr/local/news/spool/articles < expire.list
 .Ve
 .PP
 To enable all optimizations and see the affect on the order of removal
 caused by \fB\-s\fR, use:
 .PP
 .Vb 1
-\&    fastrm -d -s -e -u ~news/spool/articles < expire.list
+\&    fastrm \-d \-s \-e \-u ~news/spool/articles < expire.list
 .Ve
 .PP
 If your file system has indexed directory lookups, but you have a deeply
 nested directory structure, you may want to use a set of flags like:
 .PP
 .Vb 1
-\&    fastrm -e -u3 ~news/spool/articles < expire.list
+\&    fastrm \-e \-u3 ~news/spool/articles < expire.list
 .Ve
 .PP
 to strongly prefer relative paths but not to use \fIreaddir\fR\|(2) to order the
 calls to \fIunlink\fR\|(2).
 .PP
 You may want to edit \fIexpirerm\fR\|(8) to change the flags passed to \fBfastrm\fR.
+.SH "WARNINGS"
+.IX Header "WARNINGS"
+\&\fBfastrm\fR cuts corners and does not worry about security, so it does not
+use \fIchdir\fR\|(2) safely and could be tricked into removing files other than
+those that were intended if run on a specially constructed file tree or a
+file tree that is being modified while it is running.  It should therefore
+never be used with world-writable directories or any other directory that
+might be controlled or modified by an attacker.
 .SH "NOTES"
 .IX Header "NOTES"
 \&\fBfastrm\fR defers opening the storage subsystem or attempting to parse any
@@ -288,10 +300,9 @@ general fast file removal program.
 .SH "HISTORY"
 .IX Header "HISTORY"
 \&\fBfastrm\fR was originally written by kre@munnari.oz.au.  This manual page
-rewritten in \s-1POD\s0 by Russ Allbery <rra@stanford.edu> for
-InterNetNews.
+rewritten in \s-1POD\s0 by Russ Allbery <rra@stanford.edu> for InterNetNews.
 .PP
-$Id: fastrm.1,v 1.5 2002/12/03 05:31:10 vinocur Exp $
+$Id: fastrm.1 7429 2005-12-11 20:42:43Z eagle $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIexpirerm\fR\|(8)
diff -ruNp inn-2.4.2/doc/man/filechan.8 inn-2.4.3/doc/man/filechan.8
--- inn-2.4.2/doc/man/filechan.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/filechan.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.7 $
+.\" $Revision: 5909 $
 .TH FILECHAN 8
 .SH NAME
 filechan \- file-writing backend for InterNetNews
@@ -141,7 +141,7 @@ Written by Robert Elz <kre@munnari.oz.au
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: filechan.8,v 1.7 2002/12/03 05:17:13 vinocur Exp $
+.R$ $Id: filechan.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 buffchan(8),
 inn.conf(5),
diff -ruNp inn-2.4.2/doc/man/getlist.1 inn-2.4.3/doc/man/getlist.1
--- inn-2.4.2/doc/man/getlist.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/getlist.1	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.8 $
+.\" $Revision: 5909 $
 .TH GETLIST 1
 .SH NAME
 getlist \- get a list from an NNTP server
diff -ruNp inn-2.4.2/doc/man/grephistory.1 inn-2.4.3/doc/man/grephistory.1
--- inn-2.4.2/doc/man/grephistory.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/grephistory.1	Mon Mar 20 04:14:57 2006
@@ -194,7 +194,7 @@ any other requested information.  This f
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews.  Rewritten in
 \&\s-1POD\s0 by Russ Allbery <rra@stanford.edu>.
 .Sp
-$Id: grephistory.1,v 1.10.2.1 2004/12/19 19:37:45 rra Exp $
+$Id: grephistory.1 7045 2004-12-19 19:37:45Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIhistory\fR\|(5), \fIinn.conf\fR\|(5)
diff -ruNp inn-2.4.2/doc/man/history.5 inn-2.4.3/doc/man/history.5
--- inn-2.4.2/doc/man/history.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/history.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.13 $
+.\" $Revision: 3782 $
 .TH HISTORY 5
 .SH NAME
 history \- record of current and recently expired Usenet articles
@@ -82,7 +82,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: history.5,v 1.13 2000/08/17 13:30:11 kondou Exp $
+.R$ $Id: history.5 3782 2000-08-17 13:30:18Z kondou $
 .SH "SEE ALSO"
 dbz(3),
 expire(8),
diff -ruNp inn-2.4.2/doc/man/ident.8 inn-2.4.3/doc/man/ident.8
--- inn-2.4.2/doc/man/ident.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/ident.8	Mon Mar 20 04:14:57 2006
@@ -186,7 +186,7 @@ network whose machines respond to ident 
 .IX Header "HISTORY"
 This documentation was written by Jeffrey M. Vinocur <jeff@litech.org>.
 .PP
-$Id: ident.8,v 1.1 2002/12/12 23:07:49 vinocur Exp $
+$Id: ident.8 5989 2002-12-12 23:07:49Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fInnrpd\fR\|(8), \fIreaders.conf\fR\|(5)
diff -ruNp inn-2.4.2/doc/man/incoming.conf.5 inn-2.4.3/doc/man/incoming.conf.5
--- inn-2.4.2/doc/man/incoming.conf.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/incoming.conf.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.18.2.1 $
+.\" $Revision: 6992 $
 .TH INCOMING.CONF 5
 .SH NAME
 incoming.conf \- names and addresses that feed us news
@@ -182,7 +182,7 @@ Written by Fabien Tassin <fta@sofaraway.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: incoming.conf.5,v 1.18.2.1 2004/10/01 05:30:17 rra Exp $
+.R$ $Id: incoming.conf.5 6992 2004-10-01 05:30:17Z rra $
 .SH "SEE ALSO"
 inn.conf(5),
 innd(8),
diff -ruNp inn-2.4.2/doc/man/inews.1 inn-2.4.3/doc/man/inews.1
--- inn-2.4.2/doc/man/inews.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/inews.1	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.14
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.14
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,9 +129,8 @@
 .\" ========================================================================
 .\"
 .IX Title "INEWS 1"
-.TH INEWS 1 "2004-12-19" "INN 2.4.2" "InterNetNews Documentation"
-.SH "NEWS"
-.IX Header "NEWS"
+.TH INEWS 1 "2004-12-24" "INN 2.4.2" "InterNetNews Documentation"
+.SH "NAME"
 inews \- Post a Usenet article to the local news server
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
diff -ruNp inn-2.4.2/doc/man/inn.conf.5 inn-2.4.3/doc/man/inn.conf.5
--- inn-2.4.2/doc/man/inn.conf.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/inn.conf.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "INN.CONF 5"
-.TH INN.CONF 5 "2003-09-07" "INN 2.4.1" "InterNetNews Documentation"
+.TH INN.CONF 5 "2005-12-14" "INN 2.4.3" "InterNetNews Documentation"
 .SH "NAME"
 inn.conf \- Configuration data for InterNetNews programs
 .SH "DESCRIPTION"
@@ -308,9 +308,9 @@ check the Lines: header of incoming arti
 .IP "\fImaxartsize\fR" 4
 .IX Item "maxartsize"
 The maximum size of article (headers and body) that will be accepted by
-the server, in bytes.  A value of \f(CW0\fR allows any size of article.  The
-default value is \f(CW1000000\fR (approximately 1 \s-1MB\s0).  See also
-\&\fIlocalmaxartsize\fR.
+the server, in bytes.  A value of \f(CW0\fR allows any size of article, but
+note that \fBinnd\fR will crash if system memory is exceeded.  The default
+value is \f(CW1000000\fR (approximately 1 \s-1MB\s0).  See also \fIlocalmaxartsize\fR.
 .IP "\fImaxconnections\fR" 4
 .IX Item "maxconnections"
 The maximum number of incoming \s-1NNTP\s0 connections \fIinnd\fR\|(8) will accept.  The
@@ -745,9 +745,11 @@ host.
 .IP "\fIlocalmaxartsize\fR" 4
 .IX Item "localmaxartsize"
 The maximum article size (in bytes) for locally posted articles.  Articles
-larger than this will be rejected.  See also \fImaxartsize\fR, which applies
-to all articles including those posted locally.  The default value is
-\&\f(CW1000000\fR (approximately 1 \s-1MB\s0).
+larger than this will be rejected.  A value of \f(CW0\fR allows any size of
+article, but note that \fBnnrpd\fR and \fBinnd\fR will crash if system memory is
+exceeded.  See also \fImaxartsize\fR, which applies to all articles including
+those posted locally.  The default value is \f(CW1000000\fR (approximately 1
+\&\s-1MB\s0).
 .IP "\fImoderatormailer\fR" 4
 .IX Item "moderatormailer"
 The address to which to send submissions for moderated groups.  It is only
@@ -764,11 +766,11 @@ with an error.
 .IX Item "nnrpdauthsender"
 Whether to generate a Sender: header based on reader authentication.  If
 this parameter is set, a Sender: header will be added to local posts
-containing the identity assigned by \fIreaders.conf\fR.; if the assigned
-identity does not include an \f(CW\*(C`@\*(C'\fR, the reader's hostname is used.  If
-this parameter is set but no identity can be assigned, the Sender:
-header will be removed from all posts even if the poster includes one.
-This is a boolean value and the default is false.
+containing the identity assigned by \fIreaders.conf\fR.  If the assigned
+identity does not include an \f(CW\*(C`@\*(C'\fR, the reader's hostname is used.  If this
+parameter is set but no identity is be assigned, the Sender: header will
+be removed from all posts even if the poster includes one.  This is a
+boolean value and the default is false.
 .IP "\fInnrpdposthost\fR" 4
 .IX Item "nnrpdposthost"
 If set, \fInnrpd\fR\|(8) and \fIrnews\fR\|(1) will pass all locally posted articles to the
@@ -979,9 +981,11 @@ report is written to \fIpathhttp\fR/inn_
 .IP "\fItimer\fR" 4
 .IX Item "timer"
 How frequently (in seconds) \fIinnd\fR\|(8) should report performance timings to
-syslog.  If this is set to \f(CW0\fR or \f(CW\*(C`false\*(C'\fR, performance timing is
-disabled.  Enabling this is highly recommended, and \fIinnreport\fR\|(8) can
-produce a nice summary of the timings.  The default value is \f(CW0\fR.
+syslog.  If this is set to \f(CW0\fR, performance timing is disabled.  Enabling
+this is highly recommended, and \fIinnreport\fR\|(8) can produce a nice summary of
+the timings.  If set to \f(CW0\fR, performance timings in \fInnrpd\fR\|(8) are also
+disabled, although nnrpd always reports statistics on exit and therefore
+any non-zero value is equivalent for it.  The default value is \f(CW0\fR.
 .Sh "System Tuning"
 .IX Subsection "System Tuning"
 The following parameters can be modified to tune the low-level operation
@@ -1175,7 +1179,7 @@ Here is a very minimalist example that o
 required.
 .PP
 .Vb 5
-\&    mta:                /usr/lib/sendmail -oi -oem %s
+\&    mta:                /usr/lib/sendmail \-oi \-oem %s
 \&    ovmethod:           tradindexed
 \&    pathhost:           news.example.com
 \&    pathnews:           /usr/local/news
@@ -1190,7 +1194,7 @@ values for reference.
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews and since
 modified, updated, and reorganized by innumerable other people.
 .PP
-$Id: inn.conf.5,v 1.119.2.2 2003/09/08 04:36:29 rra Exp $
+$Id: inn.conf.5 7471 2005-12-15 04:53:16Z eagle $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIinews\fR\|(1), \fIinnd\fR\|(8), \fIinnwatch\fR\|(8), \fInnrpd\fR\|(8), \fIrnews\fR\|(1).
diff -ruNp inn-2.4.2/doc/man/inncheck.8 inn-2.4.3/doc/man/inncheck.8
--- inn-2.4.2/doc/man/inncheck.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/inncheck.8	Mon Mar 20 04:14:57 2006
@@ -162,7 +162,7 @@ Rich Salz <rsalz@uunet.uu.net>
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: inncheck.8,v 1.6 2002/12/03 05:17:14 vinocur Exp $
+.R$ $Id: inncheck.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 active(5),
 expire.ctl(5),
diff -ruNp inn-2.4.2/doc/man/innconfval.1 inn-2.4.3/doc/man/innconfval.1
--- inn-2.4.2/doc/man/innconfval.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/innconfval.1	Mon Mar 20 04:14:57 2006
@@ -192,7 +192,7 @@ Print \s-1INN\s0's version.  This is equ
 .IX Header "HISTORY"
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews.
 .PP
-$Id: innconfval.1,v 1.8 2002/12/08 19:51:49 rra Exp $
+$Id: innconfval.1 5962 2002-12-08 19:52:13Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIinn.conf\fR\|(5)
diff -ruNp inn-2.4.2/doc/man/innd.8 inn-2.4.3/doc/man/innd.8
--- inn-2.4.2/doc/man/innd.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/innd.8	Mon Mar 20 04:14:57 2006
@@ -569,7 +569,7 @@ disables source routing.
 .IX Header "HISTORY"
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews.
 .PP
-$Id: innd.8,v 1.37 2003/03/19 00:19:59 vinocur Exp $
+$Id: innd.8 6265 2003-03-19 00:19:59Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIactive\fR\|(5), \fIctlinnd\fR\|(8), \fIdbz\fR\|(3), \fIhistory\fR\|(5), \fIincoming.conf\fR\|(5), \fIinn.conf\fR\|(5),
diff -ruNp inn-2.4.2/doc/man/inndcomm.3 inn-2.4.3/doc/man/inndcomm.3
--- inn-2.4.2/doc/man/inndcomm.3	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/inndcomm.3	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.4 $
+.\" $Revision: 1586 $
 .TH INNDCOMM 3
 .SH NAME
 inndcomm \- INND communication part of InterNetNews library
@@ -135,7 +135,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: inndcomm.3,v 1.4 1998/12/09 15:53:53 kondou Exp $
+.R$ $Id: inndcomm.3 1586 1998-12-09 15:53:55Z kondou $
 .SH "SEE ALSO"
 ctlinnd(8),
 innd(8),
diff -ruNp inn-2.4.2/doc/man/inndstart.8 inn-2.4.3/doc/man/inndstart.8
--- inn-2.4.2/doc/man/inndstart.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/inndstart.8	Mon Mar 20 04:14:57 2006
@@ -388,7 +388,7 @@ The binary that is executed as \fBinnd\f
 .IX Header "HISTORY"
 Written by Russ Allbery <rra@stanford.edu> for InterNetNews.
 .PP
-$Id: inndstart.8,v 1.6 2002/12/03 05:31:10 vinocur Exp $
+$Id: inndstart.8 5912 2002-12-03 05:31:11Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIinn.conf\fR\|(5), \fIinnd\fR\|(8)
diff -ruNp inn-2.4.2/doc/man/innfeed.1 inn-2.4.3/doc/man/innfeed.1
--- inn-2.4.2/doc/man/innfeed.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/innfeed.1	Mon Mar 20 04:14:57 2006
@@ -4,7 +4,7 @@
 .\" Start Date:   Sat, 20 Jan 1996 15:50:56 +1100
 .\" Project:      INN -- innfeed
 .\" File:         innfeed.1
-.\" RCSId:        $Id: innfeed.1,v 1.9 2002/12/03 05:17:14 vinocur Exp $
+.\" RCSId:        $Id: innfeed.1 7381 2005-07-04 21:15:31Z eagle $
 .\" Description:  Man page for innfeed(1)
 .\"
 .TH INNFEED 1
@@ -111,6 +111,11 @@ issuing a QUIT command. This means innfe
 depending on how slow your peers are. It never (well, almost never) just
 drops the connection.
 .PP
+The recommended way to restart innfeed when run in channel mode is
+therefore to tell innd to close the pipe and spawn a new innfeed process.
+This can be done with ``ctlinnd flush <feed>'' where <feed> is the name of
+the innfeed channel feed in ``\fInewsfeeds\fP''.
+.PP
 Funnel-file mode is used when a filename is given as an argument
 or the ``input-file'' keyword is given in the config file.
 In funnel file mode it reads the specified file for the same formatted
@@ -167,11 +172,12 @@ opportunity and will start reading from 
 file and put it in a place where innfeed will find it. You should never
 alter the .input or .output files of a running innfeed.
 .PP
-The format of these last three files is:
+The format of these last three files is one of the following:
 .PP
 .RS
 .nf
 /path/to/article <message-id>
+@token@ <message-id>
 .fi
 .RE
 .PP
@@ -500,6 +506,6 @@ Written by James Brister <brister@vix.co
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: innfeed.1,v 1.9 2002/12/03 05:17:14 vinocur Exp $
+.R$ $Id: innfeed.1 7381 2005-07-04 21:15:31Z eagle $
 .SH SEE ALSO
 .IR innfeed.conf(5)
diff -ruNp inn-2.4.2/doc/man/innfeed.conf.5 inn-2.4.3/doc/man/innfeed.conf.5
--- inn-2.4.2/doc/man/innfeed.conf.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/innfeed.conf.5	Mon Mar 20 04:14:57 2006
@@ -4,7 +4,7 @@
 .\" Start Date:   Sun, 21 Jan 1996 00:47:37 +1100
 .\" Project:      INN -- innfeed
 .\" File:         innfeed.conf.5
-.\" RCSId:        $Id: innfeed.conf.5,v 1.16 2003/01/13 04:57:35 rra Exp $
+.\" RCSId:        $Id: innfeed.conf.5 7379 2005-07-04 21:07:07Z eagle $
 .\" Description:  Man page for innfeed.conf(5)
 .\" 
 .TH innfeed.conf 5
@@ -574,8 +574,9 @@ data.ramona.vix.com in the example below
 .PP
 If innfeed gets a SIGHUP signal, then it will reread the config file. All
 values at global scope except for ``\fBbacklog-directory\fP'' can be
-changed. Any new peers are added and any missing peers have their
-connections closed.
+changed (although note that ``\fBbindaddress\fP'' and
+``\fBbindaddress6\fP'' changes will only affect new connections). Any new
+peers are added and any missing peers have their connections closed.
 .\"..................................................
 .SH EXAMPLE
 .PP
@@ -708,6 +709,6 @@ Written by James Brister <brister@vix.co
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: innfeed.conf.5,v 1.16 2003/01/13 04:57:35 rra Exp $
+.R$ $Id: innfeed.conf.5 7379 2005-07-04 21:07:07Z eagle $
 .SH SEE ALSO
 innfeed(1), newsfeeds(5)
diff -ruNp inn-2.4.2/doc/man/innreport.8 inn-2.4.3/doc/man/innreport.8
--- inn-2.4.2/doc/man/innreport.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/innreport.8	Mon Mar 20 04:14:57 2006
@@ -27,7 +27,7 @@ Written by Fabien Tassin <fta@sofaraway.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: innreport.8,v 1.2 2001/01/12 16:57:41 kondou Exp $
+.R$ $Id: innreport.8 4320 2001-01-12 16:57:49Z kondou $
 
 .SH "SEE ALSO"
 innd(8),
diff -ruNp inn-2.4.2/doc/man/innstat.8 inn-2.4.3/doc/man/innstat.8
--- inn-2.4.2/doc/man/innstat.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/innstat.8	Mon Mar 20 04:14:57 2006
@@ -15,7 +15,7 @@ Written by Landon Curt Noll <chongo@toad
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: innstat.8,v 1.3 1998/04/09 15:16:08 mibsoft Exp $
+.R$ $Id: innstat.8 584 1998-04-09 15:16:17Z mibsoft $
 .SH "SEE ALSO"
 innd(8),
 news.daily(8),
diff -ruNp inn-2.4.2/doc/man/innupgrade.8 inn-2.4.3/doc/man/innupgrade.8
--- inn-2.4.2/doc/man/innupgrade.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/innupgrade.8	Mon Mar 20 04:14:57 2006
@@ -201,4 +201,4 @@ alternate file.
 .IX Header "HISTORY"
 Written by Russ Allbery <rra@stanford.edu> for InterNetNews.
 .PP
-$Id: innupgrade.8,v 1.2 2002/12/03 05:31:10 vinocur Exp $
+$Id: innupgrade.8 5912 2002-12-03 05:31:11Z vinocur $
diff -ruNp inn-2.4.2/doc/man/innwatch.8 inn-2.4.3/doc/man/innwatch.8
--- inn-2.4.2/doc/man/innwatch.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/innwatch.8	Mon Mar 20 04:14:57 2006
@@ -51,7 +51,7 @@ Christophe Wolfhugel <wolf@pasteur.fr>.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: innwatch.8,v 1.7 2002/12/03 05:17:14 vinocur Exp $
+.R$ $Id: innwatch.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 ctlinnd(8), 
 inn.conf(5),
diff -ruNp inn-2.4.2/doc/man/innwatch.ctl.5 inn-2.4.3/doc/man/innwatch.ctl.5
--- inn-2.4.2/doc/man/innwatch.ctl.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/innwatch.ctl.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.9 $
+.\" $Revision: 5909 $
 .TH INNWATCH.CTL 5
 .SH NAME
 innwatch.ctl \- control Usenet supervision by innwatch
@@ -217,7 +217,7 @@ Written by <kre@munnari.oz.au> for Inter
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: innwatch.ctl.5,v 1.9 2002/12/03 05:17:14 vinocur Exp $
+.R$ $Id: innwatch.ctl.5 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 inn.conf(5),
 innd(8),
diff -ruNp inn-2.4.2/doc/man/innxmit.8 inn-2.4.3/doc/man/innxmit.8
--- inn-2.4.2/doc/man/innxmit.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/innxmit.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.13 $
+.\" $Revision: 5909 $
 .TH INNXMIT 8
 .SH NAME
 innxmit \- send Usenet articles to a remote NNTP server
@@ -182,7 +182,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: innxmit.8,v 1.13 2002/12/03 05:17:14 vinocur Exp $
+.R$ $Id: innxmit.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 ctlinnd(8),
 inn.conf(5),
diff -ruNp inn-2.4.2/doc/man/libauth.3 inn-2.4.3/doc/man/libauth.3
--- inn-2.4.2/doc/man/libauth.3	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/libauth.3	Mon Mar 20 04:14:57 2006
@@ -201,7 +201,7 @@ respectively?
 .IX Header "HISTORY"
 Written by Jeffrey M. Vinocur <jeff@litech.org> for InterNetNews.
 .PP
-$Id: libauth.3,v 1.1 2002/12/12 23:07:49 vinocur Exp $
+$Id: libauth.3 5989 2002-12-12 23:07:49Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fInnrpd\fR\|(8), \fIreaders.conf\fR\|(5), \fIdoc/external\-auth\fR
diff -ruNp inn-2.4.2/doc/man/libinn.3 inn-2.4.3/doc/man/libinn.3
--- inn-2.4.2/doc/man/libinn.3	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/libinn.3	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.15 $
+.\" $Revision: 6124 $
 .TH LIBINN 3
 .SH NAME
 libinn \- InterNetNews library routines
@@ -522,7 +522,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: libinn.3,v 1.15 2003/01/14 06:03:13 rra Exp $
+.R$ $Id: libinn.3 6124 2003-01-14 06:03:29Z rra $
 .SH "SEE ALSO"
 active(5),
 dbz(3z),
diff -ruNp inn-2.4.2/doc/man/libinnhist.3 inn-2.4.3/doc/man/libinnhist.3
--- inn-2.4.2/doc/man/libinnhist.3	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/libinnhist.3	Mon Mar 20 04:14:57 2006
@@ -418,4 +418,4 @@ type \fBtime_t\fR and will not be modifi
 .IX Header "HISTORY"
 Written by Alex Kiernan <alexk@demon.net> for InterNetNews 2.4.0.
 .Sp
-$Id: libinnhist.3,v 1.7 2002/12/03 05:31:10 vinocur Exp $
+$Id: libinnhist.3 5912 2002-12-03 05:31:11Z vinocur $
diff -ruNp inn-2.4.2/doc/man/libstorage.3 inn-2.4.3/doc/man/libstorage.3
--- inn-2.4.2/doc/man/libstorage.3	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/libstorage.3	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.20 $
+.\" $Revision: 6124 $
 .TH LIBSTORAGE 3
 .SH NAME
 libstorage \- InterNetNews Storage API library routines
@@ -398,7 +398,7 @@ Written by Katsuhiro Kondou <kondou@nec.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: libstorage.3,v 1.20 2003/01/14 06:03:13 rra Exp $
+.R$ $Id: libstorage.3 6124 2003-01-14 06:03:29Z rra $
 .SH "SEE ALSO"
 expire(8),
 inn.conf(5),
diff -ruNp inn-2.4.2/doc/man/list.3 inn-2.4.3/doc/man/list.3
--- inn-2.4.2/doc/man/list.3	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/list.3	Mon Mar 20 04:14:57 2006
@@ -208,4 +208,4 @@ to the caller.
 .IX Header "HISTORY"
 Written by Alex Kiernan <alex.kiernan@thus.net> for InterNetNews 2.4.0.
 .PP
-$Id: list.3,v 1.1 2003/01/21 06:25:42 alexk Exp $
+$Id: list.3 6168 2003-01-21 06:27:32Z alexk $
diff -ruNp inn-2.4.2/doc/man/mailpost.8 inn-2.4.3/doc/man/mailpost.8
--- inn-2.4.2/doc/man/mailpost.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/mailpost.8	Mon Mar 20 04:14:57 2006
@@ -205,7 +205,7 @@ having \*(L"X\-\*(R" prepended.
 Written by Paul Vixie long ago and then hacked up by James Brister for \s-1INN\s0 
 integration.
 .PP
-$Id: mailpost.8,v 1.8.2.1 2004/01/25 23:44:19 rra Exp $
+$Id: mailpost.8 6658 2004-01-25 23:44:19Z rra $
 .SH "FILES"
 .IX Header "FILES"
 <pathdb in inn.conf>/mailpost\-msgid.db	database file
diff -ruNp inn-2.4.2/doc/man/makeactive.8 inn-2.4.3/doc/man/makeactive.8
--- inn-2.4.2/doc/man/makeactive.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/makeactive.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.8 $
+.\" $Revision: 5909 $
 .TH MAKEACTIVE 8
 .SH NAME
 makeactive \- tool to recover Usenet active file.
diff -ruNp inn-2.4.2/doc/man/makedbz.8 inn-2.4.3/doc/man/makedbz.8
--- inn-2.4.2/doc/man/makedbz.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/makedbz.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.2 $
+.\" $Revision: 5909 $
 .TH MAKEDBZ 8
 .SH NAME
 makedbz \- rebuild dbz files
@@ -71,7 +71,7 @@ Written by Katsuhiro Kondou <kondou@nec.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: makedbz.8,v 1.2 2002/12/03 05:17:14 vinocur Exp $
+.R$ $Id: makedbz.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 dbz(3),
 history(5),
diff -ruNp inn-2.4.2/doc/man/makehistory.8 inn-2.4.3/doc/man/makehistory.8
--- inn-2.4.2/doc/man/makehistory.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/makehistory.8	Mon Mar 20 04:14:57 2006
@@ -301,7 +301,7 @@ Where temporary files are written unless
 Originally written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews and
 updated by various other people since.
 .PP
-$Id: makehistory.8,v 1.37.2.1 2003/07/12 19:26:57 rra Exp $
+$Id: makehistory.8 6400 2003-07-12 19:26:58Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIdbz\fR\|(3), \fIactive\fR\|(5), \fIhistory\fR\|(5), \fIinn.conf\fR\|(5), \fIctlinnd\fR\|(8), \fIinnd\fR\|(8),
diff -ruNp inn-2.4.2/doc/man/mod-active.8 inn-2.4.3/doc/man/mod-active.8
--- inn-2.4.2/doc/man/mod-active.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/mod-active.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.2 $
+.\" $Revision: 5909 $
 .TH MOD-ACTIVE 8
 .SH NAME
 mod-active \- batch processing of ctlinnd newgroup/rmgroup/changegroup
diff -ruNp inn-2.4.2/doc/man/moderators.5 inn-2.4.3/doc/man/moderators.5
--- inn-2.4.2/doc/man/moderators.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/moderators.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.8 $
+.\" $Revision: 5909 $
 .TH MODERATORS 5
 .SH NAME
 moderators \- submission addresses for moderated newsgroups
@@ -81,6 +81,6 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: moderators.5,v 1.8 2002/12/03 05:17:15 vinocur Exp $
+.R$ $Id: moderators.5 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 inews(1), inn.conf(5), libinn(3), uwildmat(3).
diff -ruNp inn-2.4.2/doc/man/motd.news.5 inn-2.4.3/doc/man/motd.news.5
--- inn-2.4.2/doc/man/motd.news.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/motd.news.5	Mon Mar 20 04:14:57 2006
@@ -148,7 +148,7 @@ the client an empty response.
 .IX Header "HISTORY"
 Rewritten in \s-1POD\s0 by Russ Allbery <rra@stanford.edu> for InterNetNews.
 .PP
-$Id: motd.news.5,v 1.3.8.1 2003/12/27 06:25:05 rra Exp $
+$Id: motd.news.5 6574 2003-12-27 06:25:05Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIinn.conf\fR\|(5)
diff -ruNp inn-2.4.2/doc/man/news.daily.8 inn-2.4.3/doc/man/news.daily.8
--- inn-2.4.2/doc/man/news.daily.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/news.daily.8	Mon Mar 20 04:14:57 2006
@@ -215,7 +215,7 @@ Rich $alz <rsalz@uunet.uu.net>.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: news.daily.8,v 1.15.2.1 2003/07/12 19:15:50 rra Exp $
+.R$ $Id: news.daily.8 6398 2003-07-12 19:15:50Z rra $
 .SH "SEE ALSO"
 active(5),
 ctlinnd(8), 
diff -ruNp inn-2.4.2/doc/man/news2mail.8 inn-2.4.3/doc/man/news2mail.8
--- inn-2.4.2/doc/man/news2mail.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/news2mail.8	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 .\" -*- nroff -*-
-.\" $Revision: 1.3 $
+.\" $Revision: 5909 $
 .TH NEWS2MAIL 8
 .SH NAME
 news2mail \- a channel script to gateway news into email.
@@ -63,7 +63,7 @@ Brister.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: news2mail.8,v 1.3 2002/12/03 05:17:15 vinocur Exp $
+.R$ $Id: news2mail.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 ctlinnd(8),
 inn.conf(5),
diff -ruNp inn-2.4.2/doc/man/newsfeeds.5 inn-2.4.3/doc/man/newsfeeds.5
--- inn-2.4.2/doc/man/newsfeeds.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/newsfeeds.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.13
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "NEWSFEEDS 5"
-.TH NEWSFEEDS 5 "2003-07-05" "INN 2.4.1" "InterNetNews Documentation"
+.TH NEWSFEEDS 5 "2005-02-26" "INN 2.4.3" "InterNetNews Documentation"
 .SH "NAME"
 newsfeeds \- Determine where Usenet articles are sent
 .SH "DESCRIPTION"
@@ -221,7 +221,7 @@ will be matched against every newsgroup 
 newsgroups that match will be added to the subscription list for the site.
 .PP
 Normally, a given article (or information about it) is sent to a site if
-any of the articles to which the article was posted are in that site's
+any of the newsgroups to which the article was posted are in that site's
 subscription list.  If a newsgroup matches a \f(CW\*(C`@\*(C'\fR pattern in \fIpattern\fR,
 then not only is it not added to the subscription list, but any articles
 crossposted to that newsgroup also will not be sent to that site even if
@@ -856,7 +856,7 @@ the standard newsfeeds entries used by m
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews.  Reformatted
 and rewritten in \s-1POD\s0 by Russ Allbery <rra@stanford.edu>.
 .PP
-$Id: newsfeeds.5,v 1.38.2.1 2003/07/12 19:27:33 rra Exp $
+$Id: newsfeeds.5 7134 2005-03-05 21:19:44Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIactive\fR\|(5), \fIbuffchan\fR\|(8), \fIcontrolchan\fR\|(8), \fIctlinnd\fR\|(8), \fIinn.conf\fR\|(5), \fIinnd\fR\|(8),
diff -ruNp inn-2.4.2/doc/man/newslog.5 inn-2.4.3/doc/man/newslog.5
--- inn-2.4.2/doc/man/newslog.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/newslog.5	Mon Mar 20 04:14:57 2006
@@ -215,7 +215,7 @@ Written by Landon Curt Noll <chongo@toad
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: newslog.5,v 1.9.2.1 2003/07/12 19:15:50 rra Exp $
+.R$ $Id: newslog.5 6398 2003-07-12 19:15:50Z rra $
 .SH "SEE ALSO"
 control.ctl(5),
 ctlinnd(8),
diff -ruNp inn-2.4.2/doc/man/nnrpd.8 inn-2.4.3/doc/man/nnrpd.8
--- inn-2.4.2/doc/man/nnrpd.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/nnrpd.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.14
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,12 +129,12 @@
 .\" ========================================================================
 .\"
 .IX Title "NNRPD 8"
-.TH NNRPD 8 "2004-12-19" "INN 2.4.2" "InterNetNews Documentation"
+.TH NNRPD 8 "2005-07-17" "INN 2.4.3" "InterNetNews Documentation"
 .SH "NAME"
 nnrpd \- NNTP server for reader clients
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
-\&\fBnnrpd\fR [\fB\-DfnoRSt\fR] [\fB\-b\fR \fIaddress\fR] [\fB\-c\fR \fIconfigfile\fR]
+\&\fBnnrpd\fR [\fB\-DfnoSt\fR] [\fB\-b\fR \fIaddress\fR] [\fB\-c\fR \fIconfigfile\fR]
 [\fB\-g\fR \fIshadowgroup\fR>] [\fB\-i\fR \fIinitial\fR] [\fB\-I\fR \fIinstance\fR] [\fB\-p\fR \fIport\fR]
 [\fB\-P\fR \fIprefork\fR] [\fB\-r\fR \fIreason\fR] [\fB\-s\fR \fIpadding\fR]
 .SH "DESCRIPTION"
@@ -194,7 +194,7 @@ should therefore be restarted if inn.con
 When started in daemon mode, \fBnnrpd\fR will write its \s-1PID\s0 into a file in
 the \fIpathrun\fR directory.  The file will be named \fInnrpd\-%d.pid\fR, where
 \&\f(CW%d\fR is replaced with the port that \fBnnrpd\fR is configured to listen on
-(119 unless the \fB\-P\fR option is given).
+(119 unless the \fB\-p\fR option is given).
 .IP "\fB\-f\fR" 4
 .IX Item "-f"
 If specified, \fBnnrpd\fR does not detach itself and runs in the
@@ -247,10 +247,6 @@ awaiting connections when started as a s
 If the \fB\-r\fR flag is used, then \fBnnrpd\fR will reject the incoming
 connection giving \fIreason\fR as the text. This flag is used by \fIinnd\fR\|(8)
 when it is paused or throttled.
-.IP "\fB\-R\fR" 4
-.IX Item "-R"
-This option forces \fBnnrpd\fR to be read\-only. The startup banner will
-indicate \*(L"no posting\*(R".
 .IP "\fB\-s\fR \fIpadding\fR" 4
 .IX Item "-s padding"
 As each command is received, \fBnnrpd\fR tries to change its \f(CW\*(C`argv\*(C'\fR
@@ -283,8 +279,8 @@ the default path by running \f(CW\*(C`ma
 installing \s-1INN\s0, or by running the following commands:
 .PP
 .Vb 6
-\&    openssl req -new -x509 -nodes -out /usr/local/news/lib/cert.pem \e
-\&        -days 366 -keyout /usr/local/news/lib/key.pem
+\&    openssl req \-new \-x509 \-nodes \-out /usr/local/news/lib/cert.pem \e
+\&        \-days 366 \-keyout /usr/local/news/lib/key.pem
 \&    chown news:news /usr/local/news/lib/cert.pem
 \&    chmod 640 /usr/local/news/lib/cert.pem
 \&    chown news:news /usr/local/news/lib/key.pem
@@ -307,7 +303,7 @@ done with the \fB\-D\fR flag (and \f(CW\
 to add a line like:
 .PP
 .Vb 1
-\&    nntps stream tcp nowait news /usr/lib/news/bin/nnrpd nnrpd -S
+\&    nntps stream tcp nowait news /usr/lib/news/bin/nnrpd nnrpd \-S
 .Ve
 .PP
 to \fI/etc/inetd.conf\fR or the equivalent on your system and let \fBinetd\fR
@@ -374,7 +370,7 @@ support added by Rob Robertston <rob@vio
 January, 1993.  Exponential backoff (for posting) added by Dave Hayes in
 Febuary 1998.
 .PP
-$Id: nnrpd.8,v 1.30.2.4 2004/12/19 20:52:21 rra Exp $
+$Id: nnrpd.8 7393 2005-07-18 01:50:17Z eagle $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIctlinnd\fR\|(8), \fIinnd\fR\|(8), \fIinn.conf\fR\|(5), \fIsignal\fR\|(2), \fIuwildmat\fR\|(3).
diff -ruNp inn-2.4.2/doc/man/nnrpd.track.5 inn-2.4.3/doc/man/nnrpd.track.5
--- inn-2.4.2/doc/man/nnrpd.track.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/nnrpd.track.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.4 $
+.\" $Revision: 5909 $
 .TH NNRPD.TRACK 5
 .SH NAME
 nnrpd.track \- file to specify hosts to be tracked by nnrpd.
@@ -47,7 +47,7 @@ Written by Steve Carrie <stephenc@uk.uu.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: nnrpd.track.5,v 1.4 2002/12/03 05:17:15 vinocur Exp $
+.R$ $Id: nnrpd.track.5 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 inn.conf(5),
 innd(8),
diff -ruNp inn-2.4.2/doc/man/nntpget.1 inn-2.4.3/doc/man/nntpget.1
--- inn-2.4.2/doc/man/nntpget.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/nntpget.1	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.3 $
+.\" $Revision: 5909 $
 .TH NNTPGET 1
 .SH NAME
 nntpget \- get Usenet articles from a remote NNTP server
@@ -85,6 +85,6 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: nntpget.1,v 1.3 2002/12/03 05:17:15 vinocur Exp $
+.R$ $Id: nntpget.1 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 innd(8).
diff -ruNp inn-2.4.2/doc/man/nntpsend.8 inn-2.4.3/doc/man/nntpsend.8
--- inn-2.4.2/doc/man/nntpsend.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/nntpsend.8	Mon Mar 20 04:14:57 2006
@@ -238,7 +238,7 @@ and Rich $alz <rsalz@uunet.uu.net> for I
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: nntpsend.8,v 1.12 2002/12/03 05:17:15 vinocur Exp $
+.R$ $Id: nntpsend.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 inn.conf(5),
 innxmit(1), 
diff -ruNp inn-2.4.2/doc/man/nntpsend.ctl.5 inn-2.4.3/doc/man/nntpsend.ctl.5
--- inn-2.4.2/doc/man/nntpsend.ctl.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/nntpsend.ctl.5	Mon Mar 20 04:14:57 2006
@@ -41,6 +41,6 @@ Written by Landon Curt Noll <chongo@toad
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: nntpsend.ctl.5,v 1.7 2002/12/03 05:17:15 vinocur Exp $
+.R$ $Id: nntpsend.ctl.5 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 innxmit(8), newsfeeds(5), nntpsend(8), trunc(1).
diff -ruNp inn-2.4.2/doc/man/overchan.8 inn-2.4.3/doc/man/overchan.8
--- inn-2.4.2/doc/man/overchan.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/overchan.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.11 $
+.\" $Revision: 5909 $
 .TH OVERCHAN 8
 .SH NAME
 overchan \- update the news overview database
@@ -52,7 +52,7 @@ and Rich $alz <rsalz@uunet.uu.net> for I
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: overchan.8,v 1.11 2002/12/03 05:17:15 vinocur Exp $
+.R$ $Id: overchan.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 expireover(8),
 inn.conf(5),
diff -ruNp inn-2.4.2/doc/man/overview.fmt.5 inn-2.4.3/doc/man/overview.fmt.5
--- inn-2.4.2/doc/man/overview.fmt.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/overview.fmt.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.10 $
+.\" $Revision: 5909 $
 .TH OVERVIEW.FMT 5
 .SH NAME
 overview.fmt \- format of news overview database
@@ -53,6 +53,6 @@ package written by Geoff Collyer <geoff@
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: overview.fmt.5,v 1.10 2002/12/03 05:17:15 vinocur Exp $
+.R$ $Id: overview.fmt.5 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 inn.conf(5)
diff -ruNp inn-2.4.2/doc/man/parsedate.3 inn-2.4.3/doc/man/parsedate.3
--- inn-2.4.2/doc/man/parsedate.3	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/parsedate.3	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.1.1.1 $
+.\" $Revision: 6312 $
 .TH PARSEDATE 3
 .SH NAME
 parsedate \- convert time and date string to number
@@ -130,7 +130,7 @@ and the name was changed.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: parsedate.3,v 1.1.1.1 1997/08/04 04:03:46 gpalmer Exp $
+.R$ $Id: parsedate.3 6312 2003-05-04 21:40:11Z rra $
 .SH "SEE ALSO"
 date(1),
 ctime(3),
diff -ruNp inn-2.4.2/doc/man/passwd.nntp.5 inn-2.4.3/doc/man/passwd.nntp.5
--- inn-2.4.2/doc/man/passwd.nntp.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/passwd.nntp.5	Mon Mar 20 04:14:57 2006
@@ -173,9 +173,9 @@ This file should not be world\-readable.
 .SH "HISTORY"
 .IX Header "HISTORY"
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews.  This is
-revision \f(CW$Revision: 1.7 $, dated \f(CW$Date: 2002/02/03 19:05:22 $.
+revision \f(CW$Revision: 5091 $, dated \f(CW$Date: 2002-02-03 11:05:22 -0800 (Sun, 03 Feb 2002) $.
 .PP
-$Id: passwd.nntp.5,v 1.7 2002/02/03 19:05:22 vinocur Exp $
+$Id: passwd.nntp.5 5091 2002-02-03 19:05:22Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIinn.conf\fR\|(5), \fIinnd\fR\|(8), \fIlibinn\fR\|(3).
diff -ruNp inn-2.4.2/doc/man/prunehistory.8 inn-2.4.3/doc/man/prunehistory.8
--- inn-2.4.2/doc/man/prunehistory.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/prunehistory.8	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.8 $
+.\" $Revision: 5909 $
 .TH PRUNEHISTORY 8
 .SH NAME
 prunehistory \- remove tokens from Usenet history file
@@ -59,7 +59,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: prunehistory.8,v 1.8 2002/12/03 05:17:15 vinocur Exp $
+.R$ $Id: prunehistory.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 dbz(3),
 history(5),
diff -ruNp inn-2.4.2/doc/man/pullnews.1 inn-2.4.3/doc/man/pullnews.1
--- inn-2.4.2/doc/man/pullnews.1	Thu Jan  1 00:00:00 1970
+++ inn-2.4.3/doc/man/pullnews.1	Mon Mar 20 04:14:57 2006
@@ -0,0 +1,249 @@
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "PULLNEWS 1"
+.TH PULLNEWS 1 "2005-12-11" "INN 2.4.3" "InterNetNews Documentation"
+.SH "NAME"
+pullnews \- Pull news from one news server and feed it to another
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBpullnews\fR [\fB\-hq\fR] [\fB\-c\fR \fIconfig\fR] [\fB\-g\fR \fIgroups\fR] [\fB\-p\fR \fIport\fR]
+[\fB\-r\fR \fIfile\fR] [\fB\-s\fR \fIto-server\fR] [<from\-server> ...]
+.SH "REQUIREMENTS"
+.IX Header "REQUIREMENTS"
+The Net::NNTP module must be installed.  This module is available as part
+of the libnet distribution and comes with recent versions of Perl.  For
+older versions of Perl, you can download it from <http://www.cpan.org/>.
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBpullnews\fR reads a config file in the running user's home directory
+(normally called \fI~/.pullnews\fR) and connects to the upstream servers
+given there as a reader client.  By default, it connects to all servers
+listed in the configuration file, but you can limit \fBpullnews\fR to
+specific servers by listing them on the command line.  For each server it
+connects to, it pulls over articles and feeds them to the destination
+server via the \s-1IHAVE\s0 command.  This means that the system \fBpullnews\fR is
+run on must have feeding access to the destination news server.
+.PP
+\&\fBpullnews\fR is designed for very small sites that don't want to bother
+setting up traditional peering and is not meant for handling large feeds.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-c\fR \fIconfig\fR" 4
+.IX Item "-c config"
+Normally, the config file is stored in \fI~/.pullnews\fR for the user running
+\&\fBpullnews\fR.  If \fB\-c\fR is given, \fIconfig\fR will be used as the config file
+instead.  This is useful if you're running \fBpullnews\fR as a system user on
+an automated basis out of cron rather than as an individual user.
+.IP "\fB\-g\fR \fIgroups\fR" 4
+.IX Item "-g groups"
+Specifies a collection of groups to get.  \fIgroups\fR is a list of
+newsgroups separated by commas (only commas, no spaces).  Each group must
+be defined in the config file, and only the remote hosts that carry those
+groups will be contacted.  Note that this is a simple list of groups, not
+a wildmat expression, and wildcards are not supported.
+.IP "\fB\-h\fR" 4
+.IX Item "-h"
+Print a usage message and exit.
+.IP "\fB\-p\fR \fIport\fR" 4
+.IX Item "-p port"
+Connect to the destination news server on a port other than the default of
+119.  This option does not change the port used to connect to the remote
+news servers.
+.IP "\fB\-q\fR" 4
+.IX Item "-q"
+Print out less status information while running.
+.IP "\fB\-r\fR \fIfile\fR" 4
+.IX Item "-r file"
+Rather than feeding the downloaded articles to a local server, instead
+create a batch file that can later be fed to a server using \fBrnews\fR.  See
+\&\fIrnews\fR\|(1) for more information about the batch file format.
+.IP "\fB\-s\fR \fIto-server\fR" 4
+.IX Item "-s to-server"
+Normally, \fBpullnews\fR will feed the articles it retrieves to the news
+server running on localhost.  To connect to a different host, specify a
+server with the \fB\-s\fR flag.
+.SH "CONFIG FILE"
+.IX Header "CONFIG FILE"
+The config file for \fBpullnews\fR is divided into blocks, one block for each
+remote server to connect to.  A block begins with the host line, which
+must have no leading whitespace and contains just the hostname of the
+remote server.  Following this line should be one or more newsgroup lines
+which start with whitespace followed by the name of a newsgroup to
+retrieve.  Only one newsgroup should be listed on each line.
+.PP
+\&\fBpullnews\fR will update the config file to include the time the group was
+last checked and the highest numbered article successfully retrieved and
+transferred to the destination server.  It uses this data to avoid doing
+duplicate work the next time it runs.
+.PP
+The full syntax is:
+.PP
+.Vb 3
+\&    <host> [<username> <password>]
+\&            <group> [<time> <high>]
+\&            <group> [<time> <high>]
+.Ve
+.PP
+where the <host> line must not have leading whitespace and the <group>
+lines must.  Note that you may optionally specify a username and password
+for basic authentication to the remote server if necessary.
+.PP
+A typical configuration file would be:
+.PP
+.Vb 7
+\&    # Format group date high
+\&    data.pa.vix.com
+\&            rec.bicycles.racing 908086612 783
+\&            rec.humor.funny 908086613 18
+\&            comp.programming.threads
+\&    nnrp.vix.com pull sekret
+\&            comp.std.lisp
+.Ve
+.PP
+Note that an earlier run of \fBpullnews\fR has filled in details about the
+last article downloads from the two rec.* groups.  The two comp.* groups
+were just added by the user and have not yet been checked.
+.PP
+The nnrp.vix.com server requires authentication, and \fBpullnews\fR will use
+the username \f(CW\*(C`pull\*(C'\fR and the password \f(CW\*(C`sekret\*(C'\fR.
+.SH "BUGS"
+.IX Header "BUGS"
+\&\fBpullnews\fR is very simple and is lacking in more sophisticated features
+(like killing articles based on user-defined conditions) that better pull
+feeders most certainly have. It also doesn't keep or log much detail on
+articles transferred.
+.SH "HISTORY"
+.IX Header "HISTORY"
+pullnews was written by James Brister for \s-1INN\s0.  The documentation was
+rewritten in \s-1POD\s0 by Russ Allbery <rra@stanford.edu>.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIincoming.conf\fR\|(5)
diff -ruNp inn-2.4.2/doc/man/pullnews.8 inn-2.4.3/doc/man/pullnews.8
--- inn-2.4.2/doc/man/pullnews.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/pullnews.8	Thu Jan  1 00:00:00 1970
@@ -1,146 +0,0 @@
-.\" -*- nroff -*-
-.\" $Revision: 1.4 $
-.TH PULLNEWS 8
-.SH NAME
-pullnews \- a perl script for pulling news from one news machine and feeding it 
-to another.
-.SH SYNOPSIS
-.I pullnews
-[
-.BI \-c " config"
-]
-[
-.BI \-g " groups"
-]
-[
-.B \-h
-]
-[
-.BI \-p " port"
-]
-[
-.B \-q
-]
-[
-.BI \-r " file"
-]
-[
-.BI \-s " downstream-server"
-]
-[ remote-server ... ]
-.SH DESCRIPTION
-.PP
-.I pullnews 
-is run as a regular user process. It reads a config file in the users
-home directory (normally called 
-.IR .pullnews )
-and connects to the upstream servers
-defined in there as a reader client. You may specifiy hostnames on the command
-line to limit the set of remote hosts it connects to, but each host must be
-listed in the 
-.I .pullnews
-file.
-.PP
-For each server it connects to it pulls
-over articles and feeds them to the downstream (local) server via the IHAVE
-(feeder) NNTP command. This means the computer
-.I pullnews
-is run on must have
-feeding access to the downstream news host.
-.PP
-.I pullnews
-is designed for very small sites and is not meant for reverse-feeding large
-feeds.
-.PP
-You must have Graham Barr's Net::NNTP perl module installed on your
-system. This is part of the libnet bundle and can be found on CPAN or from
-Graham's site http://www.connect.net/gbarr/
-.SH OPTIONS
-.TP
-.BI \-c " config"
-Normally the config file is stored in $HOME/.pullnews for the user running the 
-.I pullnews
-program. The ``\fB\-c\fP'' flag lets you change that.
-.TP
-.BI \-g " groups"
-The ``\fB\-g\fP'' flag specifies a collection of groups to get.
-The value must be a single argument with commas between group names.
-Each group must be defined in the config file.
-Only the remote hosts that carry those groups will be contacted.
-.TP
-.B \-h
-The ``\fB\-h\fP'' flag just prints usage.
-.TP
-.BI \-p " port"
-The ``\fB\-p\fP'' flag can be used to change connecting port to
-something other than 119.
-.TP
-.B \-q
-The ``\fB\-q\fP'' flag can be used to make things run more quietly.
-.TP
-.BI \-r " file"
-The ``\fB\-r\fP'' flag tells
-.I pullnews
-to create an rnews-compatible file, instead of feeding articles.
-.TP
-.BI \-s " downstream-server"
-Normally 
-.I pullnews
-will feed the articles it retrieves to the news server running on
-``\fBlocalhost\fP''. The ``\fB\-s\fP'' flag lets you change that. 
-.SH "CONFIG FILE"
-.PP
-The config file for
-.I pullnews
-is a series of sets of lines describing the upstream hosts to connect to and
-the newsgroups to get articles from. A host line has no leading white space and 
-just has the name of the host to connect to. Group lines come after a host line
-and have leading white space followed by the group name.
-.PP
-.I pullnews
-will update the config file to include the time the group was last checked and
-the highest numbered article successfully retrieved and transfered to the
-downstream server.
-.PP
-A sample configuration file might look like:
-.PP
-.RS
-.nf
-# Format group date high
-data.pa.vix.com
-        rec.bicycles.racing 908086612 783
-        rec.humor.funny 908086613 18
-        comp.programming.threads
-nnrp.vix.com
-        comp.std.lisp
-.fi
-.RE
-.PP
-The group entries for the two rec.* groups have been updated by an earlier run
-by
-.IR pullnews ,
-whereas the two comp.* groups were just inserted by the user and have
-not yet been checked.
-.SH HISTORY
-pullnews was written by James Brister for INN.
-.de R$
-This is revision \\$3, dated \\$4.
-..
-.R$ $Id: pullnews.8,v 1.4 2002/12/03 05:17:15 vinocur Exp $
-.SH BUGS
-.I pullnews
-is very simple and is lacking in more sophisticated features (like killing
-articles based on user-defined conditions) that better pull feeders most
-certainly have. It also doesn't keep or log much detail on articles transferred.
-.PP
-Due to a limitation in the Net::NNTP perl module, one of the functions in there 
-is redefined inside the 
-.I pullnews
-source. A future release of the libnet packages will fix that.
-.SH "SEE ALSO"
-ctlinnd(8),
-inn.conf(5),
-innd(8),
-newsfeeds(5),
-shlock(1).
-
diff -ruNp inn-2.4.2/doc/man/putman.sh inn-2.4.3/doc/man/putman.sh
--- inn-2.4.2/doc/man/putman.sh	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/putman.sh	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-##  $Revision: 1.2 $
+##  $Revision: 2790 $
 ##
 ##  Prepare a manpage for installation, and install it.  Usage:
 ##	putman <style> "<installitflags>" <source> <dest-dir>
diff -ruNp inn-2.4.2/doc/man/qio.3 inn-2.4.3/doc/man/qio.3
--- inn-2.4.2/doc/man/qio.3	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/qio.3	Mon Mar 20 04:14:57 2006
@@ -239,4 +239,4 @@ printing out each line preceeded by its 
 Written by Rich \f(CW$alz\fR <rsalz@uunet.uu.net> for InterNetNews.  Updated by
 Russ Allbery <rra@stanford.edu>.
 .PP
-$Id: qio.3,v 1.10 2002/12/03 05:31:11 vinocur Exp $
+$Id: qio.3 5912 2002-12-03 05:31:11Z vinocur $
diff -ruNp inn-2.4.2/doc/man/radius.8 inn-2.4.3/doc/man/radius.8
--- inn-2.4.2/doc/man/radius.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/radius.8	Mon Mar 20 04:14:57 2006
@@ -189,7 +189,7 @@ implement it correctly.
 The \s-1RADIUS\s0 authenticator was originally written by Aidan Cully.  This
 documentation was written by Russ Allbery <rra@stanford.edu>.
 .PP
-$Id: radius.8,v 1.1 2002/12/03 03:29:19 rra Exp $
+$Id: radius.8 5896 2002-12-03 03:29:19Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fInnrpd\fR\|(8), \fIradius.conf\fR\|(5), \fIreaders.conf\fR\|(5)
diff -ruNp inn-2.4.2/doc/man/radius.conf.5 inn-2.4.3/doc/man/radius.conf.5
--- inn-2.4.2/doc/man/radius.conf.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/radius.conf.5	Mon Mar 20 04:14:57 2006
@@ -220,7 +220,7 @@ The shared secret with the \s-1RADIUS\s0
 This documentation was written by Russ Allbery <rra@stanford.edu> based on
 the comments in the sample radius.conf file by Yury B. Razbegin.
 .PP
-$Id: radius.conf.5,v 1.2.2.2 2004/05/16 23:06:08 rra Exp $
+$Id: radius.conf.5 6736 2004-05-16 23:06:08Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIradius\fR\|(1)
diff -ruNp inn-2.4.2/doc/man/rc.news.8 inn-2.4.3/doc/man/rc.news.8
--- inn-2.4.2/doc/man/rc.news.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/rc.news.8	Mon Mar 20 04:14:57 2006
@@ -205,7 +205,7 @@ user \s-1ID\s0.
 This manual page written by Jeffrey M. Vinocur <jeff@litech.org> for
 InterNetNews.
 .PP
-$Id: rc.news.8,v 1.1 2002/12/03 05:31:11 vinocur Exp $
+$Id: rc.news.8 5912 2002-12-03 05:31:11Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIctlinnd\fR\|(8),
diff -ruNp inn-2.4.2/doc/man/readers.conf.5 inn-2.4.3/doc/man/readers.conf.5
--- inn-2.4.2/doc/man/readers.conf.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/readers.conf.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13
+.\" Automatically generated by Pod::Man v1.37, Pod::Parser v1.3
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "READERS.CONF 5"
-.TH READERS.CONF 5 "2003-09-07" "INN 2.4.1" "InterNetNews Documentation"
+.TH READERS.CONF 5 "2005-07-04" "INN 2.4.3" "InterNetNews Documentation"
 .SH "NAME"
 readers.conf \- Access control and configuration for nnrpd
 .SH "DESCRIPTION"
@@ -184,27 +184,31 @@ not significant.
 There are two basic types of configuration groups, auth and access.  The
 auth group provides mechanisms to establish the identity of the user, who
 they are.  The access group determines, given the user's identity, what
-that user ispermitted to do.  Writing a \fIreaders.conf\fR file for your
-setup is a two-step process:  first assigning an identity to each
-incoming connection using auth groups, and then giving each identity
-appropriate privileges with access group.  We recommend \fInot\fR
-intermingling auth groups and access groups in the config file; it is
-often more sensible (in the absence of the \fIkey\fR parameter) to put all
-of the auth groups first, and all of the access groups below.
+that user is permitted to do.  Writing a \fIreaders.conf\fR file for your
+setup is a two-step process: first assigning an identity to each incoming
+connection using auth groups, and then giving each identity appropriate
+privileges with access group.  We recommend \fInot\fR intermingling auth
+groups and access groups in the config file; it is often more sensible (in
+the absence of the \fIkey\fR parameter) to put all of the auth groups first,
+and all of the access groups below.
 .PP
 A user identity, as established by an auth group, looks like an e\-mail
 address; in other words, it's in the form \*(L"<username>@<domain>\*(R" (or
 sometimes just \*(L"<username>\*(R" if no domain is specified.
 .PP
+If \fInnrpdauthsender\fR is set in \fIinn.conf\fR, the user identity is also put
+into the Sender: header of posts made by that user.  See the documentation
+of that option in \fIinn.conf\fR\|(5) for more details.
+.PP
 An auth group definition looks like:
 .PP
 .Vb 8
 \&    auth <name> {
-\&        hosts: <host-wildmat>
-\&        auth: <auth-program>
-\&        res: <res-program>
+\&        hosts: <host\-wildmat>
+\&        auth: <auth\-program>
+\&        res: <res\-program>
 \&        default: <defuser>
-\&        default-domain: <defdomain>
+\&        default\-domain: <defdomain>
 \&        # ...possibly other settings
 \&    }
 .Ve
@@ -222,9 +226,9 @@ wildmat expressions, you may also use \s
 address in a netblock; for example, \*(L"10.10.10.0/24\*(R" will match any \s-1IP\s0
 address between 10.10.10.0 and 10.10.10.255 inclusive.
 .PP
-If compiled against the \s-1SSL\s0 libraries, an auth group with the
-require_ssl: parameter set to true only applies if the incoming
-connection is using \s-1SSL\s0.
+If compiled against the \s-1SSL\s0 libraries, an auth group with the require_ssl:
+parameter set to true only applies if the incoming connection is using
+\&\s-1SSL\s0.
 .PP
 For any connection from a host that matches that wildmat expression or
 netblock, each <res\-program> (multiple res: lines may be present in a
@@ -236,13 +240,15 @@ the values of the default: and default\-
 <res\-program> only returns a username, <defdomain> is used as the
 domain.
 .PP
-If the user later authenticates via the \s-1AUTHINFO\s0 \s-1USER/PASS\s0 commands,
-the provided username and password are passed to each <auth\-program>
-(multiple auth, perl_auth, or python_auth lines may be present in a
-block; they are run in sequence until one succeeds), if any.  If one
-succeeds and returns a different identity than the one assigned at the
-time of the connection, it is matched against the available access
-groups again and the actions the user is authorized to do may change.
+If the user later authenticates via the \s-1AUTHINFO\s0 \s-1USER/PASS\s0 commands, the
+provided username and password are passed to each <auth\-program> (multiple
+auth, perl_auth, or python_auth lines may be present in a block; they are
+run in sequence until one succeeds), if any.  If one succeeds and returns
+a different identity than the one assigned at the time of the connection,
+it is matched against the available access groups again and the actions
+the user is authorized to do may change.  The most common <auth\-program>
+to use is \fBckpasswd\fR, which supports several ways of checking passwords
+including using \s-1PAM\s0.  See the \fIckpasswd\fR\|(8) man page for more details.
 .PP
 When matching auth groups, the last auth group in the file that matches a
 given connection and username/password combination is used.
@@ -251,8 +257,8 @@ An access group definition usually looks
 .PP
 .Vb 5
 \&    access <name> {
-\&        users: <identity-wildmat>
-\&        newsgroups: <group-wildmat>
+\&        users: <identity\-wildmat>
+\&        newsgroups: <group\-wildmat>
 \&        # ...possibly other settings
 \&    }
 .Ve
@@ -265,9 +271,9 @@ use the form:
 .PP
 .Vb 5
 \&    access <name> {
-\&        users: <identity-wildmat>
-\&        read: <read-wildmat>
-\&        post: <post-wildmat>
+\&        users: <identity\-wildmat>
+\&        read: <read\-wildmat>
+\&        post: <post\-wildmat>
 \&    }
 .Ve
 .PP
@@ -329,6 +335,9 @@ groups, and after that are some examples
 clearer.
 .SH "AUTH GROUP PARAMETERS"
 .IX Header "AUTH GROUP PARAMETERS"
+An access group without at least one of the res:, auth:, perl_auth:,
+python_auth:, or default: parameters makes no sense (and in practice will
+just be ignored).
 .IP "\fBhosts:\fR" 4
 .IX Item "hosts:"
 A comma-separated list of remote hosts, wildmat patterns matching either
@@ -374,10 +383,13 @@ A simple command line for a user authent
 not supported).  If a full path is not given, the program executed must be
 located in the \fIpathbin\fR/auth/passwd directory.  An authenticator is a
 program used to handle a user-supplied username and password, via a
-mechanism such as \s-1AUTHINFO\s0 \s-1USER/PASS\s0.  Like with res:, one auth group
-can have multiple auth: parameters; they will be tried in order and the
+mechanism such as \s-1AUTHINFO\s0 \s-1USER/PASS\s0.  Like with res:, one auth group can
+have multiple auth: parameters; they will be tried in order and the
 results of the first successful one will be used.  See also perl_auth:
 below.
+.Sp
+The most common authenticator to use is \fIckpasswd\fR\|(8); see its man page for
+more information.
 .IP "\fBperl_auth:\fR" 4
 .IX Item "perl_auth:"
 A path to a perl script for authentication.  The perl_auth: parameter
@@ -698,8 +710,8 @@ usernames and passwords, and then agains
 .PP
 .Vb 4
 \&    auth all {
-\&        auth: "ckpasswd -d /usr/local/news/db/newsusers"
-\&        auth: "ckpasswd -s"
+\&        auth: "ckpasswd \-d /usr/local/news/db/newsusers"
+\&        auth: "ckpasswd \-s"
 \&    }
 .Ve
 .PP
@@ -752,9 +764,9 @@ cannot.
 .PP
 .Vb 5
 \&    auth default {
-\&        auth: "ckpasswd -f /usr/local/news/db/newsusers"
+\&        auth: "ckpasswd \-f /usr/local/news/db/newsusers"
 \&        default: <FAIL>
-\&        default-domain: example.com
+\&        default\-domain: example.com
 \&    }
 .Ve
 .PP
@@ -762,9 +774,9 @@ cannot.
 \&    auth shell {
 \&        hosts: *.shell.example.com
 \&        res: ident
-\&        auth: "ckpasswd -s"
+\&        auth: "ckpasswd \-s"
 \&        default: <FAIL>
-\&        default-domain: shell.example.com
+\&        default\-domain: shell.example.com
 \&    }
 .Ve
 .PP
@@ -773,7 +785,7 @@ cannot.
 \&        hosts: *.dialup.example.com
 \&        auth: radius
 \&        default: <FAIL>
-\&        default-domain: dialup.example.com
+\&        default\-domain: dialup.example.com
 \&    }
 .Ve
 .PP
@@ -905,7 +917,7 @@ tunnel), use the localaddress: parameter
 Written by Aidan Cully <aidan@panix.com> for InterNetNews.  Substantially
 expanded by Russ Allbery <rra@stanford.edu>.
 .PP
-$Id: readers.conf.5,v 1.32.2.2 2003/09/08 04:31:57 rra Exp $
+$Id: readers.conf.5 7384 2005-07-05 01:28:43Z eagle $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
-\&\fIinn.conf\fR\|(5), \fIinnd\fR\|(8), \fInewsfeeds\fR\|(5), \fInnrpd\fR\|(8), \fIuwildmat\fR\|(3).
+\&\fIckpasswd\fR\|(8), \fIinn.conf\fR\|(5), \fIinnd\fR\|(8), \fInewsfeeds\fR\|(5), \fInnrpd\fR\|(8), \fIuwildmat\fR\|(3)
diff -ruNp inn-2.4.2/doc/man/rnews.1 inn-2.4.3/doc/man/rnews.1
--- inn-2.4.2/doc/man/rnews.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/rnews.1	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.12 $
+.\" $Revision: 5909 $
 .TH RNEWS 1
 .SH NAME
 rnews \- receive news from a UUCP connection
@@ -138,7 +138,7 @@ Written by Rich $alz <rsalz@uunet.uu.net
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: rnews.1,v 1.12 2002/12/03 05:17:15 vinocur Exp $
+.R$ $Id: rnews.1 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 inn.conf(5),
 innd(8).
diff -ruNp inn-2.4.2/doc/man/sasl.conf.5 inn-2.4.3/doc/man/sasl.conf.5
--- inn-2.4.2/doc/man/sasl.conf.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/sasl.conf.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.14
+.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -129,7 +129,7 @@
 .\" ========================================================================
 .\"
 .IX Title "SASL.CONF 5"
-.TH SASL.CONF 5 "2004-12-19" "INN 2.4.2" "InterNetNews Documentation"
+.TH SASL.CONF 5 "2002-12-03" "INN 2.4.0" "InterNetNews Documentation"
 .SH "NAME"
 sasl.conf \- SASL Configuration file for nnrpd.
 .SH "DESCRIPTION"
@@ -142,19 +142,17 @@ your server and newsreaders. It requires
 http://www.openssl.org/; it has been tested with versions 0.9.4 and 0.9.5.
 .SH "INSTALLATION"
 .IX Header "INSTALLATION"
-To use \s-1SSL\s0, a certificate and private key are needed that you can create
-using the openssl binary.  Make certain that the certificate is owned by
-your news user, news group, and is mode 0640 or 0660, and that the key is
-owned by your news user, news group, and is mode 600.
-.SH "EXAMPLE"
-.IX Header "EXAMPLE"
-.Vb 6
-\&   openssl req -new -x509 -nodes -out /usr/local/news/lib/cert.pem \e
-\&       -days 366 -keyout /usr/local/news/lib/key.pem
+To use \s-1SSL\s0, a certificate and private key are needed that you can
+create using the openssl binary. 
+Make certain that each keys are owned by your news user, news group,
+and are mode 0640 or 0660.
+.Sh "\s-1EXAMPLE\s0"
+.IX Subsection "EXAMPLE"
+.Vb 4
+\&   openssl req -new -x509 -nodes -out /usr/local/news/lib/cert.pem\e
+\&    -days 366 -keyout /usr/local/news/lib/cert.pem
 \&   chown news:news /usr/local/news/lib/cert.pem
 \&   chmod 640 /usr/local/news/lib/cert.pem
-\&   chown news:news /usr/local/news/lib/key.pem
-\&   chmod 600 /usr/local/news/lib/key.pem
 .Ve
 .PP
 You also can make the keys as the root user with \f(CW\*(C`make cert\*(C'\fR.
diff -ruNp inn-2.4.2/doc/man/scanlogs.8 inn-2.4.3/doc/man/scanlogs.8
--- inn-2.4.2/doc/man/scanlogs.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/scanlogs.8	Mon Mar 20 04:14:57 2006
@@ -33,7 +33,7 @@ Written by Landon Curt Noll <chongo@toad
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: scanlogs.8,v 1.2 1998/01/28 04:07:59 scrappy Exp $
+.R$ $Id: scanlogs.8 309 1998-01-28 04:08:10Z scrappy $
 .SH "SEE ALSO"
 innd(8),
 newslog(5),
diff -ruNp inn-2.4.2/doc/man/shlock.1 inn-2.4.3/doc/man/shlock.1
--- inn-2.4.2/doc/man/shlock.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/shlock.1	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.7 $
+.\" $Revision: 5794 $
 .TH SHLOCK 1
 .SH NAME
 shlock \- create lock files for use in shell scripts
@@ -77,6 +77,6 @@ locking given by Peter Honeyman.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: shlock.1,v 1.7 2002/10/01 23:31:53 vinocur Exp $
+.R$ $Id: shlock.1 5794 2002-10-01 23:31:53Z vinocur $
 .SH "SEE ALSO"
 inn.conf(5)
diff -ruNp inn-2.4.2/doc/man/shrinkfile.1 inn-2.4.3/doc/man/shrinkfile.1
--- inn-2.4.2/doc/man/shrinkfile.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/shrinkfile.1	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.5 $
+.\" $Revision: 5909 $
 .TH SHRINKFILE 1
 .SH NAME
 shrinkfile \- shrink a file on a line boundary
diff -ruNp inn-2.4.2/doc/man/simpleftp.1 inn-2.4.3/doc/man/simpleftp.1
--- inn-2.4.2/doc/man/simpleftp.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/simpleftp.1	Mon Mar 20 04:14:57 2006
@@ -162,7 +162,7 @@ as well as Net::FTP.
 .IX Header "HISTORY"
 Tossed off by David C Lawrence <tale@isc.org> for InterNetNews.
 .PP
-$Id: simpleftp.1,v 1.3 2003/04/03 00:54:02 rra Exp $
+$Id: simpleftp.1 6276 2003-04-03 00:54:02Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIactsync\fR\|(8)
diff -ruNp inn-2.4.2/doc/man/sm.1 inn-2.4.3/doc/man/sm.1
--- inn-2.4.2/doc/man/sm.1	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/sm.1	Mon Mar 20 04:14:57 2006
@@ -205,7 +205,7 @@ succeeded, you should run sm on one toke
 Written by Katsuhiro Kondou <kondou@nec.co.jp> for InterNetNews.
 Rewritten in \s-1POD\s0 by Russ Allbery <rra@stanford.edu>.
 .PP
-$Id: sm.1,v 1.1.2.1 2004/03/06 18:31:58 rra Exp $
+$Id: sm.1 6683 2004-03-06 18:31:58Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIctlinnd\fR\|(8), \fIgrephistory\fR\|(1), \fIhistory\fR\|(5), \fIrnews\fR\|(1), \fIstorage.conf\fR\|(5).
diff -ruNp inn-2.4.2/doc/man/storage.conf.5 inn-2.4.3/doc/man/storage.conf.5
--- inn-2.4.2/doc/man/storage.conf.5	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/storage.conf.5	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-.\" $Revision: 1.13 $
+.\" $Revision: 6124 $
 .TH STORAGE.CONF 5
 .SH NAME
 storage.conf \- configuration file for storage manager
@@ -272,7 +272,7 @@ Written by Katsuhiro Kondou <kondou@nec.
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: storage.conf.5,v 1.13 2003/01/14 06:03:13 rra Exp $
+.R$ $Id: storage.conf.5 6124 2003-01-14 06:03:29Z rra $
 .SH "SEE ALSO"
 cycbuff.conf(5),
 expire.ctl(5),
diff -ruNp inn-2.4.2/doc/man/tally.control.8 inn-2.4.3/doc/man/tally.control.8
--- inn-2.4.2/doc/man/tally.control.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/tally.control.8	Mon Mar 20 04:14:57 2006
@@ -20,7 +20,7 @@ Written by Landon Curt Noll <chongo@toad
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: tally.control.8,v 1.4 2002/12/03 05:17:16 vinocur Exp $
+.R$ $Id: tally.control.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 newslog(5),
 news.daily(8),
diff -ruNp inn-2.4.2/doc/man/tdx-util.8 inn-2.4.3/doc/man/tdx-util.8
--- inn-2.4.2/doc/man/tdx-util.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/tdx-util.8	Mon Mar 20 04:14:57 2006
@@ -298,7 +298,7 @@ using the tradspool article storage meth
 .IX Header "HISTORY"
 Written by Russ Allbery <rra@stanford.edu> for InterNetNews.
 .PP
-$Id: tdx-util.8,v 1.2.2.1 2004/12/19 19:41:49 rra Exp $
+$Id: tdx-util.8 7047 2004-12-19 19:41:49Z rra $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fImakehistory\fR\|(8)
diff -ruNp inn-2.4.2/doc/man/tst.3 inn-2.4.3/doc/man/tst.3
--- inn-2.4.2/doc/man/tst.3	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/tst.3	Mon Mar 20 04:14:57 2006
@@ -201,4 +201,4 @@ Converted to \s-1POD\s0 from Peter A. Fr
 documentation by Alex Kiernan <alex.kiernan@thus.net> for InterNetNews
 2.4.0.
 .PP
-$Id: tst.3,v 1.1 2003/01/02 12:22:14 vinocur Exp $
+$Id: tst.3 6106 2003-01-02 12:22:14Z vinocur $
diff -ruNp inn-2.4.2/doc/man/uwildmat.3 inn-2.4.3/doc/man/uwildmat.3
--- inn-2.4.2/doc/man/uwildmat.3	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/uwildmat.3	Mon Mar 20 04:14:57 2006
@@ -284,7 +284,7 @@ substantial differences, including the e
 characters, and has noticable functionality changes.  Any bugs present in
 it aren't Rich's fault.
 .PP
-$Id: uwildmat.3,v 1.2 2002/08/24 17:25:23 vinocur Exp $
+$Id: uwildmat.3 5652 2002-08-24 17:25:23Z vinocur $
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fIgrep\fR\|(1), \fIfnmatch\fR\|(3), \fIregex\fR\|(3), \fIregexp\fR\|(3).
diff -ruNp inn-2.4.2/doc/man/writelog.8 inn-2.4.3/doc/man/writelog.8
--- inn-2.4.2/doc/man/writelog.8	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/man/writelog.8	Mon Mar 20 04:14:57 2006
@@ -28,7 +28,7 @@ Written by Landon Curt Noll <chongo@toad
 .de R$
 This is revision \\$3, dated \\$4.
 ..
-.R$ $Id: writelog.8,v 1.5 2002/12/03 05:17:16 vinocur Exp $
+.R$ $Id: writelog.8 5909 2002-12-03 05:17:18Z vinocur $
 .SH "SEE ALSO"
 innd(8),
 innstat(8),
diff -ruNp inn-2.4.2/doc/pod/Makefile inn-2.4.3/doc/pod/Makefile
--- inn-2.4.2/doc/pod/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.34.2.4 2004/12/20 03:26:26 rra Exp $
+##  $Id: Makefile 7458 2005-12-12 00:25:05Z eagle $
 ##
 ##  This Makefile contains rules to generate the files derived from POD
 ##  source.  Normal make commands at the top level of the source tree don't
@@ -12,7 +12,7 @@ TEXT	= ../../HACKING ../../INSTALL ../..
 
 MAN1	= ../man/convdate.1 ../man/fastrm.1 ../man/grephistory.1 \
 	../man/inews.1 ../man/innconfval.1 ../man/innmail.1 \
-	../man/simpleftp.1 ../man/sm.1
+	../man/pullnews.1 ../man/simpleftp.1 ../man/sm.1
 
 MAN3	= ../man/libauth.3 ../man/libinnhist.3 ../man/list.3 ../man/qio.3 \
 	../man/tst.3 ../man/uwildmat.3
@@ -53,6 +53,7 @@ clean:
 ../man/inews.1:		inews.pod		; $(POD2MAN) -s 1 $? > $@
 ../man/innconfval.1:	innconfval.pod		; $(POD2MAN) -s 1 $? > $@
 ../man/innmail.1:	innmail.pod		; $(POD2MAN) -s 1 $? > $@
+../man/pullnews.1:	pullnews.pod		; $(POD2MAN) -s 1 $? > $@
 ../man/simpleftp.1:	simpleftp.pod		; $(POD2MAN) -s 1 $? > $@
 ../man/sm.1:		sm.pod			; $(POD2MAN) -s 1 $? > $@
 
diff -ruNp inn-2.4.2/doc/pod/active.pod inn-2.4.3/doc/pod/active.pod
--- inn-2.4.2/doc/pod/active.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/active.pod	Mon Mar 20 04:14:57 2006
@@ -81,7 +81,7 @@ alias.
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews.  Converted to
 POD by Russ Allbery <rra@stanford.edu>.
 
-$Id: active.pod,v 1.1.2.1 2004/05/17 05:48:54 rra Exp $
+$Id: active.pod 6773 2004-05-17 05:48:54Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/active.times.pod inn-2.4.3/doc/pod/active.times.pod
--- inn-2.4.2/doc/pod/active.times.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/active.times.pod	Mon Mar 20 04:14:57 2006
@@ -26,7 +26,7 @@ given to B<ctlinnd>.
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews.  Converted to
 POD by Russ Allbery <rra@stanford.edu>
 
-$Id: active.times.pod,v 1.1 2003/04/06 21:50:07 rra Exp $
+$Id: active.times.pod 6282 2003-04-06 21:50:07Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/auth_krb5.pod inn-2.4.3/doc/pod/auth_krb5.pod
--- inn-2.4.2/doc/pod/auth_krb5.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/auth_krb5.pod	Mon Mar 20 04:14:57 2006
@@ -75,7 +75,7 @@ Originally written by Christopher P. Lin
 written by Russ Allbery <rra@stanford.edu> based on Christopher's original
 README file.
 
-$Id: auth_krb5.pod,v 1.1 2002/12/03 03:41:06 rra Exp $
+$Id: auth_krb5.pod 5897 2002-12-03 03:41:06Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/auth_smb.pod inn-2.4.3/doc/pod/auth_smb.pod
--- inn-2.4.2/doc/pod/auth_smb.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/auth_smb.pod	Mon Mar 20 04:14:57 2006
@@ -46,7 +46,7 @@ Originally written October 2000 by Krisc
 based heavily on pam_smb v1.1.6 by David Airlie <airlied@samba.org>.
 This documentation was written by Jeffrey M. Vinocur <jeff@litech.org>.
 
-$Id: auth_smb.pod,v 1.1 2002/12/12 23:02:14 vinocur Exp $
+$Id: auth_smb.pod 5988 2002-12-12 23:02:14Z vinocur $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/checklist.pod inn-2.4.3/doc/pod/checklist.pod
--- inn-2.4.2/doc/pod/checklist.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/checklist.pod	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 =head1 Introduction
 
-$Id: checklist.pod,v 1.3 2002/12/03 05:17:16 vinocur Exp $
+$Id: checklist.pod 5909 2002-12-03 05:17:18Z vinocur $
 
 This is an installation checklist written by Rebecca Ore, intended to be
 the beginning of a different presentation of the information in INSTALL,
diff -ruNp inn-2.4.2/doc/pod/ckpasswd.pod inn-2.4.3/doc/pod/ckpasswd.pod
--- inn-2.4.2/doc/pod/ckpasswd.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/ckpasswd.pod	Mon Mar 20 04:14:57 2006
@@ -22,10 +22,18 @@ these days most systems no longer make r
 getpwnam(3) (some still do if and only if the program calling getpwnam(3)
 is running as root).
 
-Note that B<ckpasswd> expects all passwords to be stored encrypted by the
-system crypt(3) function and calls crypt(3) on the supplied password
-before comparing it to the expected password (when using any method other
-than PAM).
+When using PAM, B<ckpasswd> identifies itself as C<nnrpd>, not as
+C<ckpasswd>, and the PAM configuration must be set up accordingly.  The
+details of PAM configuration are different on different operating systems
+(and even different Linux distributions); see L<EXAMPLES> below for help
+getting started, and look for a pam(7) or pam.conf(4) manual page on your
+system.
+
+When using any method other than PAM, B<ckpasswd> expects all passwords to
+be stored encrypted by the system crypt(3) function and calls crypt(3) on
+the supplied password before comparing it to the expected password.  IF
+you're using a different password hash scheme (like MD5), you must use
+PAM.
 
 =head1 OPTIONS
 
@@ -130,6 +138,25 @@ also be given.
 See readers.conf(5) for examples of nnrpd(8) authentication configuration
 that uses B<ckpasswd> to check passwords.
 
+An example PAM configuration for F</etc/pam.conf> that tells B<ckpasswd>
+to check usernames and passwords against system accounts is:
+
+    nnrpd auth    required pam_unix.so
+    nnrpd account required pam_unix.so
+
+Your system may want you to instead create a file named F<nnrpd> in
+F</etc/pam.d> with lines like:
+
+    auth    required pam_unix.so
+    account required pam_unix.so
+
+This is only the simplest configuration.  You may be able to include
+common shared files, and you may want to stack other modules, either to
+allow different authentication methods or to apply restrictions like lists
+of users who can't authenticate using B<ckpasswd>.  The best guide is the
+documentation for your system and the other PAM configurations you're
+already using.
+
 To test to make sure that B<ckpasswd> is working correctly, you can run it
 manually and then give it the username (prefixed with C<ClientAuthname:>)
 and password (prefixed with C<ClientPassword:>) on standard input.  For
@@ -147,10 +174,14 @@ it will print some sort of error message
 
 Written by Russ Allbery <rra@stanford.edu> for InterNetNews.
 
-$Id: ckpasswd.pod,v 1.6.2.2 2003/08/08 22:02:42 vinocur Exp $
+$Id: ckpasswd.pod 7215 2005-04-11 20:43:21Z rra $
 
 =head1 SEE ALSO
 
 readers.conf(5), nnrpd(8)
+
+Linux users who want to use PAM should read the Linux-PAM System
+Administrator's Guide at
+L<http://www.kernel.org/pub/linux/libs/pam/Linux-PAM-html/pam.html>.
 
 =cut
diff -ruNp inn-2.4.2/doc/pod/control.ctl.pod inn-2.4.3/doc/pod/control.ctl.pod
--- inn-2.4.2/doc/pod/control.ctl.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/control.ctl.pod	Mon Mar 20 04:14:57 2006
@@ -179,7 +179,7 @@ probably intended to do (yet).
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews.  Rewritten in
 POD by Russ Allbery <rra@stanford.edu>.
 
-$Id: control.ctl.pod,v 1.2 2002/12/03 05:17:16 vinocur Exp $
+$Id: control.ctl.pod 5909 2002-12-03 05:17:18Z vinocur $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/convdate.pod inn-2.4.3/doc/pod/convdate.pod
--- inn-2.4.2/doc/pod/convdate.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/convdate.pod	Mon Mar 20 04:14:57 2006
@@ -99,7 +99,7 @@ determine (or at least override) the loc
 Written by Rich $alz <rsalz@uunet.uu.net>, rewritten and updated by Russ
 Allbery <rra@stanford.edu> for the B<-d> and B<-l> flags.
 
-$Id: convdate.pod,v 1.1 2000/06/13 02:57:50 rra Exp $
+$Id: convdate.pod 3362 2000-06-13 02:57:51Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/cycbuff.conf.pod inn-2.4.3/doc/pod/cycbuff.conf.pod
--- inn-2.4.2/doc/pod/cycbuff.conf.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/cycbuff.conf.pod	Mon Mar 20 04:14:57 2006
@@ -192,7 +192,7 @@ where ONE will be whatever you called yo
 Written by Katsuhiro Kondou <kondou@nec.co.jp> for InterNetNews.
 Rewritten into POD by Russ Allbery <rra@stanford.edu>.
 
-$Id: cycbuff.conf.pod,v 1.2 2003/02/28 00:05:40 kondou Exp $
+$Id: cycbuff.conf.pod 6247 2003-02-28 00:05:40Z kondou $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/distrib.pats.pod inn-2.4.3/doc/pod/distrib.pats.pod
--- inn-2.4.2/doc/pod/distrib.pats.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/distrib.pats.pod	Mon Mar 20 04:14:57 2006
@@ -37,7 +37,7 @@ header will be added.
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews.  Converted to
 POD by Russ Allbery <rra@stanford.edu>.
 
-$Id: distrib.pats.pod,v 1.1 2003/04/06 21:50:07 rra Exp $
+$Id: distrib.pats.pod 6282 2003-04-06 21:50:07Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/domain.pod inn-2.4.3/doc/pod/domain.pod
--- inn-2.4.2/doc/pod/domain.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/domain.pod	Mon Mar 20 04:14:57 2006
@@ -51,7 +51,7 @@ If so, the example above should reflect 
 
 This documentation was written by Jeffrey M. Vinocur <jeff@litech.org>.
 
-$Id: domain.pod,v 1.1 2002/12/12 23:02:14 vinocur Exp $
+$Id: domain.pod 5988 2002-12-12 23:02:14Z vinocur $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/expire.ctl.pod inn-2.4.3/doc/pod/expire.ctl.pod
--- inn-2.4.2/doc/pod/expire.ctl.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/expire.ctl.pod	Mon Mar 20 04:14:57 2006
@@ -44,11 +44,11 @@ by default) to ensure that the server ne
 Most of the lines in this file will be in the second format, which
 consists of either four or five colon-separated fields:
 
-    <pattern>:<flag>:<keep>:<default>:<purge>
+    <pattern>:<flag>:<min>:<default>:<max>
 
 if I<groupbaseexpiry> is true in F<inn.conf> (the default), and otherwise:
 
-    <classnum>:<keep>:<default>:<purge>
+    <classnum>:<min>:<default>:<max>
 
 All lines must be in the correct format given the current setting of
 I<groupbaseexpiry>, and therefore the two formats cannot co-exist in the
@@ -69,10 +69,16 @@ applies, and should be chosen from the f
     A   All groups
     X   Remove the article from all groups it appears in
 
-Normally, articles are not completely deleted until they expire out of
-every group to which they were posted, but if an article is expired
-following a rule where <flag> is X, it is deleted out of all newsgroups to
-which it was posted immediately.
+One of M, U, or A must be specified.  X should be used in combination with
+one of the other letters, not by itself.
+
+An expiration policy is applied to every article in a newsgroup it
+matches.  There is no way to set an expiration policy for articles
+crossposted to groups you don't carry that's different than other articles
+in the same group.  Normally, articles are not completely deleted until
+they expire out of every group to which they were posted, but if an
+article is expired following a rule where <flag> contains X, it is deleted
+out of all newsgroups to which it was posted immediately.
 
 If I<groupbaseexpiry> is instead set to false, there is no <pattern> and
 <flag> field and the above does not apply.  Instead, there is a single
@@ -90,15 +96,15 @@ that articles are only removed when B<ex
 normally once a day by B<news.daily>) or the word C<never>.
 
 The middle field, <default>, will be used as the expiration period for
-most articles.  The other two fields, <keep> and <purge>, only come into
+most articles.  The other two fields, <min> and <max>, only come into
 play if the article requests a particular expiration date with an Expires
 header.  Articles with an Expires header will be expired at the date given
 in that header, subject to the constraints that they will be retained at
-least <keep> days and no longer than <purge> days.
+least <min> days and no longer than <max> days.
 
-If <keep> is set to C<never>, no article matching that line will ever be
+If <min> is set to C<never>, no article matching that line will ever be
 expired.  If <default> is set to C<never>, no article matching that line
-without an explicit Expires header will ever be expired.  If <purge> is
+without an explicit Expires header will ever be expired.  If <max> is
 set to C<never>, Expires headers will be honored no matter how far into
 the future they are.
 
@@ -116,8 +122,8 @@ file (except for C</remember/>) so that 
 override it.
 
 It is often useful to honor the Expires header in articles, especially
-those in moderated groups.  To do this, set <keep> to zero, <default> to
-whatever normal expiration you wish, and <purge> to C<never> or some large
+those in moderated groups.  To do this, set <min> to zero, <default> to
+whatever normal expiration you wish, and <max> to C<never> or some large
 number, like 365 days for a maximum article life of a year.
 
 To ignore any Expires header, set all three fields to the same value.
@@ -156,7 +162,7 @@ When I<groupbaseexpiry> is false, for cl
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews.  Converted to
 POD by Russ Allbery <rra@stanford.edu>.
 
-$Id: expire.ctl.pod,v 1.1 2003/04/06 21:50:07 rra Exp $
+$Id: expire.ctl.pod 7207 2005-04-11 18:18:40Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/expireover.pod inn-2.4.3/doc/pod/expireover.pod
--- inn-2.4.2/doc/pod/expireover.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/expireover.pod	Mon Mar 20 04:14:57 2006
@@ -145,7 +145,7 @@ Written by Rob Robertson <rob@violet.ber
 <rsalz@uunet.uu.net> (with help from Dave Lawrence <tale@uunet.uu.net>)
 for InterNetNews.
 
-$Id: expireover.pod,v 1.2 2002/12/03 05:17:16 vinocur Exp $
+$Id: expireover.pod 5909 2002-12-03 05:17:18Z vinocur $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/external-auth.pod inn-2.4.3/doc/pod/external-auth.pod
--- inn-2.4.2/doc/pod/external-auth.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/external-auth.pod	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 =head1 NNRPD External Authentication Support
 
-This is $Revision: 1.2.2.1 $ dated $Date: 2004/05/17 12:18:18 $.
+This is $Revision: 7141 $ dated $Date: 2005-03-17 03:42:46 -0800 (Thu, 17 Mar 2005) $.
 
 A fundamental part of the readers.conf(5)-based authorization mechanism
 is the interface to external authenticator and resolver programs.  This
@@ -33,8 +33,8 @@ will make these programs substantially e
 
 When nnrpd calls an authenticator, the lines it passes are
 
-    ClientAuthname: user\r
-    ClientPassword: pass\r
+    ClientAuthname: user\r\n
+    ClientPassword: pass\r\n
 
 where I<user> and I<pass> are the username and password provided by the
 client (e.g. using AUTHINFO).  In addition, nnrpd generally also passes
@@ -45,12 +45,12 @@ data may be useful for authenticators.
 
 When nnrpd calls a resolver, the lines it passes are
 
-    ClientHost: hostname\r
-    ClientIP: IP-address\r
-    ClientPort: port\r
-    LocalIP: IP-address\r
-    LocalPort: port\r
-    .\r
+    ClientHost: hostname\r\n
+    ClientIP: IP-address\r\n
+    ClientPort: port\r\n
+    LocalIP: IP-address\r\n
+    LocalPort: port\r\n
+    .\r\n
 
 where I<hostname> indicates a string representing the hostname if
 available, I<IP-address> is a numeric IP address (dotted-quad for IPv4,
@@ -81,7 +81,7 @@ If the program succeeds, it must return 
 with a domain appended) by writing to standard output.  The line it
 should write is exactly:
 
-    user:username\r
+    user:username\r\n
 
 where I<username> is the string that nnrpd should use in matching
 readers.conf access blocks.
diff -ruNp inn-2.4.2/doc/pod/fastrm.pod inn-2.4.3/doc/pod/fastrm.pod
--- inn-2.4.2/doc/pod/fastrm.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/fastrm.pod	Mon Mar 20 04:14:57 2006
@@ -11,7 +11,11 @@ I<base-directory>
 
 B<fastrm> reads a list of either file names or storage API tokens, one per
 line, from its standard input and removes them.  Storage API tokens are
-removed via the SMcancel() interface.
+removed via the SMcancel() interface.  B<fastrm> does not delete files
+safely or with an eye to security, but rather cuts every corner it can to
+delete files as fast as it can.  It should therefore never be run on
+publically writable directories, or in any other environment where a
+hostile party may control the directory structure in which it is working.
 
 If a file name is not an absolute path name, it is considered to be
 relative to I<base-directory> as given on the command line.  The
@@ -156,6 +160,15 @@ calls to unlink(2).
 
 You may want to edit expirerm(8) to change the flags passed to B<fastrm>.
 
+=head1 WARNINGS
+
+B<fastrm> cuts corners and does not worry about security, so it does not
+use chdir(2) safely and could be tricked into removing files other than
+those that were intended if run on a specially constructed file tree or a
+file tree that is being modified while it is running.  It should therefore
+never be used with world-writable directories or any other directory that
+might be controlled or modified by an attacker.
+
 =head1 NOTES
 
 B<fastrm> defers opening the storage subsystem or attempting to parse any
@@ -166,10 +179,9 @@ general fast file removal program.
 =head1 HISTORY
 
 B<fastrm> was originally written by kre@munnari.oz.au.  This manual page
-rewritten in POD by Russ Allbery E<lt>rra@stanford.eduE<gt> for
-InterNetNews.
+rewritten in POD by Russ Allbery <rra@stanford.edu> for InterNetNews.
 
-$Id: fastrm.pod,v 1.2 2002/12/03 05:17:16 vinocur Exp $
+$Id: fastrm.pod 7422 2005-10-09 04:46:53Z eagle $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/grephistory.pod inn-2.4.3/doc/pod/grephistory.pod
--- inn-2.4.2/doc/pod/grephistory.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/grephistory.pod	Mon Mar 20 04:14:57 2006
@@ -76,7 +76,7 @@ any other requested information.  This f
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews.  Rewritten in
 POD by Russ Allbery <rra@stanford.edu>.
 
-$Id: grephistory.pod,v 1.1.2.1 2004/12/19 19:37:45 rra Exp $
+$Id: grephistory.pod 7045 2004-12-19 19:37:45Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/hacking.pod inn-2.4.3/doc/pod/hacking.pod
--- inn-2.4.2/doc/pod/hacking.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/hacking.pod	Mon Mar 20 04:14:57 2006
@@ -5,7 +5,7 @@ Normal users can safely skip reading it.
 guide, resource, and accumulation of tips for maintainers and
 contributors, and secondarily as documentation of some of INN's internals.
 
-This is $Revision: 1.24.2.3 $ dated $Date: 2004/10/01 06:41:17 $.
+This is $Revision: 7486 $ dated $Date: 2005-12-24 15:00:17 -0800 (Sat, 24 Dec 2005) $.
 
 First of all, if you plan on working on INN source, please start from the
 current development tree.  There may be significant changes from the
@@ -661,11 +661,10 @@ there are any other differences, fix the
 
 =item 6.
 
-Run C<make release>.  Note that you need to have a copy of cvs2cl from
-<http://www.red-bean.com/cvs2cl/> to do this.  You will be prompted for
-the release branch tag, the date from which to generate the ChangeLog, and
-the path to cvs2cl.  Start the ChangeLog slightly before the last release
-(we only ship inter-release change logs).
+Run C<make release>.  Note that you need to have a copy of svn2cl from
+<http://ch.tudelft.nl/~arthur/svn2cl/> to do this.  Start the ChangeLog at
+the time of the previous release.  (Eventually, the script will be smart
+enough to do this for you.)
 
 =item 7.
 
@@ -711,13 +710,14 @@ people working on INN:
 
 =over 4
 
-=item <ftp://ftp.academ.com/pub/nntp/ietf/>
+=item <http://www.eyrie.org/~eagle/nntp/>
 
-The archives for the NNTP IETF working group, containing the latest drafts
-of the new NNTP standard and the archived mailing list traffic (which
-contains a lot of interesting discussion of why NNTP is the way it is).
+The home page for the IETF NNTP standardization effort, including links
+to the IETF NNTP working group archives and copies of the latest drafts
+of the new NNTP standard.  The old archived mailing list traffic contains
+a lot of interesting discussion of why NNTP is the way it is.
 
-=item <http://www.landfield.com/usefor/>
+=item <http://www.imc.org/ietf-usefor/>
 
 The archives for the USEFOR IETF working group, the working group for the
 RFC 1036 replacement (the format of Usenet articles).  Also contains a lot
diff -ruNp inn-2.4.2/doc/pod/hook-perl.pod inn-2.4.3/doc/pod/hook-perl.pod
--- inn-2.4.2/doc/pod/hook-perl.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/hook-perl.pod	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 =head1 INN Perl Filtering and Authentication Support
 
-This is $Revision: 1.9 $ dated $Date: 2003/02/10 03:21:26 $.
+This is $Revision: 6221 $ dated $Date: 2003-02-09 19:21:27 -0800 (Sun, 09 Feb 2003) $.
 
 This file documents INN's built-in support for Perl filtering and reader
 authentication.  The code is based very heavily on work by Christophe
diff -ruNp inn-2.4.2/doc/pod/hook-python.pod inn-2.4.3/doc/pod/hook-python.pod
--- inn-2.4.2/doc/pod/hook-python.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/hook-python.pod	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 =head1 INN Python Filtering and Authentication Support
 
-This is $Revision: 1.6 $, dated $Date: 2003/04/04 16:47:22 $.
+This is $Revision: 7134 $, dated $Date: 2005-03-05 13:19:44 -0800 (Sat, 05 Mar 2005) $.
 
 This file documents INN's built-in optional support for Python article
 filtering.  It is patterned after the TCL and Perl hooks previously added
@@ -310,7 +310,7 @@ dynamic generation of an access group of
 a Python script. If a connection matches an auth group which has a
 python_access parameter, all access groups in readers.conf are
 ignored; instead the procedure described below is used to generate an
-access group. This concept is due to Jeffery M. Vinocur.
+access group. This concept is due to Jeffrey M. Vinocur.
 
 In the old implementation, the authorization method allowed for access
 control on a per-group basis. That functionality is preserved in the
diff -ruNp inn-2.4.2/doc/pod/ident.pod inn-2.4.3/doc/pod/ident.pod
--- inn-2.4.2/doc/pod/ident.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/ident.pod	Mon Mar 20 04:14:57 2006
@@ -61,7 +61,7 @@ network whose machines respond to ident 
 
 This documentation was written by Jeffrey M. Vinocur <jeff@litech.org>.
 
-$Id: ident.pod,v 1.1 2002/12/12 23:02:14 vinocur Exp $
+$Id: ident.pod 5988 2002-12-12 23:02:14Z vinocur $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/inews.pod inn-2.4.3/doc/pod/inews.pod
--- inn-2.4.2/doc/pod/inews.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/inews.pod	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-=head1 NEWS
+=head1 NAME
 
 inews - Post a Usenet article to the local news server
 
diff -ruNp inn-2.4.2/doc/pod/inn.conf.pod inn-2.4.3/doc/pod/inn.conf.pod
--- inn-2.4.2/doc/pod/inn.conf.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/inn.conf.pod	Mon Mar 20 04:14:57 2006
@@ -198,9 +198,9 @@ check the Lines: header of incoming arti
 =item I<maxartsize>
 
 The maximum size of article (headers and body) that will be accepted by
-the server, in bytes.  A value of C<0> allows any size of article.  The
-default value is C<1000000> (approximately 1 MB).  See also
-I<localmaxartsize>.
+the server, in bytes.  A value of C<0> allows any size of article, but
+note that B<innd> will crash if system memory is exceeded.  The default
+value is C<1000000> (approximately 1 MB).  See also I<localmaxartsize>.
 
 =item I<maxconnections>
 
@@ -705,9 +705,11 @@ host.
 =item I<localmaxartsize>
 
 The maximum article size (in bytes) for locally posted articles.  Articles
-larger than this will be rejected.  See also I<maxartsize>, which applies
-to all articles including those posted locally.  The default value is
-C<1000000> (approximately 1 MB).
+larger than this will be rejected.  A value of C<0> allows any size of
+article, but note that B<nnrpd> and B<innd> will crash if system memory is
+exceeded.  See also I<maxartsize>, which applies to all articles including
+those posted locally.  The default value is C<1000000> (approximately 1
+MB).
 
 =item I<moderatormailer>
 
@@ -726,11 +728,11 @@ with an error.
 
 Whether to generate a Sender: header based on reader authentication.  If
 this parameter is set, a Sender: header will be added to local posts
-containing the identity assigned by F<readers.conf>.; if the assigned
-identity does not include an C<@>, the reader's hostname is used.  If
-this parameter is set but no identity can be assigned, the Sender:
-header will be removed from all posts even if the poster includes one.
-This is a boolean value and the default is false.
+containing the identity assigned by F<readers.conf>.  If the assigned
+identity does not include an C<@>, the reader's hostname is used.  If this
+parameter is set but no identity is be assigned, the Sender: header will
+be removed from all posts even if the poster includes one.  This is a
+boolean value and the default is false.
 
 =item I<nnrpdposthost>
 
@@ -987,9 +989,11 @@ C<false>, status reporting is disabled. 
 =item I<timer>
 
 How frequently (in seconds) innd(8) should report performance timings to
-syslog.  If this is set to C<0> or C<false>, performance timing is
-disabled.  Enabling this is highly recommended, and innreport(8) can
-produce a nice summary of the timings.  The default value is C<0>.
+syslog.  If this is set to C<0>, performance timing is disabled.  Enabling
+this is highly recommended, and innreport(8) can produce a nice summary of
+the timings.  If set to C<0>, performance timings in nnrpd(8) are also
+disabled, although nnrpd always reports statistics on exit and therefore
+any non-zero value is equivalent for it.  The default value is C<0>.
 
 =back
 
@@ -1240,7 +1244,7 @@ values for reference.
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews and since
 modified, updated, and reorganized by innumerable other people.
 
-$Id: inn.conf.pod,v 1.44.2.2 2003/09/08 04:36:29 rra Exp $
+$Id: inn.conf.pod 7471 2005-12-15 04:53:16Z eagle $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/innconfval.pod inn-2.4.3/doc/pod/innconfval.pod
--- inn-2.4.2/doc/pod/innconfval.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/innconfval.pod	Mon Mar 20 04:14:57 2006
@@ -74,7 +74,7 @@ Print INN's version.  This is equivalent
 
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews.
 
-$Id: innconfval.pod,v 1.3 2002/12/08 19:51:50 rra Exp $
+$Id: innconfval.pod 5962 2002-12-08 19:52:13Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/innd.pod inn-2.4.3/doc/pod/innd.pod
--- inn-2.4.2/doc/pod/innd.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/innd.pod	Mon Mar 20 04:14:57 2006
@@ -483,7 +483,7 @@ disables source routing.
 
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews.
 
-$Id: innd.pod,v 1.7 2003/03/19 00:19:58 vinocur Exp $
+$Id: innd.pod 6265 2003-03-19 00:19:59Z vinocur $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/inndstart.pod inn-2.4.3/doc/pod/inndstart.pod
--- inn-2.4.2/doc/pod/inndstart.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/inndstart.pod	Mon Mar 20 04:14:57 2006
@@ -308,7 +308,7 @@ The binary that is executed as B<innd> a
 
 Written by Russ Allbery E<lt>rra@stanford.eduE<gt> for InterNetNews.
 
-$Id: inndstart.pod,v 1.4 2002/12/03 05:17:17 vinocur Exp $
+$Id: inndstart.pod 5909 2002-12-03 05:17:18Z vinocur $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/innupgrade.pod inn-2.4.3/doc/pod/innupgrade.pod
--- inn-2.4.2/doc/pod/innupgrade.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/innupgrade.pod	Mon Mar 20 04:14:57 2006
@@ -80,6 +80,6 @@ alternate file.
 
 Written by Russ Allbery <rra@stanford.edu> for InterNetNews.
 
-$Id: innupgrade.pod,v 1.2 2002/12/03 05:17:17 vinocur Exp $
+$Id: innupgrade.pod 5909 2002-12-03 05:17:18Z vinocur $
 
 =cut
diff -ruNp inn-2.4.2/doc/pod/install.pod inn-2.4.3/doc/pod/install.pod
--- inn-2.4.2/doc/pod/install.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/install.pod	Mon Mar 20 04:14:57 2006
@@ -52,6 +52,7 @@ INN has been confirmed to work on the fo
     HP-UX 10.20 and up
     Linux 2.x (tested with libc 5.4, glibc 2.0 and up)
     Mac OS X 10.2 and up
+    NetBSD 1.6 and up
     OpenBSD 2.8 and up
     SCO 5.0.4 (tested with gcc 2.8.1, cc)
     Solaris 2.5.x and up
@@ -133,12 +134,41 @@ the news server is not part of the busin
 need to purchase a commercial license for PGP.  For an educational or
 non-profit organization, this shouldn't be a problem.
 
-=back
+=item *
 
-Also, if you want to use the Python embedded hooks, you'll need to have a
-suitable version of Python installed.  See F<doc/hook-python> for more
+If you want to use either the Python embedded hooks, you'll need to have a
+suitable versions of Python installed.  See F<doc/hook-python> for more
 information.
 
+=item *
+
+Many of INN's optional features require other packages (primarily
+libraries) be installed.  If you wish to use any of these optional
+features, you will need to install those packages first.  Here is a table
+of configure options enabling optional features and the software and
+versions you'll need:
+
+    --with-perl         Perl 5.004_03 or higher, 5.6.1+ recommended
+    --with-python       Python 1.5.2 or higher
+    --with-berkeleydb   BerkeleyDB 2.0 or higher, 4.2+ recommended
+    --with-openssl      OpenSSL 0.9.6 or higher
+    --with-sasl         SASL 2.x or higher
+    --with-kerberos     MIT Kerberos v5 1.2.x or higher
+
+If any of these libraries (other than Perl or Python) are built shared and
+installed in locations where your system doesn't search for shared
+libraries by default, you may need to encode the paths to those shared
+libraries in the INN binaries.  For more information on shared library
+paths, see:
+
+    <http://www.eyrie.org/~eagle/notes/rpath.html>
+
+For most systems, setting the environment variable LD_RUN_PATH to a
+colon-separated list of additional directories in which to look for shared
+libraries before building INN will be sufficient.
+
+=back
+
 =head1 Unpacking the Distribution
 
 Released versions of INN are available from ftp.isc.org in F</isc/inn>.
@@ -169,11 +199,17 @@ resides.
 
 Before beginning installation, you should make sure that there is a user
 on your system named C<news>, and that this user's primary group is set to
-a group called C<news>.  The home directory of this user should be set to
-the directory under which you wish to install INN (F</usr/local/news> is
-the default and is a good choice).  INN will install itself as this user
-and 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.
+a group called C<news>.  You can change these with the B<--with-news-user>
+and B<--with-news-group> options to configure (see below).  The home
+directory of this user should be set to the directory under which you wish
+to install INN (F</usr/local/news> is the default and is a good choice).
+INN will install itself as this user and 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.
+
+By default, INN sends reports to the user C<usenet>.  This account isn't
+used for any other purposes.  You can change it with the
+B<--with-news-master> option to configure (see below).
 
 WARNING: By default, INN installs various configuration files as
 group-writeable, and in general INN is not hardened from a security
@@ -350,14 +386,13 @@ fix the links by hand or remove the .OLD
 
 =item B<--enable-uucp-rnews>
 
-If this option is given to configure, rnews will be installed setuid root,
-owned by group uucp, and mode 4550.  This will allow the UUCP subsystem to
-run rnews to process UUCP batches of news articles (rnews changes UID to
-the news user right after it starts).  Prior to INN 2.3, installing rnews
-setuid root was standard; since most sites no longer use UUCP, it is no
-longer the default as of INN 2.3 and must be requested at configure time.
-You probably don't want to use this option unless your server accepts UUCP
-news batches.
+If this option is given to configure, rnews will be installed setuid news,
+owned by group uucp, and mode 4550.  This will allow the UUCP subsystem
+to run rnews to process UUCP batches of news articles.  Prior to INN 2.3,
+installing rnews setuid news was standard; since most sites no longer use
+UUCP, it is no longer the default as of INN 2.3 and must be requested at
+configure time.  You probably don't want to use this option unless your
+server accepts UUCP news batches.
 
 =item B<--enable-setgid-inews>
 
@@ -1386,6 +1421,11 @@ into your system crontab instead:
 
 If you're using any non-CNFS storage methods, add C<delayrm> to the above
 option list for news.daily.
+
+The news user obviously must be able to run cron jobs.  On Solaris, this
+means that it must have a valid F</etc/shadow> entry and must not be
+locked (although it may be a non-login account).  There may be similar
+restrictions with other operating systems.
 
 If you use the batching method to send news, also set up a cron job to run
 nntpsend(8) every ten minutes.  nntpsend will run innxmit for all
diff -ruNp inn-2.4.2/doc/pod/libauth.pod inn-2.4.3/doc/pod/libauth.pod
--- inn-2.4.2/doc/pod/libauth.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/libauth.pod	Mon Mar 20 04:14:57 2006
@@ -64,7 +64,7 @@ respectively?
 
 Written by Jeffrey M. Vinocur <jeff@litech.org> for InterNetNews.
 
-$Id: libauth.pod,v 1.1 2002/12/12 23:02:14 vinocur Exp $
+$Id: libauth.pod 5988 2002-12-12 23:02:14Z vinocur $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/libinnhist.pod inn-2.4.3/doc/pod/libinnhist.pod
--- inn-2.4.2/doc/pod/libinnhist.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/libinnhist.pod	Mon Mar 20 04:14:57 2006
@@ -297,4 +297,4 @@ type B<time_t> and will not be modified 
 
 Written by Alex Kiernan <alexk@demon.net> for InterNetNews 2.4.0.
 
-$Id: libinnhist.pod,v 1.5 2002/12/03 05:17:17 vinocur Exp $
+$Id: libinnhist.pod 5909 2002-12-03 05:17:18Z vinocur $
diff -ruNp inn-2.4.2/doc/pod/list.pod inn-2.4.3/doc/pod/list.pod
--- inn-2.4.2/doc/pod/list.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/list.pod	Mon Mar 20 04:14:57 2006
@@ -80,4 +80,4 @@ I<pred> is B<NULL> then I<node> is added
 
 Written by Alex Kiernan <alex.kiernan@thus.net> for InterNetNews 2.4.0.
 
-$Id: list.pod,v 1.1 2003/01/21 06:25:42 alexk Exp $
+$Id: list.pod 6168 2003-01-21 06:27:32Z alexk $
diff -ruNp inn-2.4.2/doc/pod/mailpost.pod inn-2.4.3/doc/pod/mailpost.pod
--- inn-2.4.2/doc/pod/mailpost.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/mailpost.pod	Mon Mar 20 04:14:57 2006
@@ -90,7 +90,7 @@ having "X-" prepended.
 Written by Paul Vixie long ago and then hacked up by James Brister for INN 
 integration.
 
-$Id: mailpost.pod,v 1.2.2.1 2004/01/25 23:44:19 rra Exp $
+$Id: mailpost.pod 6658 2004-01-25 23:44:19Z rra $
 
 =head1 FILES
 
diff -ruNp inn-2.4.2/doc/pod/makehistory.pod inn-2.4.3/doc/pod/makehistory.pod
--- inn-2.4.2/doc/pod/makehistory.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/makehistory.pod	Mon Mar 20 04:14:57 2006
@@ -186,7 +186,7 @@ Where temporary files are written unless
 Originally written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews and
 updated by various other people since.
 
-$Id: makehistory.pod,v 1.9.2.1 2003/07/12 19:26:58 rra Exp $
+$Id: makehistory.pod 6400 2003-07-12 19:26:58Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/motd.news.pod inn-2.4.3/doc/pod/motd.news.pod
--- inn-2.4.2/doc/pod/motd.news.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/motd.news.pod	Mon Mar 20 04:14:57 2006
@@ -19,7 +19,7 @@ the client an empty response.
 
 Rewritten in POD by Russ Allbery <rra@stanford.edu> for InterNetNews.
 
-$Id: motd.news.pod,v 1.1.2.1 2003/12/27 06:25:05 rra Exp $
+$Id: motd.news.pod 6574 2003-12-27 06:25:05Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/news.pod inn-2.4.3/doc/pod/news.pod
--- inn-2.4.2/doc/pod/news.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/news.pod	Mon Mar 20 04:14:57 2006
@@ -1,3 +1,51 @@
+=head1 Changes from 2.4.2 to 2.4.3
+
+=over 2
+
+=item *
+
+Previous versions of INN had an optimization for handling XHDR Newsgroups
+that used the Xref header from overview.  While this does make the command
+much faster, it doesn't produce accurate results and breaks the NNTP
+protocol, so this optimization has been removed.
+
+=item *
+
+Fixed a bug in innd that allowed it to accept articles with duplicated
+headers if the header occurred an odd number of times.  Modified the
+programs for rebuilding overview to use the last Xref header if there
+are multiple ones to avoid problems with spools that contain such invalid
+articles.
+
+=item *
+
+Fixed yet another problem with verifying that a user has permissions to
+approve posts to a moderated group.  Thanks, Jens Schlegel.
+
+=item *
+
+Increase the send and receive buffer on the Unix domain socket used by
+ctlinnd.  This should allow longer replies (particularly for innstat) on
+platforms with very low default Unix domain socket buffer sizes.
+
+=item *
+
+rnews's handling of articles with nul characters, NNTP errors, header
+problems, and deferrals has been significantly improved.
+
+=item *
+
+Thomas Parmelan added support to send-uucp for specifying the funnel or
+exploder site to flush for feeds managed through one and fixed a problem
+with picking up old stranded work files.
+
+=item *
+
+Many other more minor bug fixes, optimization improvements, and
+documentation fixes.
+
+=back
+
 =head1 Changes from 2.4.1 to 2.4.2
 
 =over 2
diff -ruNp inn-2.4.2/doc/pod/newsfeeds.pod inn-2.4.3/doc/pod/newsfeeds.pod
--- inn-2.4.2/doc/pod/newsfeeds.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/newsfeeds.pod	Mon Mar 20 04:14:57 2006
@@ -89,7 +89,7 @@ will be matched against every newsgroup 
 newsgroups that match will be added to the subscription list for the site.
 
 Normally, a given article (or information about it) is sent to a site if
-any of the articles to which the article was posted are in that site's
+any of the newsgroups to which the article was posted are in that site's
 subscription list.  If a newsgroup matches a C<@> pattern in I<pattern>,
 then not only is it not added to the subscription list, but any articles
 crossposted to that newsgroup also will not be sent to that site even if
@@ -750,7 +750,7 @@ the standard newsfeeds entries used by m
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews.  Reformatted
 and rewritten in POD by Russ Allbery <rra@stanford.edu>.
 
-$Id: newsfeeds.pod,v 1.4.2.1 2003/07/12 19:27:33 rra Exp $
+$Id: newsfeeds.pod 7134 2005-03-05 21:19:44Z vinocur $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/nnrpd.pod inn-2.4.3/doc/pod/nnrpd.pod
--- inn-2.4.2/doc/pod/nnrpd.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/nnrpd.pod	Mon Mar 20 04:14:57 2006
@@ -4,7 +4,7 @@ nnrpd - NNTP server for reader clients
 
 =head1 SYNOPSIS
 
-B<nnrpd> [B<-DfnoRSt>] [B<-b> I<address>] [B<-c> I<configfile>]
+B<nnrpd> [B<-DfnoSt>] [B<-b> I<address>] [B<-c> I<configfile>]
 [B<-g> I<shadowgroup>>] [B<-i> I<initial>] [B<-I> I<instance>] [B<-p> I<port>]
 [B<-P> I<prefork>] [B<-r> I<reason>] [B<-s> I<padding>]
 
@@ -70,7 +70,7 @@ should therefore be restarted if inn.con
 When started in daemon mode, B<nnrpd> will write its PID into a file in
 the I<pathrun> directory.  The file will be named F<nnrpd-%d.pid>, where
 C<%d> is replaced with the port that B<nnrpd> is configured to listen on
-(119 unless the B<-P> option is given).
+(119 unless the B<-p> option is given).
 
 =item B<-f>
 
@@ -133,11 +133,6 @@ If the B<-r> flag is used, then B<nnrpd>
 connection giving I<reason> as the text. This flag is used by innd(8)
 when it is paused or throttled.
 
-=item B<-R>
-
-This option forces B<nnrpd> to be read-only. The startup banner will
-indicate "no posting".
-
 =item B<-s> I<padding>
 
 As each command is received, B<nnrpd> tries to change its C<argv>
@@ -286,7 +281,7 @@ support added by Rob Robertston <rob@vio
 January, 1993.  Exponential backoff (for posting) added by Dave Hayes in
 Febuary 1998.
 
-$Id: nnrpd.pod,v 1.2.2.4 2004/12/19 20:52:20 rra Exp $
+$Id: nnrpd.pod 7393 2005-07-18 01:50:17Z eagle $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/passwd.nntp.pod inn-2.4.3/doc/pod/passwd.nntp.pod
--- inn-2.4.2/doc/pod/passwd.nntp.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/passwd.nntp.pod	Mon Mar 20 04:14:57 2006
@@ -40,9 +40,9 @@ This file should not be world-readable.
 =head1 HISTORY
 
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews.  This is
-revision $Revision: 1.2 $, dated $Date: 2002/02/03 19:03:41 $.
+revision $Revision: 5089 $, dated $Date: 2002-02-03 11:03:41 -0800 (Sun, 03 Feb 2002) $.
 
-$Id: passwd.nntp.pod,v 1.2 2002/02/03 19:03:41 vinocur Exp $
+$Id: passwd.nntp.pod 5089 2002-02-03 19:03:41Z vinocur $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/pullnews.pod inn-2.4.3/doc/pod/pullnews.pod
--- inn-2.4.2/doc/pod/pullnews.pod	Thu Jan  1 00:00:00 1970
+++ inn-2.4.3/doc/pod/pullnews.pod	Mon Mar 20 04:14:57 2006
@@ -0,0 +1,134 @@
+=head1 NAME
+
+pullnews - Pull news from one news server and feed it to another
+
+=head1 SYNOPSIS
+
+B<pullnews> [B<-hq>] [B<-c> I<config>] [B<-g> I<groups>] [B<-p> I<port>]
+[B<-r> I<file>] [B<-s> I<to-server>] [<from-server> ...]
+
+=head1 REQUIREMENTS
+
+The Net::NNTP module must be installed.  This module is available as part
+of the libnet distribution and comes with recent versions of Perl.  For
+older versions of Perl, you can download it from L<http://www.cpan.org/>.
+
+=head1 DESCRIPTION
+
+B<pullnews> reads a config file in the running user's home directory
+(normally called F<~/.pullnews>) and connects to the upstream servers
+given there as a reader client.  By default, it connects to all servers
+listed in the configuration file, but you can limit B<pullnews> to
+specific servers by listing them on the command line.  For each server it
+connects to, it pulls over articles and feeds them to the destination
+server via the IHAVE command.  This means that the system B<pullnews> is
+run on must have feeding access to the destination news server.
+
+B<pullnews> is designed for very small sites that don't want to bother
+setting up traditional peering and is not meant for handling large feeds.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-c> I<config>
+
+Normally, the config file is stored in F<~/.pullnews> for the user running
+B<pullnews>.  If B<-c> is given, I<config> will be used as the config file
+instead.  This is useful if you're running B<pullnews> as a system user on
+an automated basis out of cron rather than as an individual user.
+
+=item B<-g> I<groups>
+
+Specifies a collection of groups to get.  I<groups> is a list of
+newsgroups separated by commas (only commas, no spaces).  Each group must
+be defined in the config file, and only the remote hosts that carry those
+groups will be contacted.  Note that this is a simple list of groups, not
+a wildmat expression, and wildcards are not supported.
+
+=item B<-h>
+
+Print a usage message and exit.
+
+=item B<-p> I<port>
+
+Connect to the destination news server on a port other than the default of
+119.  This option does not change the port used to connect to the remote
+news servers.
+
+=item B<-q>
+
+Print out less status information while running.
+
+=item B<-r> I<file>
+
+Rather than feeding the downloaded articles to a local server, instead
+create a batch file that can later be fed to a server using B<rnews>.  See
+rnews(1) for more information about the batch file format.
+
+=item B<-s> I<to-server>
+
+Normally, B<pullnews> will feed the articles it retrieves to the news
+server running on localhost.  To connect to a different host, specify a
+server with the B<-s> flag.
+
+=back
+
+=head1 CONFIG FILE
+
+The config file for B<pullnews> is divided into blocks, one block for each
+remote server to connect to.  A block begins with the host line, which
+must have no leading whitespace and contains just the hostname of the
+remote server.  Following this line should be one or more newsgroup lines
+which start with whitespace followed by the name of a newsgroup to
+retrieve.  Only one newsgroup should be listed on each line.
+
+B<pullnews> will update the config file to include the time the group was
+last checked and the highest numbered article successfully retrieved and
+transferred to the destination server.  It uses this data to avoid doing
+duplicate work the next time it runs.
+
+The full syntax is:
+
+    <host> [<username> <password>]
+            <group> [<time> <high>]
+            <group> [<time> <high>]
+
+where the <host> line must not have leading whitespace and the <group>
+lines must.  Note that you may optionally specify a username and password
+for basic authentication to the remote server if necessary.
+
+A typical configuration file would be:
+
+    # Format group date high
+    data.pa.vix.com
+            rec.bicycles.racing 908086612 783
+            rec.humor.funny 908086613 18
+            comp.programming.threads
+    nnrp.vix.com pull sekret
+            comp.std.lisp
+
+Note that an earlier run of B<pullnews> has filled in details about the
+last article downloads from the two rec.* groups.  The two comp.* groups
+were just added by the user and have not yet been checked.
+
+The nnrp.vix.com server requires authentication, and B<pullnews> will use
+the username C<pull> and the password C<sekret>.
+
+=head1 BUGS
+
+B<pullnews> is very simple and is lacking in more sophisticated features
+(like killing articles based on user-defined conditions) that better pull
+feeders most certainly have. It also doesn't keep or log much detail on
+articles transferred.
+
+=head1 HISTORY
+
+pullnews was written by James Brister for INN.  The documentation was
+rewritten in POD by Russ Allbery <rra@stanford.edu>.
+
+=head1 SEE ALSO
+
+incoming.conf(5)
+
+=cut
diff -ruNp inn-2.4.2/doc/pod/qio.pod inn-2.4.3/doc/pod/qio.pod
--- inn-2.4.2/doc/pod/qio.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/qio.pod	Mon Mar 20 04:14:57 2006
@@ -108,4 +108,4 @@ printing out each line preceeded by its 
 Written by Rich $alz <rsalz@uunet.uu.net> for InterNetNews.  Updated by
 Russ Allbery <rra@stanford.edu>.
 
-$Id: qio.pod,v 1.2 2002/12/03 05:17:18 vinocur Exp $
+$Id: qio.pod 5909 2002-12-03 05:17:18Z vinocur $
diff -ruNp inn-2.4.2/doc/pod/radius.conf.pod inn-2.4.3/doc/pod/radius.conf.pod
--- inn-2.4.2/doc/pod/radius.conf.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/radius.conf.pod	Mon Mar 20 04:14:57 2006
@@ -100,7 +100,7 @@ The shared secret with the RADIUS server
 This documentation was written by Russ Allbery <rra@stanford.edu> based on
 the comments in the sample radius.conf file by Yury B. Razbegin.
 
-$Id: radius.conf.pod,v 1.1.2.2 2004/05/16 23:06:08 rra Exp $
+$Id: radius.conf.pod 6736 2004-05-16 23:06:08Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/radius.pod inn-2.4.3/doc/pod/radius.pod
--- inn-2.4.2/doc/pod/radius.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/radius.pod	Mon Mar 20 04:14:57 2006
@@ -66,7 +66,7 @@ implement it correctly.
 The RADIUS authenticator was originally written by Aidan Cully.  This
 documentation was written by Russ Allbery <rra@stanford.edu>.
 
-$Id: radius.pod,v 1.1 2002/12/01 19:44:18 rra Exp $
+$Id: radius.pod 5894 2002-12-01 19:44:18Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/rc.news.pod inn-2.4.3/doc/pod/rc.news.pod
--- inn-2.4.2/doc/pod/rc.news.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/rc.news.pod	Mon Mar 20 04:14:57 2006
@@ -89,7 +89,7 @@ user ID.
 This manual page written by Jeffrey M. Vinocur <jeff@litech.org> for
 InterNetNews.
 
-$Id: rc.news.pod,v 1.1 2002/12/03 04:41:35 vinocur Exp $
+$Id: rc.news.pod 5908 2002-12-03 04:41:36Z vinocur $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/readers.conf.pod inn-2.4.3/doc/pod/readers.conf.pod
--- inn-2.4.2/doc/pod/readers.conf.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/readers.conf.pod	Mon Mar 20 04:14:57 2006
@@ -48,18 +48,22 @@ not significant.
 There are two basic types of configuration groups, auth and access.  The
 auth group provides mechanisms to establish the identity of the user, who
 they are.  The access group determines, given the user's identity, what
-that user ispermitted to do.  Writing a F<readers.conf> file for your
-setup is a two-step process:  first assigning an identity to each
-incoming connection using auth groups, and then giving each identity
-appropriate privileges with access group.  We recommend I<not>
-intermingling auth groups and access groups in the config file; it is
-often more sensible (in the absence of the I<key> parameter) to put all
-of the auth groups first, and all of the access groups below.
+that user is permitted to do.  Writing a F<readers.conf> file for your
+setup is a two-step process: first assigning an identity to each incoming
+connection using auth groups, and then giving each identity appropriate
+privileges with access group.  We recommend I<not> intermingling auth
+groups and access groups in the config file; it is often more sensible (in
+the absence of the I<key> parameter) to put all of the auth groups first,
+and all of the access groups below.
 
 A user identity, as established by an auth group, looks like an e-mail
 address; in other words, it's in the form "<username>@<domain>" (or
 sometimes just "<username>" if no domain is specified.
 
+If I<nnrpdauthsender> is set in F<inn.conf>, the user identity is also put
+into the Sender: header of posts made by that user.  See the documentation
+of that option in inn.conf(5) for more details.
+
 An auth group definition looks like:
 
     auth <name> {
@@ -84,9 +88,9 @@ wildmat expressions, you may also use CI
 address in a netblock; for example, "10.10.10.0/24" will match any IP
 address between 10.10.10.0 and 10.10.10.255 inclusive.
 
-If compiled against the SSL libraries, an auth group with the
-require_ssl: parameter set to true only applies if the incoming
-connection is using SSL.
+If compiled against the SSL libraries, an auth group with the require_ssl:
+parameter set to true only applies if the incoming connection is using
+SSL.
 
 For any connection from a host that matches that wildmat expression or
 netblock, each <res-program> (multiple res: lines may be present in a
@@ -98,13 +102,15 @@ the values of the default: and default-d
 <res-program> only returns a username, <defdomain> is used as the
 domain.
 
-If the user later authenticates via the AUTHINFO USER/PASS commands,
-the provided username and password are passed to each <auth-program>
-(multiple auth, perl_auth, or python_auth lines may be present in a
-block; they are run in sequence until one succeeds), if any.  If one
-succeeds and returns a different identity than the one assigned at the
-time of the connection, it is matched against the available access
-groups again and the actions the user is authorized to do may change.
+If the user later authenticates via the AUTHINFO USER/PASS commands, the
+provided username and password are passed to each <auth-program> (multiple
+auth, perl_auth, or python_auth lines may be present in a block; they are
+run in sequence until one succeeds), if any.  If one succeeds and returns
+a different identity than the one assigned at the time of the connection,
+it is matched against the available access groups again and the actions
+the user is authorized to do may change.  The most common <auth-program>
+to use is B<ckpasswd>, which supports several ways of checking passwords
+including using PAM.  See the ckpasswd(8) man page for more details.
 
 When matching auth groups, the last auth group in the file that matches a
 given connection and username/password combination is used.
@@ -184,6 +190,10 @@ clearer.
 
 =head1 AUTH GROUP PARAMETERS
 
+An access group without at least one of the res:, auth:, perl_auth:,
+python_auth:, or default: parameters makes no sense (and in practice will
+just be ignored).
+
 =over 4
 
 =item B<hosts:>
@@ -234,11 +244,14 @@ A simple command line for a user authent
 not supported).  If a full path is not given, the program executed must be
 located in the I<pathbin>/auth/passwd directory.  An authenticator is a
 program used to handle a user-supplied username and password, via a
-mechanism such as AUTHINFO USER/PASS.  Like with res:, one auth group
-can have multiple auth: parameters; they will be tried in order and the
+mechanism such as AUTHINFO USER/PASS.  Like with res:, one auth group can
+have multiple auth: parameters; they will be tried in order and the
 results of the first successful one will be used.  See also perl_auth:
 below.
 
+The most common authenticator to use is ckpasswd(8); see its man page for
+more information.
+
 =item B<perl_auth:>
 
 A path to a perl script for authentication.  The perl_auth: parameter
@@ -800,10 +813,10 @@ tunnel), use the localaddress: parameter
 Written by Aidan Cully <aidan@panix.com> for InterNetNews.  Substantially
 expanded by Russ Allbery <rra@stanford.edu>.
 
-$Id: readers.conf.pod,v 1.26.2.2 2003/09/08 04:31:57 rra Exp $
+$Id: readers.conf.pod 7384 2005-07-05 01:28:43Z eagle $
 
 =head1 SEE ALSO
 
-inn.conf(5), innd(8), newsfeeds(5), nnrpd(8), uwildmat(3).
+ckpasswd(8), inn.conf(5), innd(8), newsfeeds(5), nnrpd(8), uwildmat(3)
 
 =cut
diff -ruNp inn-2.4.2/doc/pod/sasl.conf.pod inn-2.4.3/doc/pod/sasl.conf.pod
--- inn-2.4.2/doc/pod/sasl.conf.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/sasl.conf.pod	Mon Mar 20 04:14:57 2006
@@ -13,19 +13,17 @@ http://www.openssl.org/; it has been tes
 
 =head1 INSTALLATION
 
-To use SSL, a certificate and private key are needed that you can create
-using the openssl binary.  Make certain that the certificate is owned by
-your news user, news group, and is mode 0640 or 0660, and that the key is
-owned by your news user, news group, and is mode 600.
+To use SSL, a certificate and private key are needed that you can
+create using the openssl binary. 
+Make certain that each keys are owned by your news user, news group,
+and are mode 0640 or 0660.
 
-=head1 EXAMPLE
+=head2 EXAMPLE
 
-   openssl req -new -x509 -nodes -out /usr/local/news/lib/cert.pem \
-       -days 366 -keyout /usr/local/news/lib/key.pem
+   openssl req -new -x509 -nodes -out /usr/local/news/lib/cert.pem\
+    -days 366 -keyout /usr/local/news/lib/cert.pem
    chown news:news /usr/local/news/lib/cert.pem
    chmod 640 /usr/local/news/lib/cert.pem
-   chown news:news /usr/local/news/lib/key.pem
-   chmod 600 /usr/local/news/lib/key.pem
 
 You also can make the keys as the root user with C<make cert>.
 
diff -ruNp inn-2.4.2/doc/pod/simpleftp.pod inn-2.4.3/doc/pod/simpleftp.pod
--- inn-2.4.2/doc/pod/simpleftp.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/simpleftp.pod	Mon Mar 20 04:14:57 2006
@@ -35,7 +35,7 @@ as well as Net::FTP.
 
 Tossed off by David C Lawrence <tale@isc.org> for InterNetNews.
 
-$Id: simpleftp.pod,v 1.1 2003/04/03 00:54:01 rra Exp $
+$Id: simpleftp.pod 6276 2003-04-03 00:54:02Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/sm.pod inn-2.4.3/doc/pod/sm.pod
--- inn-2.4.2/doc/pod/sm.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/sm.pod	Mon Mar 20 04:14:57 2006
@@ -86,7 +86,7 @@ succeeded, you should run sm on one toke
 Written by Katsuhiro Kondou <kondou@nec.co.jp> for InterNetNews.
 Rewritten in POD by Russ Allbery <rra@stanford.edu>.
 
-$Id: sm.pod,v 1.1.2.1 2004/03/06 18:31:57 rra Exp $
+$Id: sm.pod 6683 2004-03-06 18:31:58Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/tdx-util.pod inn-2.4.3/doc/pod/tdx-util.pod
--- inn-2.4.2/doc/pod/tdx-util.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/tdx-util.pod	Mon Mar 20 04:14:57 2006
@@ -174,7 +174,7 @@ using the tradspool article storage meth
 
 Written by Russ Allbery <rra@stanford.edu> for InterNetNews.
 
-$Id: tdx-util.pod,v 1.2.2.1 2004/12/19 19:41:49 rra Exp $
+$Id: tdx-util.pod 7047 2004-12-19 19:41:49Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/doc/pod/tst.pod inn-2.4.3/doc/pod/tst.pod
--- inn-2.4.2/doc/pod/tst.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/tst.pod	Mon Mar 20 04:14:57 2006
@@ -73,4 +73,4 @@ Converted to POD from Peter A. Friend's 
 documentation by Alex Kiernan <alex.kiernan@thus.net> for InterNetNews
 2.4.0.
 
-$Id: tst.pod,v 1.1 2003/01/02 09:16:09 alexk Exp $
+$Id: tst.pod 6104 2003-01-02 09:16:09Z alexk $
diff -ruNp inn-2.4.2/doc/pod/uwildmat.pod inn-2.4.3/doc/pod/uwildmat.pod
--- inn-2.4.2/doc/pod/uwildmat.pod	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/doc/pod/uwildmat.pod	Mon Mar 20 04:14:57 2006
@@ -171,7 +171,7 @@ substantial differences, including the e
 characters, and has noticable functionality changes.  Any bugs present in
 it aren't Rich's fault.
 
-$Id: uwildmat.pod,v 1.1 2002/08/10 18:51:33 rra Exp $
+$Id: uwildmat.pod 5533 2002-08-10 18:51:37Z rra $
 
 =head1 SEE ALSO
 
diff -ruNp inn-2.4.2/expire/Makefile inn-2.4.3/expire/Makefile
--- inn-2.4.2/expire/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/expire/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.39.2.1 2004/05/18 01:18:54 rra Exp $
+##  $Id: Makefile 6806 2004-05-18 01:18:57Z rra $
 
 include ../Makefile.global
 
diff -ruNp inn-2.4.2/expire/convdate.c inn-2.4.3/expire/convdate.c
--- inn-2.4.2/expire/convdate.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/expire/convdate.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: convdate.c,v 1.9.2.1 2003/05/31 19:48:25 rra Exp $
+/*  $Id: convdate.c 6372 2003-05-31 19:48:28Z rra $
 **
 **  Convert date strings and numbers to numbers and strings.
 */
diff -ruNp inn-2.4.2/expire/expire.c inn-2.4.3/expire/expire.c
--- inn-2.4.2/expire/expire.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/expire/expire.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: expire.c,v 1.93 2003/01/19 01:15:28 rra Exp $
+/*  $Id: expire.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Expire news articles.
 */
diff -ruNp inn-2.4.2/expire/expireover.c inn-2.4.3/expire/expireover.c
--- inn-2.4.2/expire/expireover.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/expire/expireover.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: expireover.c,v 1.43.2.1 2004/05/16 19:59:26 rra Exp $
+/*  $Id: expireover.c 6708 2004-05-16 19:59:26Z rra $
 **
 **  Expire the overview database.
 **
diff -ruNp inn-2.4.2/expire/fastrm.c inn-2.4.3/expire/fastrm.c
--- inn-2.4.2/expire/fastrm.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/expire/fastrm.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: fastrm.c,v 1.34 2003/01/19 19:58:19 rra Exp $
+/*  $Id: fastrm.c 6155 2003-01-19 19:58:25Z rra $
 **
 **  Delete a list of filenames or tokens from stdin.
 **
diff -ruNp inn-2.4.2/expire/grephistory.c inn-2.4.3/expire/grephistory.c
--- inn-2.4.2/expire/grephistory.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/expire/grephistory.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: grephistory.c,v 1.30.2.1 2004/12/19 08:33:49 rra Exp $
+/*  $Id: grephistory.c 7041 2004-12-19 08:33:49Z rra $
 **
 **  Get data from history database.
 */
diff -ruNp inn-2.4.2/expire/makedbz.c inn-2.4.3/expire/makedbz.c
--- inn-2.4.2/expire/makedbz.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/expire/makedbz.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: makedbz.c,v 1.26 2003/01/19 01:15:28 rra Exp $
+/*  $Id: makedbz.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Rebuild dbz file for history db.
 */
diff -ruNp inn-2.4.2/expire/makehistory.c inn-2.4.3/expire/makehistory.c
--- inn-2.4.2/expire/makehistory.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/expire/makehistory.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: makehistory.c,v 1.112.2.9 2004/12/19 08:21:49 rra Exp $
+/*  $Id: makehistory.c 7468 2005-12-12 03:23:21Z eagle $
 **
 **  Rebuild history/overview databases.
 */
@@ -527,6 +527,28 @@ DoArt(ARTHANDLE *art)
     }
     for (fp = ARTfields, i = 0; i < ARTfieldsize; i++, fp++) {
         fp->Header = wire_findheader(art->data, art->len, fp->Headername);
+
+        /* Someone managed to break their server so that they were appending
+           multiple Xref headers, and INN had a bug where it wouldn't notice
+           this and reject the article.  Just in case, see if there are
+           multiple Xref headers and use the last one. */
+        if (fp == Xrefp) {
+            const char *next = fp->Header;
+            size_t left;
+
+            while (next != NULL) {
+                next = wire_endheader(fp->Header, art->data + art->len - 1);
+                if (next == NULL)
+                    break;
+                next++;
+                left = art->len - (next - art->data);
+                next = wire_findheader(next, left, fp->Headername);
+                if (next != NULL)
+                    fp->Header = next;
+            }
+        }
+
+        /* Now, if we have a header, find and record its length. */
         if (fp->Header != NULL) {
 	    fp->HasHeader = true;
             p = wire_endheader(fp->Header, art->data + art->len - 1);
diff -ruNp inn-2.4.2/expire/prunehistory.c inn-2.4.3/expire/prunehistory.c
--- inn-2.4.2/expire/prunehistory.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/expire/prunehistory.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: prunehistory.c,v 1.22 2003/01/14 06:03:14 rra Exp $
+/*  $Id: prunehistory.c 6124 2003-01-14 06:03:29Z rra $
 **
 **  Prune file names from history file.
 */
diff -ruNp inn-2.4.2/frontends/Makefile inn-2.4.3/frontends/Makefile
--- inn-2.4.2/frontends/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.56.2.1 2004/05/18 01:18:54 rra Exp $
+##  $Id: Makefile 6806 2004-05-18 01:18:57Z rra $
 
 include ../Makefile.global
 
diff -ruNp inn-2.4.2/frontends/cnfsheadconf.in inn-2.4.3/frontends/cnfsheadconf.in
--- inn-2.4.2/frontends/cnfsheadconf.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/cnfsheadconf.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 # fixscript will replace this line with require innshellvars.pl
 
-#  $Id: cnfsheadconf.in,v 1.5.2.1 2004/05/16 21:21:14 rra Exp $
+#  $Id: cnfsheadconf.in 6727 2004-05-16 21:21:14Z rra $
 # 
 #  Copyright Andreas Lamrecht 1998
 #  <Andreas.Lamprect@siemens.at>
diff -ruNp inn-2.4.2/frontends/cnfsstat.in inn-2.4.3/frontends/cnfsstat.in
--- inn-2.4.2/frontends/cnfsstat.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/cnfsstat.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 # fixscript will replace this line with require innshellvars.pl
 
-#  $Id: cnfsstat.in,v 1.18.2.4 2004/12/19 21:36:38 rra Exp $
+#  $Id: cnfsstat.in 7060 2004-12-19 21:36:38Z rra $
 # 
 #  Copyright Andreas Lamrecht 1998
 #  <Andreas.Lamprect@siemens.at>
diff -ruNp inn-2.4.2/frontends/ctlinnd.c inn-2.4.3/frontends/ctlinnd.c
--- inn-2.4.2/frontends/ctlinnd.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/ctlinnd.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: ctlinnd.c,v 1.31 2003/01/19 19:58:20 rra Exp $
+/*  $Id: ctlinnd.c 6155 2003-01-19 19:58:25Z rra $
 **
 **  Send control messages to the InterNetNews daemon.
 */
diff -ruNp inn-2.4.2/frontends/encode.c inn-2.4.3/frontends/encode.c
--- inn-2.4.2/frontends/encode.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/encode.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: encode.c,v 1.7 2003/01/13 07:59:30 rra Exp $
+/*  $Id: encode.c 6119 2003-01-13 07:59:39Z rra $
 **
 **  Produce a seven-bit printable encoding of stdin on stdout.
 **  From @(#)encode.c 1.3 5/15/85, distributed with B2.11 News.
diff -ruNp inn-2.4.2/frontends/feedone.c inn-2.4.3/frontends/feedone.c
--- inn-2.4.2/frontends/feedone.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/feedone.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: feedone.c,v 1.12 2003/01/19 01:15:29 rra Exp $
+/*  $Id: feedone.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Connect to the NNTP server and feed one article.
 */
diff -ruNp inn-2.4.2/frontends/getlist.c inn-2.4.3/frontends/getlist.c
--- inn-2.4.2/frontends/getlist.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/getlist.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: getlist.c,v 1.18 2003/01/19 01:15:29 rra Exp $
+/*  $Id: getlist.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Get a file list from an NNTP server.
 */
diff -ruNp inn-2.4.2/frontends/inews.c inn-2.4.3/frontends/inews.c
--- inn-2.4.2/frontends/inews.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/inews.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: inews.c,v 1.54.2.2 2004/12/19 22:15:41 rra Exp $
+/*  $Id: inews.c 7069 2004-12-19 22:15:41Z rra $
 **
 **  Send an article (prepared by someone on the local site) to the
 **  master news server.
diff -ruNp inn-2.4.2/frontends/innconfval.c inn-2.4.3/frontends/innconfval.c
--- inn-2.4.2/frontends/innconfval.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/innconfval.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: innconfval.c,v 1.27 2002/12/08 19:51:49 rra Exp $
+/*  $Id: innconfval.c 5962 2002-12-08 19:52:13Z rra $
 **
 **  Get a config value from INN.
 */
diff -ruNp inn-2.4.2/frontends/mailpost.in inn-2.4.3/frontends/mailpost.in
--- inn-2.4.2/frontends/mailpost.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/mailpost.in	Mon Mar 20 04:14:57 2006
@@ -5,7 +5,7 @@
 # 21feb00 [added "lc" to duplicate header fixer stmt to make it case-insensitive]
 # doka 11may99 [fixed duplicate headers problem]
 # brister 19oct98 cleaned up somewhat for perl v. 5. and made a little more robust.
-# vixie 29jan95 RCS'd [$Id: mailpost.in,v 1.7.2.3 2004/05/17 09:25:39 rra Exp $]
+# vixie 29jan95 RCS'd [$Id: mailpost.in 6793 2004-05-17 09:25:39Z rra $]
 # vixie 15jun93 [added -m]
 # vixie 30jun92 [added -a and -d]
 # vixie 17jun92 [attempt simple-minded fixup to $path]
diff -ruNp inn-2.4.2/frontends/pullnews.in inn-2.4.3/frontends/pullnews.in
--- inn-2.4.2/frontends/pullnews.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/pullnews.in	Mon Mar 20 04:14:57 2006
@@ -4,7 +4,7 @@
 # Start Date:   Sat, 10 Oct 1998 21:40:11 +0200
 # Project:      INN
 # File:         pullnews.pl
-# RCSId:        $Id: pullnews.in,v 1.4.2.1 2004/05/17 07:46:10 rra Exp $
+# RCSId:        $Id: pullnews.in 6782 2004-05-17 07:46:10Z rra $
 # Time-stamp:	<Friday, 7 April 2000 15:17:12 by brister@nominum.com>
 # Description:  A very simple pull feeder. Connects to multiple remote 
 #		machines (in the guise of a reader), and pulls over articles 
@@ -61,7 +61,7 @@ require 5.004;
 $0 =~ s!.*/!!;
 
 my $rcsID =<<'EOM';
-$Id: pullnews.in,v 1.4.2.1 2004/05/17 07:46:10 rra Exp $
+$Id: pullnews.in 6782 2004-05-17 07:46:10Z rra $
 EOM
 
 $SIG{INT} = \&outtaHere ;
diff -ruNp inn-2.4.2/frontends/rnews.c inn-2.4.3/frontends/rnews.c
--- inn-2.4.2/frontends/rnews.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/rnews.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: rnews.c,v 1.54.2.4 2004/06/03 23:52:56 rra Exp $
+/*  $Id: rnews.c 7424 2005-10-09 05:04:12Z eagle $
 **
 **  A front-end for InterNetNews.
 **
@@ -159,13 +159,14 @@ static char *REMclean(char *buff)
 /*
 **  Write an article to the rejected directory.
 */
-static void Reject(const char *article, const char *reason, const char *arg)
+static void
+Reject(const char *article, size_t length UNUSED, const char *reason,
+       const char *arg)
 {
 #if	defined(DO_RNEWS_SAVE_BAD)
     char *filename;
     FILE *F;
     int fd;
-    size_t length;
 #endif	/* defined(DO_RNEWS_SAVE_BAD) */
 
     notice(reason, arg);
@@ -187,7 +188,6 @@ static void Reject(const char *article, 
         warn("cannot fdopen %s", filename);
 	return;
     }
-    length = strlen(article);
     if (fwrite(article, 1, length, F) != length)
         warn("cannot fwrite to %s", filename);
     if (fclose(F) == EOF)
@@ -202,7 +202,8 @@ static void Reject(const char *article, 
 **  whole batch needs to be saved (such as when the server goes down or if
 **  the file is corrupted).
 */
-static bool Process(char *article)
+static bool
+Process(char *article, size_t artlen)
 {
     HEADER	        *hp;
     const char	        *p;
@@ -223,15 +224,15 @@ static bool Process(char *article)
 	return true;
 
     /* Convert the article to wire format. */
-    wirefmt = ToWireFmt(article, strlen(article), &length);
+    wirefmt = ToWireFmt(article, artlen, &length);
 
     /* Make sure that all the headers are there, note the ID. */
     for (hp = RequiredHeaders; hp < ARRAY_END(RequiredHeaders); hp++) {
         p = wire_findheader(wirefmt, length, hp->Name);
         if (p == NULL) {
             free(wirefmt);
-	    Reject(article, "bad_article missing %s", hp->Name);
-	    return false;
+	    Reject(article, artlen, "bad_article missing %s", hp->Name);
+	    return true;
 	}
 	if (IS_MESGID(hp)) {
 	    id = p;
@@ -249,8 +250,9 @@ static bool Process(char *article)
     /* Send the NNTP "ihave" message. */
     if ((p = strchr(id, '\r')) == NULL) {
         free(wirefmt);
-	Reject(article, "bad_article unterminated %s header", "Message-ID");
-	return false;
+	Reject(article, artlen, "bad_article unterminated %s header",
+               "Message-ID");
+	return true;
     }
     msgid = xstrndup(id, p - id);
     fprintf(ToServer, "ihave %s\r\n", msgid);
@@ -277,8 +279,8 @@ static bool Process(char *article)
     switch (atoi(buff)) {
     default:
         free(wirefmt);
-	Reject(article, "unknown_reply after ihave %s", buff);
-	return true;
+	notice("unknown_reply after ihave %s", buff);
+	return false;
     case NNTP_RESENDIT_VAL:
         free(wirefmt);
 	return false;
@@ -336,7 +338,7 @@ static bool Process(char *article)
     case NNTP_TOOKIT_VAL:
 	break;
     case NNTP_REJECTIT_VAL:
-	Reject(article, "rejected %s", buff);
+	Reject(article, artlen, "rejected %s", buff);
 	break;
     }
     return true;
@@ -398,7 +400,7 @@ ReadRemainder(int fd, char first, char s
 	article[used++] = '\n';
     article[used] = '\0';
 
-    ok = Process(article);
+    ok = Process(article, used);
     free(article);
     return ok;
 }
@@ -441,11 +443,13 @@ ReadBytecount(int fd, int artsize)
 #endif	/* 0 */
 	    return true;
 	}
-    if (p[-1] != '\n')
+    if (p[-1] != '\n') {
 	*p++ = '\n';
+        artsize++;
+    }
     *p = '\0';
 
-    return Process(article);
+    return Process(article, artsize);
 }
 
 
@@ -621,9 +625,9 @@ Unspool(void)
     bool	ok;
     struct stat		Sb;
     char		hostname[10];
-    int			fd, fd2;
+    int			fd;
     size_t		i;
-    char                *badname, *uuhost;
+    char                *uuhost;
 
     message_handlers_die(2, message_log_stderr, message_log_syslog_err);
     message_handlers_warn(2, message_log_stderr, message_log_syslog_err);
@@ -674,22 +678,15 @@ Unspool(void)
 	WaitForChildren(i);
 	UUCPHost = uuhost;
 
-	if (!ok) {
-            badname = concat(PathBadNews, "/", hostname, "XXXXXX", (char *) 0);
-            fd2 = mkstemp(badname);
-            if (fd2 < 0)
-                sysdie("cannot create temporary file");
-            close(fd2);
-            warn("cant unspool saving to %s", badname);
-	    if (rename(InputFile, badname) < 0)
-                sysdie("cannot rename %s to %s", InputFile, badname);
-	    close(fd);
-            free(badname);
-	    continue;
-	}
+        /* If UnpackOne returned true, the article has been dealt with one way
+           or the other, so remove it.  Otherwise, leave it in place; either
+           we got an unknown error from the server or we got a deferral, and
+           for both we want to try later. */
+	if (ok) {
+            if (unlink(InputFile) < 0)
+                syswarn("cannot remove %s", InputFile);
+        }
 
-	if (unlink(InputFile) < 0)
-            syswarn("cannot remove %s", InputFile);
 	close(fd);
     }
     closedir(dp);
@@ -829,6 +826,31 @@ int main(int ac, char *av[])
     message_handlers_notice(1, message_log_syslog_notice);
     message_handlers_warn(1, message_log_syslog_err);
     message_handlers_die(1, message_log_syslog_err);
+
+    /* The reason for the following is somewhat obscure and is done only
+       because rnews is sometimes installed setuid.
+
+       The stderr stream used by message_log_syslog_err is associated with
+       file descriptor 2, generally even if that file descriptor is closed.
+       Someone running rnews may close all of the standard file descriptors
+       before running it, in which case, later in its operations, one of the
+       article files or network connections it has open could be file
+       descriptor 2.  If an error occurs at that point, the error message may
+       be written to that file or network connection instead of to stderr,
+       with unpredictable results.
+
+       We avoid this by burning three file descriptors if the real and
+       effective user IDs don't match, or if we're running as root.  (If they
+       do match, there is no escalation of privileges and at worst the user is
+       just managing to produce a strange bug.) */
+    if (getuid() != geteuid() || geteuid() == 0) {
+        if (open("/dev/null", O_RDONLY) < 0)
+            sysdie("cannot open /dev/null");
+        if (open("/dev/null", O_RDONLY) < 0)
+            sysdie("cannot open /dev/null");
+        if (open("/dev/null", O_RDONLY) < 0)
+            sysdie("cannot open /dev/null");
+    }
 
     /* Make sure that we switch to the news user if we're running as root,
        since we may spool files and don't want those files owned by root.
diff -ruNp inn-2.4.2/frontends/sm.c inn-2.4.3/frontends/sm.c
--- inn-2.4.2/frontends/sm.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/sm.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: sm.c,v 1.26.2.1 2004/03/06 18:31:15 rra Exp $
+/*  $Id: sm.c 6682 2004-03-06 18:31:15Z rra $
 **
 **  Provide a command line interface to the storage manager
 */
diff -ruNp inn-2.4.2/frontends/sys2nf.c inn-2.4.3/frontends/sys2nf.c
--- inn-2.4.2/frontends/sys2nf.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/frontends/sys2nf.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: sys2nf.c,v 1.12 2003/01/19 01:15:30 rra Exp $
+/*  $Id: sys2nf.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Read a C news "sys" file and split it up into a set of INN
 **  newsfeeds entries.  Also works with B news.
diff -ruNp inn-2.4.2/history/Makefile inn-2.4.3/history/Makefile
--- inn-2.4.2/history/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/history/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.16.2.1 2004/05/18 01:18:55 rra Exp $
+##  $Id: Makefile 6806 2004-05-18 01:18:57Z rra $
 
 include ../Makefile.global
 
diff -ruNp inn-2.4.2/history/buildconfig.in inn-2.4.3/history/buildconfig.in
--- inn-2.4.2/history/buildconfig.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/history/buildconfig.in	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-##  $Id: buildconfig.in,v 1.3.2.1 2004/05/18 01:18:55 rra Exp $
+##  $Id: buildconfig.in 6806 2004-05-18 01:18:57Z rra $
 ##
 ##  Generate linkage code and makefiles for storage and overview methods.
 ##
diff -ruNp inn-2.4.2/history/his.c inn-2.4.3/history/his.c
--- inn-2.4.2/history/his.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/history/his.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: his.c,v 1.16.2.1 2003/05/19 02:00:06 rra Exp $
+/*  $Id: his.c 6351 2003-05-19 02:00:06Z rra $
 **
 **  API to history routines 
 **
diff -ruNp inn-2.4.2/history/hisinterface.h inn-2.4.3/history/hisinterface.h
--- inn-2.4.2/history/hisinterface.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/history/hisinterface.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: hisinterface.h,v 1.4 2002/09/08 19:52:11 rra Exp $
+/* $Id: hisinterface.h 5745 2002-09-08 19:52:12Z rra $
 **
 ** Interface to history API modules
 */
diff -ruNp inn-2.4.2/history/hisv6/hisv6-private.h inn-2.4.3/history/hisv6/hisv6-private.h
--- inn-2.4.2/history/hisv6/hisv6-private.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/history/hisv6/hisv6-private.h	Mon Mar 20 04:14:57 2006
@@ -40,6 +40,7 @@
 struct hisv6 {
     char *histpath;
     FILE *writefp;
+    off_t offset;               /* Offset into writefp. */
     unsigned long nextcheck;
     struct history *history;
     time_t statinterval;
diff -ruNp inn-2.4.2/history/hisv6/hisv6.c inn-2.4.3/history/hisv6/hisv6.c
--- inn-2.4.2/history/hisv6/hisv6.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/history/hisv6/hisv6.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: hisv6.c,v 1.11.2.2 2004/06/02 20:11:06 hkehoe Exp $
+/*  $Id: hisv6.c 7339 2005-06-20 03:16:41Z eagle $
 **
 **  History v6 implementation against the history API.
 **
@@ -260,6 +260,7 @@ hisv6_closefiles(struct hisv6 *h)
 	    r = false;
 	}
 	h->writefp = NULL;
+        h->offset = 0;
     }
 
     h->nextcheck = 0;
@@ -287,7 +288,7 @@ hisv6_reopen(struct hisv6 *h)
 	if (h->flags & HIS_CREAT)
 	    mode = "w";
 	else
-	    mode = "a";
+	    mode = "r+";
 	if ((h->writefp = Fopen(h->histpath, mode, INND_HISTORY)) == NULL) {
 	    hisv6_seterror(h, concat("can't fopen history ",
 				      h->histpath, " ",
@@ -295,12 +296,6 @@ hisv6_reopen(struct hisv6 *h)
 	    hisv6_closefiles(h);
 	    goto fail;
 	}
-
-	/* fseeko to the end of file because the result of ftello() is
-	   undefined for files freopen()-ed in append mode according
-	   to POSIX 1003.1.  ftello() is used later on to determine a
-	   new article's offset in the history file. Fopen() uses
-	   freopen() internally. */
 	if (fseeko(h->writefp, 0, SEEK_END) == -1) {
 	    hisv6_seterror(h, concat("can't fseek to end of ",
 				      h->histpath, " ",
@@ -308,6 +303,13 @@ hisv6_reopen(struct hisv6 *h)
 	    hisv6_closefiles(h);
 	    goto fail;
 	}
+        h->offset = ftello(h->writefp);
+	if (h->offset == -1) {
+	    hisv6_seterror(h, concat("can't ftello ", h->histpath, " ",
+				      strerror(errno), NULL));
+	    hisv6_closefiles(h);
+	    goto fail;
+	}
 	close_on_exec(fileno(h->writefp), true);
     }
 
@@ -462,6 +464,7 @@ hisv6_new(const char *path, int flags, s
     h->histpath = path ? xstrdup(path) : NULL;
     h->flags = flags;
     h->writefp = NULL;
+    h->offset = 0;
     h->history = history;
     h->readfd = -1;
     h->nextcheck = 0;
@@ -715,10 +718,11 @@ hisv6_check(void *history, const char *k
 
 
 /*
-**  format a history line; `s' should be of at least HISV6_MAXLINE+1
-**  characters (to allow for the \0).
+**  Format a history line.  s should hold at least HISV6_MAXLINE + 1
+**  characters (to allow for the nul).  Returns the length of the data
+**  written, 0 if there was some error or if the data was too long to write.
 */
-static bool
+static int
 hisv6_formatline(char *s, const HASH *hash, time_t arrived,
 		  time_t posted, time_t expires, const TOKEN *token)
 {
@@ -750,8 +754,8 @@ hisv6_formatline(char *s, const HASH *ha
 	}
     }
     if (i < 0 || i >= HISV6_MAXLINE)
-	return false;
-    return true;
+	return 0;
+    return i;
 }
 
 
@@ -805,9 +809,8 @@ static bool
 hisv6_writeline(struct hisv6 *h, const HASH *hash, time_t arrived,
 		time_t posted, time_t expires, const TOKEN *token)
 {
-    int i;
     bool r;
-    off_t offset;
+    size_t i, length;
     char hisline[HISV6_MAXLINE + 1];
     char location[HISV6_MAX_LOCATION];
 
@@ -823,26 +826,31 @@ hisv6_writeline(struct hisv6 *h, const H
 	return false;
     }
 
-    if (hisv6_formatline(hisline, hash, arrived, posted, expires,
-			  token) != true) {
+    length = hisv6_formatline(hisline, hash, arrived, posted, expires, token);
+    if (length == 0) {
 	hisv6_seterror(h, concat("error formatting history line ",
 				  h->histpath, NULL));
 	return false;
     }	
 
-    offset = ftello(h->writefp);
-    i = fputs(hisline, h->writefp);
-    if (i == EOF ||
-	(!(h->flags & HIS_INCORE) && fflush(h->writefp) == EOF)) {
-	hisv6_errloc(location, (size_t)-1, offset);
-	/* The history line is now an orphan... */
+    i = fwrite(hisline, 1, length, h->writefp);
+
+    /* If the write failed, the history line is now an orphan.  Attempt to
+       rewind the write pointer to our offset to avoid leaving behind a
+       partial write and desyncing the offset from our file position. */
+    if (i < length ||
+        (!(h->flags & HIS_INCORE) && fflush(h->writefp) == EOF)) {
+	hisv6_errloc(location, (size_t)-1, h->offset);
 	hisv6_seterror(h, concat("can't write history ", h->histpath,
 				  location, " ", strerror(errno), NULL));
+        if (fseeko(h->writefp, h->offset, SEEK_SET) == -1)
+            h->offset += i;
 	r = false;
 	goto fail;
     }
 
-    r = hisv6_writedbz(h, hash, offset);
+    r = hisv6_writedbz(h, hash, h->offset);
+    h->offset += length;     /* increment regardless of error from writedbz */
  fail:
     return r;
 }
@@ -915,7 +923,7 @@ hisv6_replace(void *history, const char 
 	char new[HISV6_MAXLINE + 1];
 
 	if (hisv6_formatline(new, &hash, arrived, posted, expires,
-			      token) != true) {
+                             token) == 0) {
  	    hisv6_seterror(h, concat("error formatting history line ",
 				      h->histpath, NULL));
 	    r = false;
@@ -924,7 +932,9 @@ hisv6_replace(void *history, const char 
 
 	    oldlen = strlen(old);
 	    newlen = strlen(new);
-	    if (new > old) {
+	    if (new[newlen - 1] == '\n')
+                newlen--;
+	    if (newlen > oldlen) {
 		hisv6_seterror(h, concat("new history line too long ",
 					  h->histpath, NULL));
 		r = false;
@@ -932,7 +942,7 @@ hisv6_replace(void *history, const char 
 		ssize_t n;
 
 		/* space fill any excess in the tail of new */
-		memset(new + oldlen, ' ', oldlen - newlen);
+		memset(new + newlen, ' ', oldlen - newlen);
 
 		do {
 		    n = pwrite(fileno(h->writefp), new, oldlen, offset);
@@ -1255,7 +1265,8 @@ hisv6_expire(void *history, const char *
 	    nhistory = concat(h->histpath, ".n", NULL);
 	}
 
-	hnew = hisv6_new(nhistory, HIS_RDWR | HIS_INCORE, h->history);
+	hnew = hisv6_new(nhistory, HIS_CREAT | HIS_RDWR | HIS_INCORE,
+                         h->history);
 	if (!hisv6_reopen(hnew)) {
 	    hisv6_dispose(hnew);
 	    hnew = NULL;
diff -ruNp inn-2.4.2/history/hisv6/hisv6.h inn-2.4.3/history/hisv6/hisv6.h
--- inn-2.4.2/history/hisv6/hisv6.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/history/hisv6/hisv6.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: hisv6.h,v 1.3 2001/07/25 12:23:32 alexk Exp $
+/* $Id: hisv6.h 4959 2001-07-25 12:23:32Z alexk $
 **
 ** Internal history API interface exposed to HISxxx
 */
diff -ruNp inn-2.4.2/include/Makefile inn-2.4.3/include/Makefile
--- inn-2.4.2/include/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.7.2.1 2003/05/05 21:47:43 rra Exp $
+##  $Id: Makefile 6326 2003-05-05 21:47:43Z rra $
 ##
 ##  Currently just handles creation of the automatically generated header
 ##  files.  Eventually, rules for installing INN's header files will go
diff -ruNp inn-2.4.2/include/acconfig.h inn-2.4.3/include/acconfig.h
--- inn-2.4.2/include/acconfig.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/acconfig.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: acconfig.h,v 1.41.2.1 2004/05/16 20:48:51 rra Exp $
+/*  $Id: acconfig.h 6717 2004-05-16 20:48:51Z rra $
 **
 **  Here be configuration data used by various InterNetNews programs.  This
 **  file is used as source for the autoheader script, which from it and
diff -ruNp inn-2.4.2/include/clibrary.h inn-2.4.3/include/clibrary.h
--- inn-2.4.2/include/clibrary.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/clibrary.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: clibrary.h,v 1.42.2.1 2004/05/16 19:46:20 rra Exp $
+/*  $Id: clibrary.h 6704 2004-05-16 19:46:20Z rra $
 **
 **  Here be declarations of routines and variables in the C library.
 **  Including this file is the equivalent of including all of the following
diff -ruNp inn-2.4.2/include/conffile.h inn-2.4.3/include/conffile.h
--- inn-2.4.2/include/conffile.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/conffile.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Revision: 1.5 $
+/*  $Revision: 5086 $
 **
 **  Data structures, functions and cetera used for config file parsing.
 */
diff -ruNp inn-2.4.2/include/config.h.in inn-2.4.3/include/config.h.in
--- inn-2.4.2/include/config.h.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/config.h.in	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 /* include/config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
-/*  $Id: config.h.in,v 1.112.2.2 2004/05/17 04:06:42 rra Exp $
+/*  $Id: config.h.in 6759 2004-05-17 04:06:42Z rra $
 **
 **  Here be configuration data used by various InterNetNews programs.  This
 **  file is used as source for the autoheader script, which from it and
diff -ruNp inn-2.4.2/include/inn/buffer.h inn-2.4.3/include/inn/buffer.h
--- inn-2.4.2/include/inn/buffer.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/buffer.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: buffer.h,v 1.3 2003/04/16 05:46:38 rra Exp $
+/*  $Id: buffer.h 6295 2003-04-16 05:46:38Z rra $
 **
 **  Counted, reusable memory buffer.
 **
diff -ruNp inn-2.4.2/include/inn/confparse.h inn-2.4.3/include/inn/confparse.h
--- inn-2.4.2/include/inn/confparse.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/confparse.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: confparse.h,v 1.2 2002/02/18 01:17:24 rra Exp $
+/*  $Id: confparse.h 5114 2002-02-18 01:17:24Z rra $
 **
 **  Configuration file parsing interface.
 */
diff -ruNp inn-2.4.2/include/inn/defines.h inn-2.4.3/include/inn/defines.h
--- inn-2.4.2/include/inn/defines.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/defines.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: defines.h,v 1.10 2003/01/14 06:03:16 rra Exp $
+/*  $Id: defines.h 6124 2003-01-14 06:03:29Z rra $
 **
 **  Portable defines used by other INN header files.
 **
diff -ruNp inn-2.4.2/include/inn/hashtab.h inn-2.4.3/include/inn/hashtab.h
--- inn-2.4.2/include/inn/hashtab.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/hashtab.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: hashtab.h,v 1.2 2002/12/08 02:33:07 rra Exp $
+/*  $Id: hashtab.h 5944 2002-12-08 02:33:08Z rra $
 **
 **  Generic hash table interface.
 **
diff -ruNp inn-2.4.2/include/inn/history.h inn-2.4.3/include/inn/history.h
--- inn-2.4.2/include/inn/history.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/history.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: history.h,v 1.2 2001/07/18 12:33:01 alexk Exp $
+/*  $Id: history.h 4916 2001-07-18 12:33:01Z alexk $
 **
 **  Interface to history API
 */
diff -ruNp inn-2.4.2/include/inn/innconf.h inn-2.4.3/include/inn/innconf.h
--- inn-2.4.2/include/inn/innconf.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/innconf.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: innconf.h,v 1.7 2003/02/03 00:58:24 rra Exp $
+/*  $Id: innconf.h 6201 2003-02-03 00:58:26Z rra $
 **
 **  inn.conf parser interface.
 **
diff -ruNp inn-2.4.2/include/inn/list.h inn-2.4.3/include/inn/list.h
--- inn-2.4.2/include/inn/list.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/list.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: list.h,v 1.1 2003/01/21 06:25:42 alexk Exp $
+/*  $Id: list.h 6168 2003-01-21 06:27:32Z alexk $
 **
 */
 
diff -ruNp inn-2.4.2/include/inn/md5.h inn-2.4.3/include/inn/md5.h
--- inn-2.4.2/include/inn/md5.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/md5.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: md5.h,v 1.2 2001/02/24 08:10:16 rra Exp $
+/*  $Id: md5.h 4567 2001-02-24 08:10:16Z rra $
 **
 **  RSA Data Security, Inc. MD5 Message-Digest Algorithm
 **
diff -ruNp inn-2.4.2/include/inn/messages.h inn-2.4.3/include/inn/messages.h
--- inn-2.4.2/include/inn/messages.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/messages.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: messages.h,v 1.4 2002/06/07 13:59:06 alexk Exp $
+/*  $Id: messages.h 5496 2002-06-07 13:59:06Z alexk $
 **
 **  Logging, debugging, and error reporting functions.
 **
diff -ruNp inn-2.4.2/include/inn/mmap.h inn-2.4.3/include/inn/mmap.h
--- inn-2.4.2/include/inn/mmap.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/mmap.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: mmap.h,v 1.2.2.1 2003/07/12 19:14:34 rra Exp $
+/*  $Id: mmap.h 6396 2003-07-12 19:14:34Z rra $
 **
 **  MMap manipulation routines
 **
diff -ruNp inn-2.4.2/include/inn/qio.h inn-2.4.3/include/inn/qio.h
--- inn-2.4.2/include/inn/qio.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/qio.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: qio.h,v 1.1 2000/07/29 02:57:50 rra Exp $
+/*  $Id: qio.h 3653 2000-07-29 02:57:50Z rra $
 **
 **  Quick I/O package.
 **
diff -ruNp inn-2.4.2/include/inn/sequence.h inn-2.4.3/include/inn/sequence.h
--- inn-2.4.2/include/inn/sequence.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/sequence.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: sequence.h,v 1.1 2001/07/09 08:09:58 alexk Exp $
+/*  $Id: sequence.h 4871 2001-07-09 08:09:58Z alexk $
 **
 **  Sequence space arithmetic routines.
 **
diff -ruNp inn-2.4.2/include/inn/timer.h inn-2.4.3/include/inn/timer.h
--- inn-2.4.2/include/inn/timer.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/timer.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: timer.h,v 1.4 2003/01/19 00:39:49 rra Exp $
+/*  $Id: timer.h 6129 2003-01-19 00:39:49Z rra $
 **
 **  Timer library interface.
 **
diff -ruNp inn-2.4.2/include/inn/tst.h inn-2.4.3/include/inn/tst.h
--- inn-2.4.2/include/inn/tst.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/tst.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tst.h,v 1.6 2002/12/27 07:24:34 rra Exp $
+/*  $Id: tst.h 6083 2002-12-27 07:24:36Z rra $
 **
 **  Ternary search trie implementation.
 **
diff -ruNp inn-2.4.2/include/inn/vector.h inn-2.4.3/include/inn/vector.h
--- inn-2.4.2/include/inn/vector.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/vector.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: vector.h,v 1.4 2002/04/23 06:06:09 rra Exp $
+/*  $Id: vector.h 5450 2002-04-23 06:06:10Z rra $
 **
 **  Vector handling (counted lists of char *'s).
 **
diff -ruNp inn-2.4.2/include/inn/wire.h inn-2.4.3/include/inn/wire.h
--- inn-2.4.2/include/inn/wire.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inn/wire.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: wire.h,v 1.2 2002/12/24 05:10:38 rra Exp $
+/*  $Id: wire.h 6028 2002-12-24 05:10:39Z rra $
 **
 **  Wire format article utilities.
 **
diff -ruNp inn-2.4.2/include/inndcomm.h inn-2.4.3/include/inndcomm.h
--- inn-2.4.2/include/inndcomm.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/inndcomm.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Revision: 1.13.2.1 $
+/*  $Revision: 6786 $
 **
 **  Here be values used for communicating with the server once it is
 **  running.
diff -ruNp inn-2.4.2/include/innperl.h inn-2.4.3/include/innperl.h
--- inn-2.4.2/include/innperl.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/innperl.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: innperl.h,v 1.4 2002/03/12 20:10:46 rra Exp $
+/*  $Id: innperl.h 5302 2002-03-12 20:10:46Z rra $
 **
 **  Declarations for embedded Perl.
 */
diff -ruNp inn-2.4.2/include/libinn.h inn-2.4.3/include/libinn.h
--- inn-2.4.2/include/libinn.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/libinn.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: libinn.h,v 1.127 2003/01/19 01:15:31 rra Exp $
+/*  $Id: libinn.h 6135 2003-01-19 01:15:40Z rra $
 **
 **  Here be declarations of functions in the InterNetNews library.
 */
diff -ruNp inn-2.4.2/include/nntp.h inn-2.4.3/include/nntp.h
--- inn-2.4.2/include/nntp.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/nntp.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: nntp.h,v 1.8 2002/12/26 07:10:10 rra Exp $
+/*  $Id: nntp.h 6070 2002-12-26 07:10:10Z rra $
 **
 **  Here be a set of NNTP response codes as defined in RFC977 and elsewhere.
 **  The reponse codes are three digits, RFI, defined like this:
diff -ruNp inn-2.4.2/include/paths.h.in inn-2.4.3/include/paths.h.in
--- inn-2.4.2/include/paths.h.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/paths.h.in	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: paths.h.in,v 1.39 2001/06/30 03:54:06 rra Exp $ -*- c -*-
+/*  $Id: paths.h.in 4844 2001-06-30 03:54:06Z rra $ -*- c -*-
 **  @configure_input@
 **
 **  Here be #define's for filenames, socket names, environment variables,
diff -ruNp inn-2.4.2/include/portable/mmap.h inn-2.4.3/include/portable/mmap.h
--- inn-2.4.2/include/portable/mmap.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/portable/mmap.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: mmap.h,v 1.6 2002/12/16 11:19:21 alexk Exp $
+/*  $Id: mmap.h 6012 2002-12-16 11:19:21Z alexk $
 **
 **  Portability wrapper around <sys/mman.h>.
 **
diff -ruNp inn-2.4.2/include/portable/setproctitle.h inn-2.4.3/include/portable/setproctitle.h
--- inn-2.4.2/include/portable/setproctitle.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/portable/setproctitle.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: setproctitle.h,v 1.1 2002/08/29 05:17:55 rra Exp $
+/*  $Id: setproctitle.h 5682 2002-08-29 05:17:56Z rra $
 **
 **  Set things up for setproctitle portably.
 **
diff -ruNp inn-2.4.2/include/portable/socket.h inn-2.4.3/include/portable/socket.h
--- inn-2.4.2/include/portable/socket.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/portable/socket.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: socket.h,v 1.2 2002/04/01 07:03:01 rra Exp $
+/*  $Id: socket.h 5388 2002-04-01 07:03:01Z rra $
 **
 **  Portability wrapper around <sys/socket.h> and friends.
 **
diff -ruNp inn-2.4.2/include/portable/time.h inn-2.4.3/include/portable/time.h
--- inn-2.4.2/include/portable/time.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/portable/time.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: time.h,v 1.1 2000/10/03 01:27:13 rra Exp $
+/*  $Id: time.h 4020 2000-10-03 01:27:13Z rra $
 **
 **  Portability wrapper around <time.h> and <sys/time.h>.
 **
diff -ruNp inn-2.4.2/include/portable/wait.h inn-2.4.3/include/portable/wait.h
--- inn-2.4.2/include/portable/wait.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/portable/wait.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: wait.h,v 1.2 2002/04/09 07:21:58 rra Exp $
+/*  $Id: wait.h 5398 2002-04-09 07:21:58Z rra $
 **
 **  Portability wrapper around <sys/wait.h>.
 **
diff -ruNp inn-2.4.2/include/storage.h inn-2.4.3/include/storage.h
--- inn-2.4.2/include/storage.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/include/storage.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: storage.h,v 1.20 2002/12/07 09:47:14 rra Exp $
+/*  $Id: storage.h 5933 2002-12-07 09:47:17Z rra $
 **
 **  Here be declarations related to the storage subsystem.
 */
diff -ruNp inn-2.4.2/innd/Makefile inn-2.4.3/innd/Makefile
--- inn-2.4.2/innd/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.67.2.3 2004/07/15 02:16:13 rra Exp $
+##  $Id: Makefile 6965 2004-07-15 02:16:13Z rra $
 
 include ../Makefile.global
 
diff -ruNp inn-2.4.2/innd/art.c inn-2.4.3/innd/art.c
--- inn-2.4.2/innd/art.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/art.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: art.c,v 1.212.2.12 2004/07/16 00:43:34 rra Exp $
+/*  $Id: art.c 7410 2005-10-09 03:32:22Z eagle $
 **
 **  Article-processing.
 */
@@ -631,7 +631,7 @@ ARTparseheader(CHANNEL *cp, int size)
   if (i == HDR__BYTES)
     cp->Data.BytesHeader = header;
   hc = &hc[i];
-  if (hc->Length > 0) {
+  if (hc->Length != 0) {
     /* duplicated */
     hc->Length = -1;
   } else {
@@ -1019,12 +1019,17 @@ ARTclean(ARTDATA *data, char *buff)
   /* Make sure all the headers we need are there */
   for (i = 0; i < MAX_ARTHEADER ; i++) {
     if (hp[i].Type == HTreq) {
-      if (!HDR_FOUND(i)) {
+      if (HDR_FOUND(i))
+        continue;
+      if (hc[i].Length < 0) {
+        sprintf(buff, "%d Duplicate \"%s\" header", NNTP_REJECTIT_VAL,
+                hp[1].Name);
+      } else {
 	sprintf(buff, "%d Missing \"%s\" header", NNTP_REJECTIT_VAL,
-	  hp[i].Name);
-	TMRstop(TMR_ARTCLEAN);
-	return false;
+                hp[i].Name);
       }
+      TMRstop(TMR_ARTCLEAN);
+      return false;
     }
   }
 
@@ -1525,6 +1530,7 @@ ARTxrefslave(ARTDATA *data)
     GroupPointers[i++] = ngp;
     nogroup = false;
   }
+  GroupPointers[i] = NULL;
   if (nogroup)
     return false;
   return true;
diff -ruNp inn-2.4.2/innd/cc.c inn-2.4.3/innd/cc.c
--- inn-2.4.2/innd/cc.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/cc.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: cc.c,v 1.107.2.2 2003/12/29 05:02:53 rra Exp $
+/*  $Id: cc.c 7416 2005-10-09 04:29:52Z eagle $
 **
 **  Routines for the control channel.
 **
@@ -1800,7 +1800,12 @@ CCreader(CHANNEL *cp)
 
     memcpy (&protocol,buff,sizeof (protocol)) ;
     memcpy (&bufflen,buff + sizeof (protocol),sizeof (bufflen)) ;
-    bufflen = ntohs (bufflen) - HEADER_SIZE ;
+    bufflen = ntohs (bufflen);
+    if (bufflen < HEADER_SIZE) {
+	syslog(L_ERROR, "%s cant read CCreader bad length", LogName);
+	return;
+    }
+    bufflen -= HEADER_SIZE ;
     
     i = RECVorREAD(CCchan->fd, buff, bufflen) ;
 
@@ -1924,6 +1929,7 @@ CCsetup(void)
     int			i;
 #if	defined(HAVE_UNIX_DOMAIN_SOCKETS)
     struct sockaddr_un	server;
+    int size = 65535;
 #endif	/* defined(HAVE_UNIX_DOMAIN_SOCKETS) */
 
     if (CCpath == NULL)
@@ -1953,6 +1959,10 @@ CCsetup(void)
 	syslog(L_FATAL, "%s cant socket unbound %m", LogName);
 	exit(1);
     }
+
+    /* Increase the buffer size for the Unix domain socket */
+    if (setsockopt(CCwriter, SOL_SOCKET, SO_SNDBUF, &size, sizeof(size)) < 0)
+	syslog(L_ERROR, "%s cant setsockopt %m", LogName);
 #else
     /* Create a named pipe and open it. */
     if (mkfifo(CCpath, 0666) < 0) {
diff -ruNp inn-2.4.2/innd/chan.c inn-2.4.3/innd/chan.c
--- inn-2.4.2/innd/chan.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/chan.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: chan.c,v 1.71.2.3 2004/05/16 20:54:25 rra Exp $
+/*  $Id: chan.c 6720 2004-05-16 20:54:25Z rra $
 **
 **  I/O channel (and buffer) processing.
 */
diff -ruNp inn-2.4.2/innd/icd.c inn-2.4.3/innd/icd.c
--- inn-2.4.2/innd/icd.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/icd.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: icd.c,v 1.45 2003/01/19 20:58:02 rra Exp $
+/*  $Id: icd.c 6156 2003-01-19 20:58:05Z rra $
 **
 **  Routines to read and write the active file.
 */
diff -ruNp inn-2.4.2/innd/innd.c inn-2.4.3/innd/innd.c
--- inn-2.4.2/innd/innd.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/innd.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: innd.c,v 1.99.2.1 2004/10/01 05:10:30 rra Exp $
+/*  $Id: innd.c 6990 2004-10-01 05:10:30Z rra $
 **
 **  Variable definitions, miscellany, and main().
 */
diff -ruNp inn-2.4.2/innd/innd.h inn-2.4.3/innd/innd.h
--- inn-2.4.2/innd/innd.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/innd.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: innd.h,v 1.98.2.3 2004/05/27 18:55:23 rra Exp $
+/*  $Id: innd.h 6907 2004-05-27 18:55:23Z rra $
 **
 **  Many of the data types used here have abbreviations, such as CT
 **  for CHANNELTYPE.  Here are a list of the conventions and meanings:
diff -ruNp inn-2.4.2/innd/inndstart.c inn-2.4.3/innd/inndstart.c
--- inn-2.4.2/innd/inndstart.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/inndstart.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: inndstart.c,v 1.55.2.1 2004/01/11 23:21:54 rra Exp $
+/*  $Id: inndstart.c 6611 2004-01-11 23:21:54Z rra $
 **
 **  Open the privileged port, then exec innd.
 **
diff -ruNp inn-2.4.2/innd/keywords.c inn-2.4.3/innd/keywords.c
--- inn-2.4.2/innd/keywords.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/keywords.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: keywords.c,v 1.9 2003/03/28 01:52:34 rra Exp $
+/*  $Id: keywords.c 6269 2003-03-28 01:52:36Z rra $
 **
 **  Optional keyword generation code.
 **
diff -ruNp inn-2.4.2/innd/lc.c inn-2.4.3/innd/lc.c
--- inn-2.4.2/innd/lc.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/lc.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: lc.c,v 1.22 2003/01/19 19:58:21 rra Exp $
+/*  $Id: lc.c 6155 2003-01-19 19:58:25Z rra $
 **
 **  Routines for the local connect channel.  Create a Unix-domain stream
 **  socket that processes on the local server connect to.  Once the
diff -ruNp inn-2.4.2/innd/nc.c inn-2.4.3/innd/nc.c
--- inn-2.4.2/innd/nc.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/nc.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: nc.c,v 1.89.2.3 2004/05/16 20:54:25 rra Exp $
+/*  $Id: nc.c 7418 2005-10-09 04:37:05Z eagle $
 **
 **  Routines for the NNTP channel.  Other channels get the descriptors which
 **  we turn into NNTP channels, and over which we speak NNTP.
@@ -127,22 +127,22 @@ NCwritereply(CHANNEL *cp, const char *te
     WCHANappend(cp, text, strlen(text));	/* text in buffer */
     WCHANappend(cp, NCterm, strlen(NCterm));	/* add CR NL to text */
 
-    /* FIXME: Something is wrong with this code.  At the least, it's
-       confusing.  bp->used can be incremented without decrementing bp->left,
-       which shouldn't be allowed. */
     if (i == 0) {	/* if only data then try to write directly */
 	i = write(cp->fd, &bp->data[bp->used], bp->left);
 	if (Tracing || cp->Tracing)
 	    syslog(L_TRACE, "%s NCwritereply %d=write(%d, \"%.15s\", %lu)",
 		CHANname(cp), i, cp->fd, &bp->data[bp->used],
 		(unsigned long) bp->left);
-	if (i > 0) bp->used += i;
+	if (i > 0)
+            bp->used += i;
 	if (bp->used == bp->left) {
 	    /* all the data was written */
 	    bp->used = bp->left = 0;
 	    NCwritedone(cp);
-	}
-	else i = 0;
+	} else {
+            bp->left -= i;
+            i = 0;
+        }
     } else i = 0;
     if (i <= 0) {	/* write failed, queue it for later */
 	WCHANadd(cp);
diff -ruNp inn-2.4.2/innd/newsfeeds.c inn-2.4.3/innd/newsfeeds.c
--- inn-2.4.2/innd/newsfeeds.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/newsfeeds.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: newsfeeds.c,v 1.44 2003/01/19 20:58:02 rra Exp $
+/*  $Id: newsfeeds.c 6156 2003-01-19 20:58:05Z rra $
 **
 **  Routines for the in-core data structures for the newsfeeds file.
 */
diff -ruNp inn-2.4.2/innd/ng.c inn-2.4.3/innd/ng.c
--- inn-2.4.2/innd/ng.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/ng.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: ng.c,v 1.34.2.1 2003/10/20 01:12:50 rra Exp $
+/*  $Id: ng.c 6494 2003-10-20 01:12:50Z rra $
 **
 **  Routine for the in-core data structures for the active and newsfeeds
 **  files.
diff -ruNp inn-2.4.2/innd/perl.c inn-2.4.3/innd/perl.c
--- inn-2.4.2/innd/perl.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/perl.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: perl.c,v 1.34 2003/02/21 15:33:15 alexk Exp $
+/*  $Id: perl.c 6242 2003-02-21 15:33:15Z alexk $
 **
 **  Perl filtering support for innd.
 **
diff -ruNp inn-2.4.2/innd/proc.c inn-2.4.3/innd/proc.c
--- inn-2.4.2/innd/proc.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/proc.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: proc.c,v 1.15 2003/01/14 06:03:19 rra Exp $
+/*  $Id: proc.c 6124 2003-01-14 06:03:29Z rra $
 **
 **  Process control routines.
 */
diff -ruNp inn-2.4.2/innd/python.c inn-2.4.3/innd/python.c
--- inn-2.4.2/innd/python.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/python.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: python.c,v 1.23.2.1 2004/01/25 22:22:14 rra Exp $
+/*  $Id: python.c 6650 2004-01-25 22:22:14Z rra $
 **
 **  python.c: Embed Python in the style of innd's TCL and Perl stuff.
 ** 
diff -ruNp inn-2.4.2/innd/rc.c inn-2.4.3/innd/rc.c
--- inn-2.4.2/innd/rc.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/rc.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: rc.c,v 1.83.2.1 2003/05/11 19:40:28 rra Exp $
+/*  $Id: rc.c 7438 2005-12-11 21:22:34Z eagle $
 **
 **  Routines for the remote connect channel.  Create an Internet stream
 **  socket that processes connect to.  If the incoming site is not one of
@@ -177,10 +177,12 @@ GoodIdent(int fd, char *identd)
     }
     if (bind(ident_fd,s_local,SA_LEN(s_local)) < 0) {
 	syslog(L_ERROR, "can't bind socket for identd (%m)");
+        close(ident_fd);
 	return false;
     }
     if (connect(ident_fd,s_distant,SA_LEN(s_distant)) < 0) {
 	syslog(L_ERROR, "can't connect to identd (%m)");
+        close(ident_fd);
 	return false;
     }
 
@@ -1658,7 +1660,7 @@ RCwritelist(char *filename)
         if (*p == '/')
 	   q = p + 1;
 
-    fprintf (F, "##  $Revision: 1.83.2.1 $\n");
+    fprintf (F, "##  $Revision: 7438 $\n");
     fprintf (F, "##  %s - names and addresses that feed us news\n", q);
     free(r);
     fprintf (F, "##\n\n");
diff -ruNp inn-2.4.2/innd/site.c inn-2.4.3/innd/site.c
--- inn-2.4.2/innd/site.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/site.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: site.c,v 1.49.2.2 2004/05/16 20:26:54 rra Exp $
+/*  $Id: site.c 6716 2004-05-16 20:26:56Z rra $
 **
 **  Routines to implement site-feeding.  Mainly working with channels to
 **  do buffering and determine what to send.
diff -ruNp inn-2.4.2/innd/status.c inn-2.4.3/innd/status.c
--- inn-2.4.2/innd/status.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/status.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: status.c,v 1.34.2.2 2003/05/31 19:48:26 rra Exp $
+/*  $Id: status.c 6372 2003-05-31 19:48:28Z rra $
 **
 **  Periodic status reporting.
 */
diff -ruNp inn-2.4.2/innd/tcl.c inn-2.4.3/innd/tcl.c
--- inn-2.4.2/innd/tcl.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/tcl.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tcl.c,v 1.16 2003/01/14 06:03:20 rra Exp $
+/*  $Id: tcl.c 6124 2003-01-14 06:03:29Z rra $
 **
 **  Support for TCL things
 **
diff -ruNp inn-2.4.2/innd/util.c inn-2.4.3/innd/util.c
--- inn-2.4.2/innd/util.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/util.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: util.c,v 1.15 2003/01/19 04:13:46 rra Exp $
+/*  $Id: util.c 6138 2003-01-19 04:13:51Z rra $
 **
 **  Various miscellaneous utility functions for innd internal use.
 */
diff -ruNp inn-2.4.2/innd/wip.c inn-2.4.3/innd/wip.c
--- inn-2.4.2/innd/wip.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innd/wip.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: wip.c,v 1.19 2003/01/14 06:03:20 rra Exp $
+/* $Id: wip.c 6124 2003-01-14 06:03:29Z rra $
 **
 ** Routines for keeping track of incoming articles, articles that haven't
 ** acked from a duplex channel feed, and history caching.
diff -ruNp inn-2.4.2/innfeed/Makefile inn-2.4.3/innfeed/Makefile
--- inn-2.4.2/innfeed/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.59.2.2 2004/05/20 22:25:05 rra Exp $
+##  $Id: Makefile 6855 2004-05-20 22:25:05Z rra $
 
 include ../Makefile.global
 
diff -ruNp inn-2.4.2/innfeed/article.c inn-2.4.3/innfeed/article.c
--- inn-2.4.2/innfeed/article.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/article.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: article.c,v 1.33.2.2 2004/05/16 20:26:54 rra Exp $
+/*  $Id: article.c 7285 2005-06-07 06:38:24Z eagle $
 **
 **  The Article class for innfeed.
 **
@@ -44,6 +44,16 @@
 
 extern bool useMMap ;
 
+struct map_info_s {
+    ARTHANDLE *arthandle;
+    const void *mMapping;
+    size_t size;
+    int refCount;
+    struct map_info_s *next;
+};
+
+typedef struct map_info_s *MapInfo;
+
 struct article_s 
 {
     int refCount ;              /* the reference count on this article */
@@ -51,11 +61,10 @@ struct article_s 
     char *msgid ;               /* the msgid of the article (INN tells us) */
     Buffer contents ;           /* the buffer of the actual on disk stuff */
     Buffer *nntpBuffers ;       /* list of buffers for transmisson */
-    const void *mMapping ;      /* base of memory mapping, or NULL if none */
+    MapInfo mapInfo;		/* arthandle and mMapping */
     bool loggedMissing ;        /* true if article is missing and we logged */
     bool articleOk ;            /* true until we know otherwise. */
     bool inWireFormat ;         /* true if ->contents is \r\n/dot-escaped */
-    ARTHANDLE *arthandle ;      /* Storage manager article handle */
 } ;
 
 struct hash_entry_s {
@@ -93,7 +102,7 @@ static bool artFreeContents (Article art
                                                 its contents buffer if
                                                 possible. */
 
-static void artUnmap (Article art, size_t size) ; /* munmap an mmap()ed
+static void artUnmap (Article art) ; /* munmap an mmap()ed
                                                      article */
 
 
@@ -156,7 +165,7 @@ static unsigned int articleTotal ; /* nu
 
 static TimeoutId articleStatsId ; /* The timer callback id. */
 
-
+static MapInfo mapInfo;
 
   /*
    * Hash Table data
@@ -209,12 +218,11 @@ Article newArticle (const char *filename
       newArt->msgid = xstrdup (msgid) ;
       
       newArt->contents = NULL ;
-      newArt->mMapping = NULL ;
+      newArt->mapInfo = NULL ;
       newArt->refCount = 1 ;
       newArt->loggedMissing = false ;
       newArt->articleOk = true ;
       newArt->inWireFormat = false ;
-      newArt->arthandle = NULL;
       
       d_printf (3,"Adding a new article(%p): %s\n", (void *)newArt, msgid) ;
       
@@ -257,8 +265,8 @@ void delArticle (Article article)
 
       if (article->contents != NULL)
         {
-          if (article->mMapping)
-            artUnmap(article, bufferSize(article->contents)) ;
+          if (article->mapInfo)
+            artUnmap(article);
           else
             bytesInUse -= bufferDataSize (article->contents) ;
       
@@ -464,17 +472,67 @@ static Buffer artGetContents (Article ar
   return rval ;
 }
 
+  /* arthandle/mMapping needs to be refcounted since a buffer
+     may exist referencing it after delArticle if the remote
+     host sends the return status too soon (diablo, 439). */
+
+static MapInfo getMapInfo(ARTHANDLE *arthandle,
+		const void *mMapping, size_t size)
+{
+  MapInfo m;
+
+  for (m = mapInfo; m; m = m->next) {
+    if (m->arthandle == arthandle &&
+        m->mMapping == mMapping) {
+      m->refCount++;
+      return m;
+    }
+  }
+
+  m = xmalloc(sizeof(struct map_info_s));
+  m->refCount = 1;
+  m->arthandle = arthandle;
+  m->mMapping = mMapping;
+  m->size = size;
+  m->next = mapInfo;
+  mapInfo = m;
+
+  return m;
+}
+
+static void delMapInfo(void *vm)
+{
+    MapInfo i, prev;
+    MapInfo m = (MapInfo)vm;
 
-static void artUnmap (Article article, size_t size) {
-    
-    if (article->arthandle)
-	SMfreearticle(article->arthandle);
+    if (m == NULL)
+      return;
+
+    if (--(m->refCount) > 0)
+      return;
+
+    if (m->arthandle)
+      SMfreearticle(m->arthandle);
+    else
+      if (munmap(m->mMapping, m->size) < 0)
+	syslog (LOG_NOTICE, "munmap article: %m");
+
+    prev = NULL;
+    for (i = mapInfo; i != m; i = i->next)
+      prev = i;
+
+    if (prev)
+      prev->next = m->next;
     else
-	if (munmap(article->mMapping, size) < 0)
-	    syslog (LOG_NOTICE, "munmap %s: %m", article->fname) ;
+      mapInfo = m->next;
+
+    free(m);
+}
+
+static void artUnmap (Article article) {
 
-    article->arthandle = NULL;
-    article->mMapping = NULL ;
+    delMapInfo(article->mapInfo);
+    article->mapInfo = NULL;
 }
 
 
@@ -513,7 +571,9 @@ static bool fillContents (Article articl
     size_t idx = 0, amtToRead ;
     size_t newBufferSize ;
     HashEntry h ;
-  
+    ARTHANDLE *arthandle = NULL;
+    const void *mMapping = NULL;
+
     ASSERT (article->contents == NULL) ;
     
     TMRstart(TMR_READART);
@@ -524,9 +584,9 @@ static bool fillContents (Article articl
 	avgCharsPerLine = 75 ;      /* roughly number of characters per line */
     
     if (IsToken(article->fname)) {
-	opened = ((article->arthandle = SMretrieve(TextToToken(article->fname), RETR_ALL)) != NULL) ? true : false;
+	opened = ((arthandle = SMretrieve(TextToToken(article->fname), RETR_ALL)) != NULL) ? true : false;
 	if (opened)
-	    articlesize = article->arthandle->len;
+	    articlesize = arthandle->len;
 	else {
 	    if (SMerrno != SMERR_NOENT && SMerrno != SMERR_UNINIT) {
 		syslog(LOG_ERR, "Could not retrieve %s: %s",
@@ -540,7 +600,7 @@ static bool fillContents (Article articl
 	struct stat sb ;
 	
 	opened = ((fd = open (article->fname,O_RDONLY,0)) >= 0) ? true : false;
-	article->arthandle = NULL;
+	arthandle = NULL;
 	if (opened) {
 	    if (fstat (fd, &sb) < 0) {
 		article->articleOk = false ;
@@ -580,23 +640,27 @@ static bool fillContents (Article articl
     amtToRead = articlesize ;
     newBufferSize = articlesize ;
     
-    if (article->arthandle || useMMap) {
-	if (article->arthandle)
-	    article->mMapping = article->arthandle->data;
+    if (arthandle || useMMap) {
+	if (arthandle)
+	    mMapping = arthandle->data;
 	else 
-	    article->mMapping = mmap(NULL, articlesize, PROT_READ,
+	    mMapping = mmap(NULL, articlesize, PROT_READ,
                                      MAP_SHARED, fd, 0);
 	
-	if (article->mMapping == MAP_FAILED) {
+	if (mMapping == MAP_FAILED) {
 	    /* dunno, but revert to plain reading */
-	    article->mMapping = NULL ;
+	    mMapping = NULL ;
             syswarn ("ME mmap failure %s (%s)",
                      article->fname,
                      strerror(errno)) ;
 	} else {
-	    article->contents = newBufferByCharP(article->mMapping,
+	    article->contents = newBufferByCharP(mMapping,
 						 articlesize,
 						 articlesize);
+	    article->mapInfo = getMapInfo(arthandle, mMapping, articlesize);
+	    article->mapInfo->refCount++; /* one more for the buffer */
+	    bufferSetDeletedCbk(article->contents, delMapInfo, article->mapInfo);
+
 	    buffer = bufferBase (article->contents) ;
 	    if ((p = strchr(buffer, '\n')) == NULL) {
 		article->articleOk = false;
@@ -648,9 +712,9 @@ static bool fillContents (Article articl
 	    byteTotal += articlesize ;
 	}
 	
-	if (article->mMapping && buffer != NULL) {               
-	    memcpy(buffer, article->mMapping, articlesize);
-	    artUnmap(article, articlesize) ;
+	if (mMapping && buffer != NULL) {               
+	    memcpy(buffer, mMapping, articlesize);
+	    artUnmap(article) ;
 	    amtToRead = 0;
 	}
 	
@@ -721,7 +785,7 @@ static bool fillContents (Article articl
 
     
     /* If we're not useing storage api, we should close a valid file descriptor */
-    if (!article->arthandle && (fd >= 0))
+    if (!arthandle && (fd >= 0))
 	close (fd) ;
 
     TMRstop(TMR_READART);
@@ -814,6 +878,10 @@ static bool prepareArticleForNNTP (Artic
       nntpBuffs [0] = newBufferByCharP (bufferBase (contents),
                                         bufferDataSize (contents),
                                         bufferDataSize (contents)) ;
+      if (article->mapInfo) {
+	article->mapInfo->refCount++;
+	bufferSetDeletedCbk(nntpBuffs[0], delMapInfo, article->mapInfo);
+      }
       nntpBuffs [1] = NULL ;
     }
   
@@ -845,8 +913,8 @@ static bool artFreeContents (Article art
 
   ASSERT (bufferRefCount (art->contents) == 1) ;
 
-  if (art->mMapping)
-    artUnmap(art, bufferSize(art->contents)) ;
+  if (art->mapInfo)
+    artUnmap(art);
   else
     bytesInUse -= bufferDataSize (art->contents) ;
   
diff -ruNp inn-2.4.2/innfeed/article.h inn-2.4.3/innfeed/article.h
--- inn-2.4.2/innfeed/article.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/article.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: article.h,v 1.4.2.1 2004/01/25 20:07:10 rra Exp $
+/*  $Id: article.h 6648 2004-01-25 20:07:11Z rra $
 **
 **  The public interface to articles.
 **
diff -ruNp inn-2.4.2/innfeed/buffer.c inn-2.4.3/innfeed/buffer.c
--- inn-2.4.2/innfeed/buffer.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/buffer.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: buffer.c,v 1.16.2.1 2004/01/25 20:07:10 rra Exp $
+/*  $Id: buffer.c 7285 2005-06-07 06:38:24Z eagle $
 **
 **  The Buffer class for innfeed.
 **
@@ -32,6 +32,8 @@ struct buffer_s 
     size_t memSize ;            /* the length of mem */
     size_t dataSize ;           /* amount that has actual data in it. */
     bool deletable ;
+    void (*bufferDeletedCbk)(void *);
+    void *bufferDeletedCbkData;
     struct buffer_s *next ;
     struct buffer_s *prev ;
 };
@@ -69,6 +71,8 @@ Buffer newBuffer (size_t size)
   nb->memSize = size ;
   nb->dataSize = 0 ;
   nb->deletable = true ;
+  nb->bufferDeletedCbk = NULL;
+  nb->bufferDeletedCbkData = NULL;
 
   bufferByteCount += size + 1 ;
   bufferCount++ ;
@@ -103,6 +107,8 @@ Buffer newBufferByCharP (const char *ptr
   nb->memSize = size ;
   nb->dataSize = dataSize ;
   nb->deletable = false ;
+  nb->bufferDeletedCbk = NULL;
+  nb->bufferDeletedCbkData = NULL;
 
   nb->next = gBufferList ;
   nb->prev = NULL;
@@ -136,6 +142,12 @@ void delBuffer (Buffer buff) 
           buff->mem = NULL ;
         }
 
+      if (buff->bufferDeletedCbk) {
+        (buff->bufferDeletedCbk)(buff->bufferDeletedCbkData);
+	buff->bufferDeletedCbk = NULL;
+	buff->bufferDeletedCbkData = NULL;
+      }
+
       if (buff->next != NULL)
         buff->next->prev = buff->prev ;
       if (buff->prev != NULL)
@@ -250,6 +262,15 @@ void bufferSetDataSize (Buffer buff, siz
   ASSERT (buff->dataSize <= buff->memSize) ;
 }
 
+void bufferSetDeletedCbk (Buffer buff, void (*cbk)(void *), void *data)
+{
+  ASSERT(buff->bufferDeletedCbk == NULL &&
+	 buff->bufferDeletedCbk != cbk);
+  ASSERT(buff->bufferDeletedCbkData == NULL &&
+	 buff->bufferDeletedCbkData != data);
+  buff->bufferDeletedCbk = cbk;
+  buff->bufferDeletedCbkData = data;
+}
 
 void freeBufferArray (Buffer *buffs)
 {
diff -ruNp inn-2.4.2/innfeed/buffer.h inn-2.4.3/innfeed/buffer.h
--- inn-2.4.2/innfeed/buffer.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/buffer.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: buffer.h,v 1.3.2.1 2004/01/25 20:07:10 rra Exp $
+/*  $Id: buffer.h 7285 2005-06-07 06:38:24Z eagle $
 **
 **  The public interface to the Buffer class.
 **
@@ -72,6 +72,9 @@ void bufferDecrDataSize (Buffer buff, si
 
 /* set the size of the data actually in the buffer */
 void bufferSetDataSize (Buffer buff, size_t size) ;
+
+/* callback to be called when buffer gets deleted */
+void bufferSetDeletedCbk (Buffer buff, void (*cbk)(void *), void *data);
 
 /* walk down the BUFFS releasing each buffer and then freeing BUFFS itself */
 void freeBufferArray (Buffer *buffs) ;
diff -ruNp inn-2.4.2/innfeed/config_l.c inn-2.4.3/innfeed/config_l.c
--- inn-2.4.2/innfeed/config_l.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/config_l.c	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /proj/cvs/isc/inn/inn/innfeed/config_l.c,v 1.11 2003/01/19 19:42:22 rra Exp $
+ * $Header$
  */
 
 #define FLEX_SCANNER
@@ -409,7 +409,7 @@ char *yytext;
 #line 1 "configfile.l"
 #define INITIAL 0
 #line 2 "configfile.l"
-/*  $Id: config_l.c,v 1.11 2003/01/19 19:42:22 rra Exp $
+/*  $Id: config_l.c 6145 2003-01-19 19:42:22Z rra $
 **
 **  A flex input file for the innfeed config file.
 **
diff -ruNp inn-2.4.2/innfeed/configfile.h inn-2.4.3/innfeed/configfile.h
--- inn-2.4.2/innfeed/configfile.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/configfile.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: configfile.h,v 1.5 2002/10/07 07:36:10 rra Exp $
+/*  $Id: configfile.h 5801 2002-10-07 07:36:12Z rra $
 **
 **  Interface to innfeed's configuration file parser.
 **
diff -ruNp inn-2.4.2/innfeed/configfile.l inn-2.4.3/innfeed/configfile.l
--- inn-2.4.2/innfeed/configfile.l	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/configfile.l	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 %{
-/*  $Id: configfile.l,v 1.9 2003/01/19 19:42:22 rra Exp $
+/*  $Id: configfile.l 6145 2003-01-19 19:42:22Z rra $
 **
 **  A flex input file for the innfeed config file.
 **
diff -ruNp inn-2.4.2/innfeed/configfile.y inn-2.4.3/innfeed/configfile.y
--- inn-2.4.2/innfeed/configfile.y	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/configfile.y	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 %{
-/*  $Id: configfile.y,v 1.17.2.1 2003/05/31 19:48:26 rra Exp $
+/*  $Id: configfile.y 6372 2003-05-31 19:48:28Z rra $
 **
 **  A yacc input file for the innfeed config file.
 **
diff -ruNp inn-2.4.2/innfeed/connection.c inn-2.4.3/innfeed/connection.c
--- inn-2.4.2/innfeed/connection.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/connection.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: connection.c,v 1.57.2.2 2004/10/01 06:08:09 rra Exp $
+/*  $Id: connection.c 6998 2004-10-01 06:08:09Z rra $
 **
 **  The implementation of the innfeed Connection class.
 **
diff -ruNp inn-2.4.2/innfeed/connection.h inn-2.4.3/innfeed/connection.h
--- inn-2.4.2/innfeed/connection.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/connection.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: connection.h,v 1.5.2.1 2004/01/25 20:07:10 rra Exp $
+/*  $Id: connection.h 6648 2004-01-25 20:07:11Z rra $
 **
 **  The public interface to the Connection class.
 **
diff -ruNp inn-2.4.2/innfeed/endpoint.c inn-2.4.3/innfeed/endpoint.c
--- inn-2.4.2/innfeed/endpoint.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/endpoint.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: endpoint.c,v 1.31.2.1 2004/01/25 20:07:10 rra Exp $
+/*  $Id: endpoint.c 6648 2004-01-25 20:07:11Z rra $
 **
 **  The implementation of the innfeed EndPoint object class.
 **
diff -ruNp inn-2.4.2/innfeed/endpoint.h inn-2.4.3/innfeed/endpoint.h
--- inn-2.4.2/innfeed/endpoint.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/endpoint.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: endpoint.h,v 1.4.2.1 2004/01/25 20:07:10 rra Exp $
+/*  $Id: endpoint.h 6648 2004-01-25 20:07:11Z rra $
 **
 **  The public interface to the Endpoint class.
 **
diff -ruNp inn-2.4.2/innfeed/host.c inn-2.4.3/innfeed/host.c
--- inn-2.4.2/innfeed/host.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/host.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: host.c,v 1.70.2.2 2004/06/29 22:44:03 rra Exp $
+/*  $Id: host.c 6958 2004-06-29 22:44:03Z rra $
 **
 **  The implementation of the innfeed Host class.
 **
diff -ruNp inn-2.4.2/innfeed/host.h inn-2.4.3/innfeed/host.h
--- inn-2.4.2/innfeed/host.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/host.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: host.h,v 1.13.2.1 2004/01/25 20:07:10 rra Exp $
+/*  $Id: host.h 6648 2004-01-25 20:07:11Z rra $
 **
 **  The public interface to the Host class.
 **
diff -ruNp inn-2.4.2/innfeed/imap_connection.c inn-2.4.3/innfeed/imap_connection.c
--- inn-2.4.2/innfeed/imap_connection.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/imap_connection.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: imap_connection.c,v 1.25.2.1 2004/05/16 20:26:55 rra Exp $
+/*  $Id: imap_connection.c 7103 2004-12-23 22:36:27Z rra $
 **
 **  Feed articles to an IMAP server via LMTP and IMAP.
 **
@@ -2447,12 +2447,12 @@ static conn_ret imap_sendAuthStep(connec
 
 static conn_ret imap_sendAuthenticate(connection_t *cxn)
 {
-    const char *mechusing;
     int result;
 
     char *p;
 
 #ifdef HAVE_SASL
+    const char *mechusing;
     char *inbase64;
     int inbase64len;
     int saslresult=SASL_NOMECH;
@@ -2523,7 +2523,6 @@ static conn_ret imap_sendAuthenticate(co
 		 sasl_errstring(saslresult, NULL, NULL), mechusing);
 	return RET_FAIL;
     }
-#endif /* HAVE_SASL */
 
     d_printf(1,"%s:%d:IMAP Trying to authenticate to imap with %s mechanism\n",
 	     hostPeerName (cxn->myHost), cxn->ident,
@@ -2538,6 +2537,7 @@ static conn_ret imap_sendAuthenticate(co
     cxn->imap_state = IMAP_WRITING_STARTAUTH;
 
     return RET_OK;
+#endif /* HAVE_SASL */
 }
 
 static conn_ret imap_CreateGroup(connection_t *cxn, char *bboard)
diff -ruNp inn-2.4.2/innfeed/innfeed-convcfg.in inn-2.4.3/innfeed/innfeed-convcfg.in
--- inn-2.4.2/innfeed/innfeed-convcfg.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/innfeed-convcfg.in	Mon Mar 20 04:14:57 2006
@@ -4,7 +4,7 @@
 # Start Date:   Sun, 19 Jan 1997 21:19:24 +0100
 # Project:      INN (innfeed)
 # File:         innfeed-convcfg.in
-# RCSId:        $Id: innfeed-convcfg.in,v 1.2 1999/11/15 06:37:43 rra Exp $
+# RCSId:        $Id: innfeed-convcfg.in 2680 1999-11-15 06:37:43Z rra $
 # Description:  Read in a old version of innfeed.conf on the command line 
 #		or on stdin, and write a new version on stdout.
 # 
diff -ruNp inn-2.4.2/innfeed/innfeed.h inn-2.4.3/innfeed/innfeed.h
--- inn-2.4.2/innfeed/innfeed.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/innfeed.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: innfeed.h,v 1.10.2.1 2004/01/25 20:07:10 rra Exp $
+/*  $Id: innfeed.h 6648 2004-01-25 20:07:11Z rra $
 **
 **  innfeed's configuration values.
 **
diff -ruNp inn-2.4.2/innfeed/innlistener.c inn-2.4.3/innfeed/innlistener.c
--- inn-2.4.2/innfeed/innlistener.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/innlistener.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: innlistener.c,v 1.30.2.2 2004/05/16 20:26:55 rra Exp $
+/*  $Id: innlistener.c 6716 2004-05-16 20:26:56Z rra $
 **
 **  The implementation of the innfeed InnListener class.
 **
diff -ruNp inn-2.4.2/innfeed/innlistener.h inn-2.4.3/innfeed/innlistener.h
--- inn-2.4.2/innfeed/innlistener.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/innlistener.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: innlistener.h,v 1.3.2.1 2004/01/25 20:07:10 rra Exp $
+/*  $Id: innlistener.h 6648 2004-01-25 20:07:11Z rra $
 **
 **  The public interface to the InnListener class.
 **
diff -ruNp inn-2.4.2/innfeed/main.c inn-2.4.3/innfeed/main.c
--- inn-2.4.2/innfeed/main.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/main.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: main.c,v 1.47.2.4 2004/06/29 22:41:35 rra Exp $
+/*  $Id: main.c 6956 2004-06-29 22:41:35Z rra $
 **
 **  Main routines for the innfeed program.
 **
diff -ruNp inn-2.4.2/innfeed/misc.c inn-2.4.3/innfeed/misc.c
--- inn-2.4.2/innfeed/misc.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/misc.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: misc.c,v 1.29.2.1 2004/01/25 20:07:10 rra Exp $
+/*  $Id: misc.c 7420 2005-10-09 04:40:13Z eagle $
 **
 **  Helper routines for the innfeed program.
 **
@@ -154,7 +154,7 @@ void logOrPrint (int level, FILE *fp, co
       char buffer [512] ;      /* gag me */
 
       vsnprintf (buffer,sizeof (buffer),fmt,ap) ;
-      syslog (level,buffer) ;
+      syslog (level,"%s",buffer) ;
     }
   va_end (ap) ;
 }
diff -ruNp inn-2.4.2/innfeed/misc.h inn-2.4.3/innfeed/misc.h
--- inn-2.4.2/innfeed/misc.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/misc.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: misc.h,v 1.15.2.1 2004/01/25 20:07:10 rra Exp $
+/*  $Id: misc.h 6648 2004-01-25 20:07:11Z rra $
 **
 **  Miscellaneous utility functions for innfeed.
 **
diff -ruNp inn-2.4.2/innfeed/procbatch.in inn-2.4.3/innfeed/procbatch.in
--- inn-2.4.2/innfeed/procbatch.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/procbatch.in	Mon Mar 20 04:14:57 2006
@@ -5,7 +5,7 @@
 # Start Date:   Thu May 16 10:32:02 1996 +0200
 # Project:      INN -- innfeed
 # File:         procbatch.pl
-# RCSId:        $Id: procbatch.in,v 1.4.4.1 2004/01/25 20:07:10 rra Exp $
+# RCSId:        $Id: procbatch.in 6648 2004-01-25 20:07:11Z rra $
 #
 # Description: Take a file of the form generated by innd in the out.going
 #	       directory ("Wnm*") and separate it into tape files for inn.
diff -ruNp inn-2.4.2/innfeed/startinnfeed.c inn-2.4.3/innfeed/startinnfeed.c
--- inn-2.4.2/innfeed/startinnfeed.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/startinnfeed.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: startinnfeed.c,v 1.23.2.1 2004/12/19 21:49:18 rra Exp $
+/*  $Id: startinnfeed.c 7065 2004-12-19 21:49:18Z rra $
 **
 **  Raise system limits and exec innfeed.
 **
diff -ruNp inn-2.4.2/innfeed/tape.c inn-2.4.3/innfeed/tape.c
--- inn-2.4.2/innfeed/tape.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/tape.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tape.c,v 1.26.2.2 2004/05/16 20:26:55 rra Exp $
+/*  $Id: tape.c 6716 2004-05-16 20:26:56Z rra $
 **
 **  The implementation of the innfeed Tape class.
 **
diff -ruNp inn-2.4.2/innfeed/tape.h inn-2.4.3/innfeed/tape.h
--- inn-2.4.2/innfeed/tape.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/tape.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tape.h,v 1.3.2.1 2004/01/25 20:07:11 rra Exp $
+/*  $Id: tape.h 6648 2004-01-25 20:07:11Z rra $
 **
 **  The public interface to the Tape class.
 **
diff -ruNp inn-2.4.2/innfeed/testListener.pl inn-2.4.3/innfeed/testListener.pl
--- inn-2.4.2/innfeed/testListener.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/innfeed/testListener.pl	Mon Mar 20 04:14:57 2006
@@ -4,7 +4,7 @@
 # Start Date:   Wed Jan  3 00:09:01 1996
 # Project:      INN -- innfeed
 # File:         testListener.pl
-# RCSId:        $Id: testListener.pl,v 1.1.1.1 1997/04/29 16:13:32 scrappy Exp $
+# RCSId:        $Id: testListener.pl 6312 2003-05-04 21:40:11Z rra $
 # Description:  Generate news files for testing the innfeed feeder.
 #
 #               Run like this:
diff -ruNp inn-2.4.2/lib/Makefile inn-2.4.3/lib/Makefile
--- inn-2.4.2/lib/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.106.2.2 2004/05/18 01:18:56 rra Exp $
+##  $Id: Makefile 6806 2004-05-18 01:18:57Z rra $
 
 include ../Makefile.global
 
diff -ruNp inn-2.4.2/lib/buffer.c inn-2.4.3/lib/buffer.c
--- inn-2.4.2/lib/buffer.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/buffer.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: buffer.c,v 1.2 2002/05/06 05:40:44 rra Exp $
+/*  $Id: buffer.c 5463 2002-05-06 05:40:46Z rra $
 **
 **  Counted, reusable memory buffer.
 **
diff -ruNp inn-2.4.2/lib/cleanfrom.c inn-2.4.3/lib/cleanfrom.c
--- inn-2.4.2/lib/cleanfrom.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/cleanfrom.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: cleanfrom.c,v 1.7 2003/01/19 01:15:33 rra Exp $
+/*  $Id: cleanfrom.c 6135 2003-01-19 01:15:40Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/lib/clientactive.c inn-2.4.3/lib/clientactive.c
--- inn-2.4.2/lib/clientactive.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/clientactive.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: clientactive.c,v 1.18 2003/01/19 01:15:33 rra Exp $
+/*  $Id: clientactive.c 6135 2003-01-19 01:15:40Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/lib/clientlib.c inn-2.4.3/lib/clientlib.c
--- inn-2.4.2/lib/clientlib.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/clientlib.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: clientlib.c,v 1.15 2003/01/19 19:58:22 rra Exp $
+/*  $Id: clientlib.c 6155 2003-01-19 19:58:25Z rra $
 **
 **  Routines compatible with the NNTP "clientlib" routines.
 */
diff -ruNp inn-2.4.2/lib/concat.c inn-2.4.3/lib/concat.c
--- inn-2.4.2/lib/concat.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/concat.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: concat.c,v 1.7 2000/12/21 03:43:02 rra Exp $
+/*  $Id: concat.c 4234 2000-12-21 03:43:02Z rra $
 **
 **  Concatenate strings with dynamic memory allocation.
 **
diff -ruNp inn-2.4.2/lib/conffile.c inn-2.4.3/lib/conffile.c
--- inn-2.4.2/lib/conffile.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/conffile.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: conffile.c,v 1.22.2.1 2004/05/16 23:01:23 rra Exp $
+/*  $Id: conffile.c 6733 2004-05-16 23:01:23Z rra $
 **
 **  Routines for reading in incoming.conf-style config files.
 */
diff -ruNp inn-2.4.2/lib/confparse.c inn-2.4.3/lib/confparse.c
--- inn-2.4.2/lib/confparse.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/confparse.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: confparse.c,v 1.13 2003/01/19 01:15:33 rra Exp $
+/*  $Id: confparse.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Parse a standard block-structured configuration file syntax.
 **
diff -ruNp inn-2.4.2/lib/daemonize.c inn-2.4.3/lib/daemonize.c
--- inn-2.4.2/lib/daemonize.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/daemonize.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: daemonize.c,v 1.4.2.1 2003/07/12 19:13:49 rra Exp $
+/*  $Id: daemonize.c 6395 2003-07-12 19:13:49Z rra $
 **
 **  Become a long-running daemon.
 **
diff -ruNp inn-2.4.2/lib/date.c inn-2.4.3/lib/date.c
--- inn-2.4.2/lib/date.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/date.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: date.c,v 1.12 2003/01/19 01:15:33 rra Exp $
+/*  $Id: date.c 7136 2005-03-11 19:18:27Z rra $
 **
 **  Date parsing and conversion routines.
 **
@@ -544,7 +544,7 @@ parsedate_rfc2822(const char *date)
     int zone_sign;
     long zone_offset;
     struct tm tm;
-    int values[7];
+    int values[8];
     time_t result;
 
     /* The basic rules.  Note that we don't bother to check whether the day of
diff -ruNp inn-2.4.2/lib/dbz.c inn-2.4.3/lib/dbz.c
--- inn-2.4.2/lib/dbz.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/dbz.c	Mon Mar 20 04:14:57 2006
@@ -838,7 +838,7 @@ dbzclose(void)
 	ret = false;
     }
 
-    debug("dbzclose: %s", (ret == 0) ? "succeeded" : "failed");
+    debug("dbzclose: %s", (ret == true) ? "succeeded" : "failed");
     if (ret)
 	opendb = false;
     return ret;
@@ -1238,9 +1238,9 @@ putconf(FILE *f, dbzconfig *cp)
     return ret;
 }
 
-/* getcore - try to set up an in-core copy of .pag file
+/* getcore - try to set up an in-core copy of file
  *
- * Returns: pointer to copy of .pag or NULL on errror
+ * Returns: pointer to copy of file or NULL on errror
  */
 static bool
 getcore(hash_table *tab)
@@ -1249,6 +1249,7 @@ getcore(hash_table *tab)
     int nread;
     int i;
     struct stat st;
+    size_t length = conf.tsize * tab->reclen;
 
     if (tab->incore == INCORE_MMAP) {
 #if defined(HAVE_MMAP)
@@ -1256,39 +1257,38 @@ getcore(hash_table *tab)
 	    syswarn("dbz: getcore: fstat failed");
 	    return false;
 	}
-	if ((conf.tsize * tab->reclen) > st.st_size) {
+	if (length > st.st_size) {
 	    /* file too small; extend it */
-	    if (ftruncate(tab->fd, conf.tsize * tab->reclen) == -1) {
+	    if (ftruncate(tab->fd, length) == -1) {
 		syswarn("dbz: getcore: ftruncate failed");
 		return false;
 	    }
 	}
-	it = mmap(NULL, (size_t)conf.tsize * tab->reclen,
-                  readonly ? PROT_READ : PROT_WRITE | PROT_READ, MAP_SHARED,
-                  tab->fd, 0);
+	it = mmap(NULL, length, readonly ? PROT_READ : PROT_WRITE | PROT_READ,
+                  MAP_SHARED, tab->fd, 0);
 	if (it == (char *)-1) {
 	    syswarn("dbz: getcore: mmap failed");
 	    return false;
 	}
 #if defined (MADV_RANDOM) && defined(HAVE_MADVISE)
 	/* not present in all versions of mmap() */
-	madvise(it, (size_t)conf.tsize * sizeof(tab->reclen), MADV_RANDOM);
+	madvise(it, length, MADV_RANDOM);
 #endif
 #else
 	warn("dbz: getcore: can't mmap files");
 	return false;
 #endif
     } else {
-	it = xmalloc(conf.tsize * tab->reclen);
+	it = xmalloc(length);
 	
-	nread = read(tab->fd, it, tab->reclen * conf.tsize);
+	nread = read(tab->fd, it, length);
 	if (nread < 0) {
 	    syswarn("dbz: getcore: read failed");
 	    free(it);
 	    return false;
 	}
 	
-	i = (size_t)(conf.tsize * tab->reclen) - nread;
+	i = length - nread;
 	memset(it + nread, '\0', i);
     }
 
@@ -1639,27 +1639,36 @@ timediffms(struct timeval start, struct 
 void
 RemoveDBZ(char *filename)
 {
-    char fn[1024];
+    char *fn;
 
-#ifdef	DO_TAGGED_HASH
-    snprintf(fn, sizeof(fn), "%s.pag", filename);
+#ifdef DO_TAGGED_HASH
+    fn = concat(filename, pag, (char *) 0);
     unlink(fn);
+    free(fn);
 #else
-    snprintf(fn, sizeof(fn), "%s.exists", filename);
+    fn = concat(filename, exists, (char *) 0);
     unlink(fn);
-    snprintf(fn, sizeof(fn), "%s.index", filename);
+    free(fn);
+    fn = concat(filename, idx, (char *) 0);
     unlink(fn);
+    free(fn);
 #endif
-    snprintf(fn, sizeof(fn), "%s.dir", filename);
+    fn = concat(filename, dir, (char *) 0);
     unlink(fn);
+    free(fn);
 }
 
 static void
 usage(void)
 {
-    fprintf(stderr, "usage: dbztest [-i] [-n|m] [-s size] <history>\n");
+    fprintf(stderr, "usage: dbztest [-i] [-n|m] [-N] [-s size] <history>\n");
+#ifdef DO_TAGGED_HASH
     fprintf(stderr, "  -i       initialize history. deletes .pag files\n");
-    fprintf(stderr, "  -n or m  use INCORE_NO, INCORE_/MMAP. default = INCORE_MEM\n");
+#else
+    fprintf(stderr, "  -i       initialize history. deletes .exists and .index files\n");
+#endif
+    fprintf(stderr, "  -n or m  use INCORE_NO, INCORE_MMAP. default = INCORE_MEM\n");
+    fprintf(stderr, "  -N       using nfswriter mode\n");
     fprintf(stderr, "  -s size  number of history lines[2500000]\n");
     fprintf(stderr, "  history  history text file\n");
     exit(1);
@@ -1680,11 +1689,15 @@ main(int argc, char *argv[])
     struct timeval start, end;
     off_t ivalue;
 
+    innconf = xcalloc(1, sizeof(struct innconf));
+
     for (i=1; i<argc; i++)
 	if (strcmp(argv[i], "-i") == 0)
 	    initialize = 1;
 	else if (strcmp(argv[i], "-n") == 0)
 	    incore = INCORE_NO;
+        else if (strcmp(argv[i], "-N") == 0)
+            innconf->nfswriter = true;
 	else if (strcmp(argv[i], "-m") == 0)
 #if defined(HAVE_MMAP)
 	    incore = INCORE_MMAP;
@@ -1743,7 +1756,7 @@ main(int argc, char *argv[])
 	else
 	    continue;
 	if (initialize) {
-	    if (dbzstore(key, where) < 0) {
+	    if (dbzstore(key, where) == DBZSTORE_ERROR) {
 		fprintf(stderr, "cant store %s\n", ibuf);
 		exit(1);
 	    }
@@ -1754,6 +1767,7 @@ main(int argc, char *argv[])
 		}
 	}
     }
+    line--;
     gettimeofday(&end, NULL);
     i = timediffms(start, end);
     printf("%s: %d lines %.3f msec/id\n",
diff -ruNp inn-2.4.2/lib/defdist.c inn-2.4.3/lib/defdist.c
--- inn-2.4.2/lib/defdist.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/defdist.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: defdist.c,v 1.15 2003/01/19 01:15:33 rra Exp $
+/*  $Id: defdist.c 6135 2003-01-19 01:15:40Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/lib/fdflags.c inn-2.4.3/lib/fdflags.c
--- inn-2.4.2/lib/fdflags.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/fdflags.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: fdflags.c,v 1.2 2001/05/14 03:52:34 rra Exp $
+/*  $Id: fdflags.c 4740 2001-05-14 03:52:34Z rra $
 **
 **  Set or clear file descriptor flags.
 **
diff -ruNp inn-2.4.2/lib/fdlimit.c inn-2.4.3/lib/fdlimit.c
--- inn-2.4.2/lib/fdlimit.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/fdlimit.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: fdlimit.c,v 1.8 2001/02/07 23:41:08 rra Exp $
+/*  $Id: fdlimit.c 4511 2001-02-07 23:41:08Z rra $
 **
 **  Portably determine or set the limit on open file descriptors.
 **
diff -ruNp inn-2.4.2/lib/fseeko.c inn-2.4.3/lib/fseeko.c
--- inn-2.4.2/lib/fseeko.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/fseeko.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: fseeko.c,v 1.1 2000/07/29 22:54:52 rra Exp $
+/*  $Id: fseeko.c 3680 2000-07-29 22:54:52Z rra $
 **
 **  Replacement for a missing fseeko.
 **
diff -ruNp inn-2.4.2/lib/ftello.c inn-2.4.3/lib/ftello.c
--- inn-2.4.2/lib/ftello.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/ftello.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: ftello.c,v 1.1 2000/07/29 22:55:18 rra Exp $
+/*  $Id: ftello.c 3681 2000-07-29 22:55:18Z rra $
 **
 **  Replacement for a missing ftello.
 **
diff -ruNp inn-2.4.2/lib/genid.c inn-2.4.3/lib/genid.c
--- inn-2.4.2/lib/genid.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/genid.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: genid.c,v 1.10 2003/01/19 01:15:33 rra Exp $
+/*  $Id: genid.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Generate a message ID.
 */
diff -ruNp inn-2.4.2/lib/getfqdn.c inn-2.4.3/lib/getfqdn.c
--- inn-2.4.2/lib/getfqdn.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/getfqdn.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: getfqdn.c,v 1.10 2003/01/19 19:58:22 rra Exp $
+/*  $Id: getfqdn.c 6155 2003-01-19 19:58:25Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/lib/getmodaddr.c inn-2.4.3/lib/getmodaddr.c
--- inn-2.4.2/lib/getmodaddr.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/getmodaddr.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: getmodaddr.c,v 1.22 2003/01/19 19:58:22 rra Exp $
+/*  $Id: getmodaddr.c 6155 2003-01-19 19:58:25Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/lib/getpagesize.c inn-2.4.3/lib/getpagesize.c
--- inn-2.4.2/lib/getpagesize.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/getpagesize.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: getpagesize.c,v 1.1 2002/08/17 21:29:35 rra Exp $
+/*  $Id: getpagesize.c 5596 2002-08-17 21:29:35Z rra $
 **
 **  Replacement for a missing getpagesize.
 **
diff -ruNp inn-2.4.2/lib/gettime.c inn-2.4.3/lib/gettime.c
--- inn-2.4.2/lib/gettime.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/gettime.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: gettime.c,v 1.6 2000/10/19 16:38:13 kondou Exp $
+/*  $Id: gettime.c 4135 2000-10-19 16:38:13Z kondou $
 **
 **  Find and return time information portably.
 */
diff -ruNp inn-2.4.2/lib/hashtab.c inn-2.4.3/lib/hashtab.c
--- inn-2.4.2/lib/hashtab.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/hashtab.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: hashtab.c,v 1.4 2003/01/19 01:15:34 rra Exp $
+/*  $Id: hashtab.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Generic hash table implementation.
 **
diff -ruNp inn-2.4.2/lib/hstrerror.c inn-2.4.3/lib/hstrerror.c
--- inn-2.4.2/lib/hstrerror.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/hstrerror.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: hstrerror.c,v 1.4 2002/08/11 22:23:14 rra Exp $
+/*  $Id: hstrerror.c 5556 2002-08-11 22:23:14Z rra $
 **
 **  Replacement for a missing hstrerror.
 **
diff -ruNp inn-2.4.2/lib/inet_aton.c inn-2.4.3/lib/inet_aton.c
--- inn-2.4.2/lib/inet_aton.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/inet_aton.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: inet_aton.c,v 1.5 2001/12/12 09:06:00 rra Exp $
+/*  $Id: inet_aton.c 5049 2001-12-12 09:06:00Z rra $
 **
 **  Replacement for a missing inet_aton.
 **
diff -ruNp inn-2.4.2/lib/inet_ntoa.c inn-2.4.3/lib/inet_ntoa.c
--- inn-2.4.2/lib/inet_ntoa.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/inet_ntoa.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: inet_ntoa.c,v 1.6 2001/12/12 09:06:00 rra Exp $
+/*  $Id: inet_ntoa.c 5049 2001-12-12 09:06:00Z rra $
 **
 **  Replacement for a missing or broken inet_ntoa.
 **
diff -ruNp inn-2.4.2/lib/innconf.c inn-2.4.3/lib/innconf.c
--- inn-2.4.2/lib/innconf.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/innconf.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: innconf.c,v 1.13.2.2 2004/05/16 20:18:43 rra Exp $
+/*  $Id: innconf.c 7471 2005-12-15 04:53:16Z eagle $
 **
 **  Manage the global innconf struct.
 **
diff -ruNp inn-2.4.2/lib/inndcomm.c inn-2.4.3/lib/inndcomm.c
--- inn-2.4.2/lib/inndcomm.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/inndcomm.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: inndcomm.c,v 1.24.2.1 2004/05/17 08:52:15 rra Exp $
+/*  $Id: inndcomm.c 7414 2005-10-09 03:58:19Z eagle $
 **
 **  Library routines to let other programs control innd.
 */
@@ -27,8 +27,6 @@
 #include "libinn.h"
 #include "paths.h"
 
-#define MIN_BUFFER_SIZE		4096
-
 static char			*ICCsockname = NULL;
 #ifdef HAVE_UNIX_DOMAIN_SOCKETS
 static struct sockaddr_un	ICCserv;
@@ -56,6 +54,7 @@ int
 ICCopen(void)
 {
     int mask, oerrno, fd;
+    int size = 65535;
 
     if (innconf == NULL) {
 	if (!innconf_read(NULL)) {
@@ -90,6 +89,11 @@ ICCopen(void)
 	ICCfailure = "socket";
 	return -1;
     }
+
+    /* Adjust the socket buffer size to accomodate large responses.  Ignore
+       failure; the message may fit anyway, and if not, we'll fail below. */
+    setsockopt(ICCfd, SOL_SOCKET, SO_RCVBUF, &size, sizeof(size));
+
     memset(&ICCclient, 0, sizeof ICCclient);
     ICCclient.sun_family = AF_UNIX;
     strlcpy(ICCclient.sun_path, ICCsockname, sizeof(ICCclient.sun_path));
diff -ruNp inn-2.4.2/lib/list.c inn-2.4.3/lib/list.c
--- inn-2.4.2/lib/list.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/list.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: list.c,v 1.1 2003/01/21 06:25:43 alexk Exp $
+/*  $Id: list.c 6168 2003-01-21 06:27:32Z alexk $
 **
 */
 
diff -ruNp inn-2.4.2/lib/localopen.c inn-2.4.3/lib/localopen.c
--- inn-2.4.2/lib/localopen.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/localopen.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: localopen.c,v 1.13 2003/01/19 19:58:22 rra Exp $
+/*  $Id: localopen.c 6155 2003-01-19 19:58:25Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/lib/lockfile.c inn-2.4.3/lib/lockfile.c
--- inn-2.4.2/lib/lockfile.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/lockfile.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: lockfile.c,v 1.11 2002/12/20 00:19:58 rra Exp $
+/*  $Id: lockfile.c 6020 2002-12-20 00:19:58Z rra $
 **
 **  Lock a file or a range in a file.
 **
diff -ruNp inn-2.4.2/lib/md5.c inn-2.4.3/lib/md5.c
--- inn-2.4.2/lib/md5.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/md5.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: md5.c,v 1.9 2000/10/31 16:28:52 kondou Exp $
+/*  $Id: md5.c 4154 2000-10-31 16:28:53Z kondou $
 **
 **  RSA Data Security, Inc. MD5 Message-Digest Algorithm
 **
diff -ruNp inn-2.4.2/lib/memcmp.c inn-2.4.3/lib/memcmp.c
--- inn-2.4.2/lib/memcmp.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/memcmp.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: memcmp.c,v 1.7 2001/12/12 09:06:00 rra Exp $
+/*  $Id: memcmp.c 5049 2001-12-12 09:06:00Z rra $
 **
 **  Replacement for a missing or broken memcmp.
 **
diff -ruNp inn-2.4.2/lib/messages.c inn-2.4.3/lib/messages.c
--- inn-2.4.2/lib/messages.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/messages.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: messages.c,v 1.3 2002/06/07 13:59:06 alexk Exp $
+/* $Id: messages.c 5496 2002-06-07 13:59:06Z alexk $
 **
 **  Message and error reporting (possibly fatal).
 **
diff -ruNp inn-2.4.2/lib/mkstemp.c inn-2.4.3/lib/mkstemp.c
--- inn-2.4.2/lib/mkstemp.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/mkstemp.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: mkstemp.c,v 1.1 2002/03/17 07:39:14 rra Exp $
+/*  $Id: mkstemp.c 5329 2002-03-17 07:39:14Z rra $
 **
 **  Replacement for a missing mkstemp.
 **
diff -ruNp inn-2.4.2/lib/mmap.c inn-2.4.3/lib/mmap.c
--- inn-2.4.2/lib/mmap.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/mmap.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: mmap.c,v 1.3 2002/08/18 22:20:10 rra Exp $
+/*  $Id: mmap.c 5607 2002-08-18 22:20:10Z rra $
 **
 **  MMap manipulation routines
 **
diff -ruNp inn-2.4.2/lib/parsedate.y inn-2.4.3/lib/parsedate.y
--- inn-2.4.2/lib/parsedate.y	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/parsedate.y	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 %{
-/*  $Id: parsedate.y,v 1.18.2.1 2003/05/31 19:48:26 rra Exp $
+/*  $Id: parsedate.y 6372 2003-05-31 19:48:28Z rra $
 **
 **  Originally written by Steven M. Bellovin <smb@research.att.com> while
 **  at the University of North Carolina at Chapel Hill.  Later tweaked by
diff -ruNp inn-2.4.2/lib/perl.c inn-2.4.3/lib/perl.c
--- inn-2.4.2/lib/perl.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/perl.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: perl.c,v 1.23 2003/01/19 01:15:34 rra Exp $
+/*  $Id: perl.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  Embedded Perl support for INN.
 **
diff -ruNp inn-2.4.2/lib/pread.c inn-2.4.3/lib/pread.c
--- inn-2.4.2/lib/pread.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/pread.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: pread.c,v 1.6 2001/12/12 09:06:00 rra Exp $
+/*  $Id: pread.c 5049 2001-12-12 09:06:00Z rra $
 **
 **  Replacement for a missing pread.
 **
diff -ruNp inn-2.4.2/lib/pwrite.c inn-2.4.3/lib/pwrite.c
--- inn-2.4.2/lib/pwrite.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/pwrite.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: pwrite.c,v 1.6 2001/12/12 09:06:00 rra Exp $
+/*  $Id: pwrite.c 5049 2001-12-12 09:06:00Z rra $
 **
 **  Replacement for a missing pwrite.
 **
diff -ruNp inn-2.4.2/lib/qio.c inn-2.4.3/lib/qio.c
--- inn-2.4.2/lib/qio.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/qio.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: qio.c,v 1.8.2.3 2004/06/10 22:20:24 hkehoe Exp $
+/*  $Id: qio.c 6943 2004-06-10 22:20:24Z hkehoe $
 **
 **  Quick I/O package.
 **
diff -ruNp inn-2.4.2/lib/radix32.c inn-2.4.3/lib/radix32.c
--- inn-2.4.2/lib/radix32.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/radix32.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: radix32.c,v 1.5 2003/01/13 06:44:23 rra Exp $
+/*  $Id: radix32.c 6118 2003-01-13 06:44:24Z rra $
 **
 **  Radix-32 strings divide a number into five-bit nibbles and use the
 **  alphabet 0..9a..v to represent 0..32.
diff -ruNp inn-2.4.2/lib/readin.c inn-2.4.3/lib/readin.c
--- inn-2.4.2/lib/readin.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/readin.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: readin.c,v 1.9.2.1 2003/07/12 19:13:14 rra Exp $
+/*  $Id: readin.c 6394 2003-07-12 19:13:14Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/lib/remopen.c inn-2.4.3/lib/remopen.c
--- inn-2.4.2/lib/remopen.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/remopen.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Revision: 1.23 $
+/*  $Revision: 6119 $
 **
 **  Open a connection to a remote NNTP server.
 */
diff -ruNp inn-2.4.2/lib/reservedfd.c inn-2.4.3/lib/reservedfd.c
--- inn-2.4.2/lib/reservedfd.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/reservedfd.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: reservedfd.c,v 1.13 2003/01/19 01:15:34 rra Exp $
+/*  $Id: reservedfd.c 6135 2003-01-19 01:15:40Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/lib/resource.c inn-2.4.3/lib/resource.c
--- inn-2.4.2/lib/resource.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/resource.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: resource.c,v 1.7 2003/01/19 01:15:34 rra Exp $
+/*  $Id: resource.c 6135 2003-01-19 01:15:40Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/lib/sendarticle.c inn-2.4.3/lib/sendarticle.c
--- inn-2.4.2/lib/sendarticle.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/sendarticle.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: sendarticle.c,v 1.4 2000/10/05 00:36:52 rra Exp $
+/*  $Id: sendarticle.c 4076 2000-10-05 00:36:52Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/lib/sendpass.c inn-2.4.3/lib/sendpass.c
--- inn-2.4.2/lib/sendpass.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/sendpass.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: sendpass.c,v 1.11 2003/01/19 01:15:34 rra Exp $
+/*  $Id: sendpass.c 7145 2005-04-10 03:28:01Z rra $
 **
 */
 
@@ -28,10 +28,14 @@ int NNTPsendpassword(char *server, FILE 
     char		*style;
     int			oerrno;
 
-    /* What server are we interested in?  Default to the campus one. */
-    if (server == NULL
-     && (server = innconf->server) == NULL)
-	return -1;
+    /* Default to innconf->server.  If that's not set either, error out.  Fake
+       errno since some of our callers rely on it. */
+    if (server == NULL)
+        server = innconf->server;
+    if (server == NULL) {
+        errno = EINVAL;
+        return -1;
+    }
 
     /* Open the password file; coarse check on errno, but good enough. */
     path = concatpath(innconf->pathetc, _PATH_NNTPPASS);
diff -ruNp inn-2.4.2/lib/sequence.c inn-2.4.3/lib/sequence.c
--- inn-2.4.2/lib/sequence.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/sequence.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: sequence.c,v 1.1 2001/07/09 08:09:57 alexk Exp $
+/*  $Id: sequence.c 4871 2001-07-09 08:09:58Z alexk $
 **
 **  Sequence space arithmetic routines.
 **
diff -ruNp inn-2.4.2/lib/setenv.c inn-2.4.3/lib/setenv.c
--- inn-2.4.2/lib/setenv.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/setenv.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: setenv.c,v 1.6 2002/09/01 03:04:10 rra Exp $
+/*  $Id: setenv.c 5713 2002-09-01 03:04:10Z rra $
 **
 **  Replacement for a missing setenv.
 **
diff -ruNp inn-2.4.2/lib/seteuid.c inn-2.4.3/lib/seteuid.c
--- inn-2.4.2/lib/seteuid.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/seteuid.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: seteuid.c,v 1.1 2000/08/29 04:50:18 rra Exp $
+/*  $Id: seteuid.c 3839 2000-08-29 04:50:18Z rra $
 **
 **  Replacement for a missing seteuid.
 **
diff -ruNp inn-2.4.2/lib/setproctitle.c inn-2.4.3/lib/setproctitle.c
--- inn-2.4.2/lib/setproctitle.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/setproctitle.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: setproctitle.c,v 1.3 2002/12/08 02:28:06 rra Exp $
+/*  $Id: setproctitle.c 5943 2002-12-08 02:28:06Z rra $
 **
 **  Replacement for a missing setproctitle.
 **
diff -ruNp inn-2.4.2/lib/snprintf.c inn-2.4.3/lib/snprintf.c
--- inn-2.4.2/lib/snprintf.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/snprintf.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: snprintf.c,v 1.9 2002/08/29 04:07:22 rra Exp $
+/*  $Id: snprintf.c 7230 2005-04-16 23:33:17Z rra $
 **
 **  Replacement for a missing snprintf or vsnprintf.
 **
@@ -116,7 +116,7 @@ int vsnprintf (char *str, size_t count, 
 static int dopr (char *buffer, size_t maxlen, const char *format, 
                  va_list args);
 static int fmtstr (char *buffer, size_t *currlen, size_t maxlen,
-		   char *value, int flags, int min, int max);
+		   const char *value, int flags, int min, int max);
 static int fmtint (char *buffer, size_t *currlen, size_t maxlen,
 		   LLONG value, int base, int min, int max, int flags);
 static int fmtfp (char *buffer, size_t *currlen, size_t maxlen,
@@ -220,7 +220,7 @@ static int dopr (char *buffer, size_t ma
       }
       break;
     case DP_S_MIN:
-      if (isdigit((unsigned char)ch)) 
+      if ('0' <= ch && ch <= '9') 
       {
 	min = 10*min + char_to_int (ch);
 	ch = *format++;
@@ -244,7 +244,7 @@ static int dopr (char *buffer, size_t ma
 	state = DP_S_MOD;
       break;
     case DP_S_MAX:
-      if (isdigit((unsigned char)ch)) 
+      if ('0' <= ch && ch <= '9')
       {
 	if (max < 0)
 	  max = 0;
@@ -444,16 +444,15 @@ static int dopr (char *buffer, size_t ma
 }
 
 static int fmtstr (char *buffer, size_t *currlen, size_t maxlen,
-                   char *value, int flags, int min, int max)
+                   const char *value, int flags, int min, int max)
 {
   int padlen, strln;     /* amount to pad */
   int cnt = 0;
   int total = 0;
-  char null[] = "<NULL>";
   
   if (value == 0)
   {
-    value = null;
+    value = "<NULL>";
   }
 
   for (strln = 0; value[strln]; ++strln); /* strlen */
@@ -603,9 +602,9 @@ static LDOUBLE pow10 (int exp)
   return result;
 }
 
-static long round (LDOUBLE value)
+static LLONG round (LDOUBLE value)
 {
-  long intpart;
+  LLONG intpart;
 
   intpart = value;
   value = value - intpart;
diff -ruNp inn-2.4.2/lib/sockaddr.c inn-2.4.3/lib/sockaddr.c
--- inn-2.4.2/lib/sockaddr.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/sockaddr.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: sockaddr.c,v 1.3 2002/03/31 22:35:47 rra Exp $
+/*  $Id: sockaddr.c 5381 2002-03-31 22:35:47Z rra $
 **
 **  Routines for manipulating sockaddr structs
 */
diff -ruNp inn-2.4.2/lib/strcasecmp.c inn-2.4.3/lib/strcasecmp.c
--- inn-2.4.2/lib/strcasecmp.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/strcasecmp.c	Mon Mar 20 04:14:57 2006
@@ -2,7 +2,7 @@
 #include "clibrary.h"
 
 
-/*  $Revision: 1.3 $
+/*  $Revision: 6118 $
  *
  * Copyright (c) 1987 Regents of the University of California.
  * All rights reserved.
diff -ruNp inn-2.4.2/lib/strerror.c inn-2.4.3/lib/strerror.c
--- inn-2.4.2/lib/strerror.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/strerror.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: strerror.c,v 1.10 2003/01/18 22:25:37 rra Exp $
+/*  $Id: strerror.c 6127 2003-01-18 22:25:37Z rra $
 **
 **  Replacement for a missing strerror.
 **
diff -ruNp inn-2.4.2/lib/strlcat.c inn-2.4.3/lib/strlcat.c
--- inn-2.4.2/lib/strlcat.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/strlcat.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: strlcat.c,v 1.2 2002/08/29 04:07:50 rra Exp $
+/*  $Id: strlcat.c 5681 2002-08-29 04:07:50Z rra $
 **
 **  Replacement for a missing strlcat.
 **
diff -ruNp inn-2.4.2/lib/strlcpy.c inn-2.4.3/lib/strlcpy.c
--- inn-2.4.2/lib/strlcpy.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/strlcpy.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: strlcpy.c,v 1.3 2002/08/29 04:07:50 rra Exp $
+/*  $Id: strlcpy.c 5681 2002-08-29 04:07:50Z rra $
 **
 **  Replacement for a missing strlcpy.
 **
diff -ruNp inn-2.4.2/lib/strspn.c inn-2.4.3/lib/strspn.c
--- inn-2.4.2/lib/strspn.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/strspn.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: strspn.c,v 1.3 2003/01/13 06:44:23 rra Exp $
+/*  $Id: strspn.c 6118 2003-01-13 06:44:24Z rra $
 **
 **  This file has been modified to get it to compile more easily
 **  on pre-4.4BSD systems.  Rich $alz, June 1991.
diff -ruNp inn-2.4.2/lib/strtok.c inn-2.4.3/lib/strtok.c
--- inn-2.4.2/lib/strtok.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/strtok.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: strtok.c,v 1.3 2003/01/13 06:44:23 rra Exp $
+/*  $Id: strtok.c 6118 2003-01-13 06:44:24Z rra $
 **
 **  This file has been modified to get it to compile more easily
 **  on pre-4.4BSD systems.  Rich $alz, June 1991.
diff -ruNp inn-2.4.2/lib/timer.c inn-2.4.3/lib/timer.c
--- inn-2.4.2/lib/timer.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/timer.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: timer.c,v 1.13 2003/01/19 00:39:48 rra Exp $
+/*  $Id: timer.c 6129 2003-01-19 00:39:49Z rra $
 **
 **  Timer functions, to gather profiling data.
 **
diff -ruNp inn-2.4.2/lib/tst.c inn-2.4.3/lib/tst.c
--- inn-2.4.2/lib/tst.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/tst.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tst.c,v 1.14 2002/12/27 07:24:35 rra Exp $
+/*  $Id: tst.c 6083 2002-12-27 07:24:36Z rra $
 **
 **  Ternary search trie implementation.
 **
diff -ruNp inn-2.4.2/lib/uwildmat.c inn-2.4.3/lib/uwildmat.c
--- inn-2.4.2/lib/uwildmat.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/uwildmat.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: uwildmat.c,v 1.2.2.1 2004/05/17 07:25:28 rra Exp $
+/*  $Id: uwildmat.c 6779 2004-05-17 07:25:28Z rra $
 **
 **  wildmat pattern matching with Unicode UTF-8 extensions.
 **
diff -ruNp inn-2.4.2/lib/vector.c inn-2.4.3/lib/vector.c
--- inn-2.4.2/lib/vector.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/vector.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: vector.c,v 1.5.2.1 2004/04/07 06:47:44 rra Exp $
+/*  $Id: vector.c 6699 2004-04-07 06:47:44Z rra $
 **
 **  Vector handling (counted lists of char *'s).
 **
diff -ruNp inn-2.4.2/lib/version.c inn-2.4.3/lib/version.c
--- inn-2.4.2/lib/version.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/version.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: version.c,v 1.2 2000/10/01 01:59:45 rra Exp $
+/*  $Id: version.c 3989 2000-10-01 01:59:45Z rra $
 **
 **  INN compile-time version information.
 */
diff -ruNp inn-2.4.2/lib/wire.c inn-2.4.3/lib/wire.c
--- inn-2.4.2/lib/wire.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/wire.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: wire.c,v 1.3 2003/01/19 01:15:34 rra Exp $
+/*  $Id: wire.c 7258 2005-06-06 03:14:45Z eagle $
 **
 **  Wire format article utilities.
 **
@@ -35,6 +35,11 @@ wire_findbody(const char *article, size_
     char *p;
     const char *end;
 
+    /* Handle the degenerate case of an article with no headers. */
+    if (length > 5 && article[0] == '\r' && article[1] == '\n')
+        return (char *) article + 2;
+
+    /* Jump from \r to \r and give up if we're too close to the end. */
     end = article + length;
     for (p = (char *) article; (p + 4) <= end; ++p) {
         p = memchr(p, '\r', end - p - 3);
diff -ruNp inn-2.4.2/lib/xfopena.c inn-2.4.3/lib/xfopena.c
--- inn-2.4.2/lib/xfopena.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/xfopena.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: xfopena.c,v 1.4 2002/03/31 22:35:47 rra Exp $
+/*  $Id: xfopena.c 5381 2002-03-31 22:35:47Z rra $
 **
 */
 
diff -ruNp inn-2.4.2/lib/xmalloc.c inn-2.4.3/lib/xmalloc.c
--- inn-2.4.2/lib/xmalloc.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/xmalloc.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: xmalloc.c,v 1.13 2002/03/31 22:35:47 rra Exp $
+/* $Id: xmalloc.c 5381 2002-03-31 22:35:47Z rra $
 **
 **  malloc routines with failure handling.
 **
diff -ruNp inn-2.4.2/lib/xsignal.c inn-2.4.3/lib/xsignal.c
--- inn-2.4.2/lib/xsignal.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/xsignal.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: xsignal.c,v 1.3 2002/08/18 22:22:52 rra Exp $
+/*  $Id: xsignal.c 5610 2002-08-18 22:22:52Z rra $
 **
 **  A reliable implementation of signal for System V systems.
 **
diff -ruNp inn-2.4.2/lib/xwrite.c inn-2.4.3/lib/xwrite.c
--- inn-2.4.2/lib/xwrite.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/lib/xwrite.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: xwrite.c,v 1.9 2002/09/17 17:00:05 alexk Exp $
+/*  $Id: xwrite.c 5771 2002-09-17 17:00:05Z alexk $
 **
 **  write and writev replacements to handle partial writes.
 **
diff -ruNp inn-2.4.2/nnrpd/Makefile inn-2.4.3/nnrpd/Makefile
--- inn-2.4.2/nnrpd/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.55.2.3 2004/07/15 02:16:13 rra Exp $
+##  $Id: Makefile 6965 2004-07-15 02:16:13Z rra $
 
 include ../Makefile.global
 
diff -ruNp inn-2.4.2/nnrpd/article.c inn-2.4.3/nnrpd/article.c
--- inn-2.4.2/nnrpd/article.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/article.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: article.c,v 1.143 2003/02/17 11:19:58 alexk Exp $
+/*  $Id: article.c 7267 2005-06-06 05:10:01Z eagle $
 **
 **  Article-related routines.
 */
@@ -489,14 +489,16 @@ char *GetHeader(const char *header)
     /* Bogus value here to make sure that it isn't initialized to \n */
     char		lastchar = ' ';
     const char		*limit;
+    const char		*cmplimit;
     static char		*retval = NULL;
     static int		retlen = 0;
     int			headerlen;
     bool		pathheader = false;
     bool		xrefheader = false;
 
-    limit = ARThandle->data + ARThandle->len - strlen(header) - 1;
-    for (p = ARThandle->data; p < limit; p++) {
+    limit = ARThandle->data + ARThandle->len;
+    cmplimit = ARThandle->data + ARThandle->len - strlen(header) - 1;
+    for (p = ARThandle->data; p < cmplimit; p++) {
 	if (*p == '\r')
 	    continue;
 	if ((lastchar == '\n') && (*p == '\n')) {
@@ -961,33 +963,6 @@ void CMDxover(int ac, char *av[])
 
 }
 
-static bool
-build_groups(char *buff)
-{
-    char *next, *p, *q, *newsgroupbuff;
-
-    newsgroupbuff = p = xstrdup(buff);
-    if ((p = strchr(p, ' ')) == NULL) {
-	free(newsgroupbuff);
-	return false;
-    }
-
-    for (buff[0] = '\0', q = buff, p++; *p != '\0'; ) {
-	if ((next = strchr(p, ':')) == NULL) {
-	    free(newsgroupbuff);
-	    return false;
-	}
-	*next++ = '\0';
-	strcat(q, p);
-	q += (next - p - 1);
-	if ((p = strchr(next, ' ')) == NULL)
-	    break;
-	*p = ',';
-    }
-    free(newsgroupbuff);
-    return true;
-}
-
 /*
 **  XHDR and XPAT extensions.  Note that HDR as specified in the new NNTP
 **  draft works differently than XHDR has historically, so don't just use this
@@ -1011,7 +986,6 @@ void CMDpat(int ac, char *av[])
     char                *data;
     int                 len;
     TOKEN               token;
-    bool                BuildingNewsgroups = false;
     struct cvector *vector = NULL;
 
     if (!PERMcanread) {
@@ -1062,11 +1036,7 @@ void CMDpat(int ac, char *av[])
 	}
 
 	/* In overview? */
-	if (strcasecmp(header, "Newsgroups") == 0) {
-	    BuildingNewsgroups = true;
-	    Overview = overview_index("Xref", OVextra);
-	} else
-	    Overview = overview_index(header, OVextra);
+        Overview = overview_index(header, OVextra);
 
 	/* Not in overview, we have to fish headers out from the articles */
 	if (Overview < 0 ) {
@@ -1106,12 +1076,7 @@ void CMDpat(int ac, char *av[])
 	    vector = overview_split(data, len, NULL, vector);
 	    p = overview_getheader(vector, Overview, OVextra);
 	    if (p != NULL) {
-		if (BuildingNewsgroups) {
-		    if (!build_groups(p)) {
-			free(p);
-			continue;
-		    }
-		} else if (PERMaccessconf->virtualhost &&
+		if (PERMaccessconf->virtualhost &&
 			   Overview == overhdr_xref) {
 		    p = vhost_xref(p);
 		    if (p == NULL)
diff -ruNp inn-2.4.2/nnrpd/cache.c inn-2.4.3/nnrpd/cache.c
--- inn-2.4.2/nnrpd/cache.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/cache.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: cache.c,v 1.8 2003/01/21 06:31:40 alexk Exp $
+/*  $Id: cache.c 6169 2003-01-21 06:31:40Z alexk $
 **
 **  MessageID to storage token cache
 **
diff -ruNp inn-2.4.2/nnrpd/commands.c inn-2.4.3/nnrpd/commands.c
--- inn-2.4.2/nnrpd/commands.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/commands.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: commands.c,v 1.81.2.1 2004/01/12 05:18:43 rra Exp $
+/*  $Id: commands.c 6617 2004-01-12 05:18:44Z rra $
 **
 **  Miscellaneous commands.
 */
diff -ruNp inn-2.4.2/nnrpd/group.c inn-2.4.3/nnrpd/group.c
--- inn-2.4.2/nnrpd/group.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/group.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: group.c,v 1.62.2.1 2004/10/14 01:49:51 rra Exp $
+/*  $Id: group.c 7502 2006-03-20 02:29:37Z eagle $
 **
 **  Newsgroups and the active file.
 */
@@ -149,12 +149,11 @@ void CMDgroup(int ac, char *av[])
            something bland here ("Article list follows"), but reference NNTP
            returns the same data as GROUP does and since we have it all
            available it shouldn't hurt to return the same thing. */
-	if ((handle = OVopensearch(group, ARTlow, ARThigh)) != NULL) {
-            if (count == 0)
-                Reply("%d 0 0 0 %s\r\n", NNTP_GROUPOK_VAL, group);
-            else
-                Reply("%d %d %ld %ld %s\r\n", NNTP_GROUPOK_VAL, count,
-                      ARTlow, ARThigh, group);
+        if (count == 0) {
+            Reply("%d 0 0 0 %s\r\n", NNTP_GROUPOK_VAL, group);
+        } else if ((handle = OVopensearch(group, ARTlow, ARThigh)) != NULL) {
+            Reply("%d %d %ld %ld %s\r\n", NNTP_GROUPOK_VAL, count, ARTlow,
+                  ARThigh, group);
 	    while (OVsearch(handle, &i, NULL, NULL, &token, NULL)) {
 		if (PERMaccessconf->nnrpdcheckart && !ARTinstorebytoken(token))
 		    continue;
diff -ruNp inn-2.4.2/nnrpd/line.c inn-2.4.3/nnrpd/line.c
--- inn-2.4.2/nnrpd/line.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/line.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: line.c,v 1.5 2003/02/10 01:33:15 rra Exp $
+/*  $Id: line.c 7471 2005-12-15 04:53:16Z eagle $
 **
 **  Line by line reading support from sockets/pipes
 **
@@ -119,8 +119,9 @@ line_read(struct line *line, int timeout
 	    
 		/* don't grow the buffer bigger than the maximum
 		 * article size we'll accept */
-		if (newsize > (unsigned)PERMaccessconf->localmaxartsize)
-		    newsize = PERMaccessconf->localmaxartsize;
+                if (PERMaccessconf->localmaxartsize > NNTP_STRLEN)
+                    if (newsize > (unsigned)PERMaccessconf->localmaxartsize)
+                        newsize = PERMaccessconf->localmaxartsize;
 
 		/* if we're trying to grow from the same size, to the
 		 * same size, we must have hit the localmaxartsize
diff -ruNp inn-2.4.2/nnrpd/list.c inn-2.4.3/nnrpd/list.c
--- inn-2.4.2/nnrpd/list.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/list.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: list.c,v 1.1.2.1 2004/10/01 04:57:36 rra Exp $
+/*  $Id: list.c 6986 2004-10-01 04:57:36Z rra $
 **
 **  List commands.
 */
diff -ruNp inn-2.4.2/nnrpd/misc.c inn-2.4.3/nnrpd/misc.c
--- inn-2.4.2/nnrpd/misc.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/misc.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: misc.c,v 1.75.2.2 2003/12/10 09:02:22 rra Exp $
+/*  $Id: misc.c 6535 2003-12-10 09:02:22Z rra $
 **
 **  Miscellaneous support routines.
 */
diff -ruNp inn-2.4.2/nnrpd/newnews.c inn-2.4.3/nnrpd/newnews.c
--- inn-2.4.2/nnrpd/newnews.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/newnews.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Revision: 1.42.2.1 $
+/*  $Revision: 6372 $
 **
 **  The newnews command.
 */
diff -ruNp inn-2.4.2/nnrpd/nnrpd.c inn-2.4.3/nnrpd/nnrpd.c
--- inn-2.4.2/nnrpd/nnrpd.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/nnrpd.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: nnrpd.c,v 1.171.2.3 2004/01/12 05:18:43 rra Exp $
+/*  $Id: nnrpd.c 7269 2005-06-07 03:47:54Z eagle $
 **
 **  NNTP server for readers (NNRP) for InterNetNews.
 **
@@ -79,7 +79,6 @@ char	*HISTORY = NULL;
 char	*NEWSGROUPS = NULL;
 char	*NNRPACCESS = NULL;
 
-bool	ForceReadOnly = false;
 static char 	*LocalLogFileName = NULL;
 static char 	*LocalLogDirName;
 
@@ -242,8 +241,10 @@ ExitWithStats(int x, bool readconf)
     if (History)
 	HISclose(History);
 
-    TMRsummary(ClientHost, timer_name);
-    TMRfree();
+    if (innconf->timer != 0) {
+        TMRsummary(ClientHost, timer_name);
+        TMRfree();
+    }
 
     if (LocalLogFileName != NULL)
 	free(LocalLogFileName);
@@ -860,9 +861,9 @@ main(int argc, char *argv[])
         exit(1);
 
 #ifdef HAVE_SSL
-    while ((i = getopt(argc, argv, "c:b:Dfi:I:g:nop:P:Rr:s:tS")) != EOF)
+    while ((i = getopt(argc, argv, "c:b:Dfi:I:g:nop:P:r:s:tS")) != EOF)
 #else
-    while ((i = getopt(argc, argv, "c:b:Dfi:I:g:nop:P:Rr:s:t")) != EOF)
+    while ((i = getopt(argc, argv, "c:b:Dfi:I:g:nop:P:r:s:t")) != EOF)
 #endif /* HAVE_SSL */
 	switch (i) {
 	default:
@@ -904,9 +905,6 @@ main(int argc, char *argv[])
  	case 'p':			/* tcp port for daemon mode */
  	    ListenPort = atoi(optarg);
  	    break;
-	case 'R':			/* Ignore 'P' option in access file */
-	    ForceReadOnly = true;
-	    break;
 	case 'r':			/* Reject connection message */
 	    Reject = xstrdup(optarg);
 	    break;
@@ -1126,7 +1124,8 @@ main(int argc, char *argv[])
 	close(fd);
 	dup2(0, 1);
 	dup2(0, 2);
-        TMRinit(TMR_MAX);
+        if (innconf->timer != 0)
+            TMRinit(TMR_MAX);
         STATstart = TMRnow_double();
 	SetupDaemon();
 
@@ -1140,7 +1139,8 @@ main(int argc, char *argv[])
 	xsignal(SIGCHLD, SIG_DFL);
  
     } else {
-        TMRinit(TMR_MAX);
+        if (innconf->timer)
+            TMRinit(TMR_MAX);
         STATstart = TMRnow_double();
 	SetupDaemon();
 	/* Arrange to toggle tracing. */
diff -ruNp inn-2.4.2/nnrpd/nnrpd.h inn-2.4.3/nnrpd/nnrpd.h
--- inn-2.4.2/nnrpd/nnrpd.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/nnrpd.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: nnrpd.h,v 1.76.2.1 2004/01/12 05:18:44 rra Exp $
+/*  $Id: nnrpd.h 7343 2005-06-20 03:23:34Z eagle $
 **
 **  Net News Reading Protocol server.
 */
@@ -216,7 +216,6 @@ EXTERN bool	LLOGenable;
 extern const char	*ARTpost(char *article, char *idbuff, bool ihave,
 				 bool *permanent);
 extern void		ARTclose(void);
-extern bool		ARTreadschema(void);
 extern int		TrimSpaces(char *line);
 extern char		*Glom(char **av);
 extern int		Argify(char *line, char ***argvp);
diff -ruNp inn-2.4.2/nnrpd/perl.c inn-2.4.3/nnrpd/perl.c
--- inn-2.4.2/nnrpd/perl.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/perl.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: perl.c,v 1.41 2003/02/10 03:21:27 rra Exp $
+/*  $Id: perl.c 6221 2003-02-10 03:21:27Z rra $
 **
 **  Embedded Perl support for INN.
 **
diff -ruNp inn-2.4.2/nnrpd/perm.c inn-2.4.3/nnrpd/perm.c
--- inn-2.4.2/nnrpd/perm.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/perm.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: perm.c,v 1.78.2.3 2004/03/06 05:33:14 rra Exp $
+/*  $Id: perm.c 7426 2005-12-11 20:37:27Z eagle $
 **
 **  How to figure out where a user comes from, and what that user can do once
 **  we know who sie is.
@@ -1544,7 +1544,7 @@ void PERMgetpermissions()
 	SetDefaultAccess(PERMaccessconf);
 	return;
 #ifdef DO_PERL
-    } else if (success_auth->access_script != NULL) {
+    } else if ((success_auth->access_script != NULL) && (success_auth->access_type == PERMperl_access)) {
       i = 0;
       cpp = xstrdup(success_auth->access_script);
       args = 0;
diff -ruNp inn-2.4.2/nnrpd/post.c inn-2.4.3/nnrpd/post.c
--- inn-2.4.2/nnrpd/post.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/post.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Revision: 1.94.2.4 $
+/*  $Revision: 7450 $
 **
 **  Check article, send it to the local server.
 */
@@ -20,7 +20,6 @@ char	**OtherHeaders;
 int	OtherCount;
 bool   HeadersModified;
 static int	OtherSize;
-static bool	WasMailed;
 static const char * const BadDistribs[] = {
     BAD_DISTRIBS
 };
@@ -336,22 +335,17 @@ ProcessHeaders(int linecount, char *idbu
 	}
     }
 
+    /* If authorized, add the header based on our info.  If not authorized,
+       zap the Sender so we don't put out unauthenticated data. */
     if (PERMaccessconf->nnrpdauthsender) {
-	/* If authorized, add the header based on our info.  If not
-         * authorized, zap the Sender so we don't put out unauthenticated
-         * data. */
-	if (PERMauthorized) {
-	    if (PERMuser[0] == '\0') {
-		snprintf(sendbuff, sizeof(sendbuff), "%s@%s", "UNKNOWN",
+	if (PERMauthorized && PERMuser[0] != '\0') {
+            p = strchr(PERMuser, '@');
+            if (p == NULL) {
+                snprintf(sendbuff, sizeof(sendbuff), "%s@%s", PERMuser,
                          ClientHost);
-	    } else {
-		if ((p = strchr(PERMuser, '@')) == NULL) {
-		    snprintf(sendbuff, sizeof(sendbuff), "%s@%s", PERMuser,
-                             ClientHost);
-		} else {
-		    snprintf(sendbuff, sizeof(sendbuff), "%s", PERMuser);
-		}
-	    }
+            } else {
+                snprintf(sendbuff, sizeof(sendbuff), "%s", PERMuser);
+            }
 	    HDR_SET(HDR__SENDER, sendbuff);
 	} else {
 	    HDR_SET(HDR__SENDER, NULL);
@@ -658,7 +652,6 @@ MailArticle(char *group, char *article)
                  i, "Article might not have been mailed");
 	return Error;
     }
-    WasMailed = true;
     return NULL;
 }
 
@@ -690,6 +683,7 @@ ValidNewsgroups(char *hdr, char **modgro
     groups = xstrdup(hdr);
     if ((p = strtok(groups, NGSEPS)) == NULL)
 	return "Can't parse newsgroups line";
+    Error[0] = '\0';
 
     /* Reject all articles with Approved headers unless the user is allowed to
        add them, even to unmoderated or local groups.  We want to reject them
@@ -701,7 +695,6 @@ ValidNewsgroups(char *hdr, char **modgro
                  "You are not allowed to approve postings");
     }
 
-    Error[0] = '\0';
     FoundOne = false;
     h = DDstart((FILE *)NULL, (FILE *)NULL);
     do {
@@ -984,7 +977,6 @@ ARTpost(char *article,
 
     /* Basic processing. */
     OtherCount = 0;
-    WasMailed = false;
     for (hp = Table; hp < ARRAY_END(Table); hp++) {
 	hp->Size = strlen(hp->Name);
 	hp->Value = hp->Body = NULL;
diff -ruNp inn-2.4.2/nnrpd/post.h inn-2.4.3/nnrpd/post.h
--- inn-2.4.2/nnrpd/post.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/post.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: post.h,v 1.6.2.1 2003/09/15 07:32:56 rra Exp $
+/*  $Id: post.h 6474 2003-09-15 07:32:56Z rra $
 **
 **  Net News Reading Protocol server.
 */
diff -ruNp inn-2.4.2/nnrpd/python.c inn-2.4.3/nnrpd/python.c
--- inn-2.4.2/nnrpd/python.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/python.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: python.c,v 1.13 2003/03/03 15:32:13 alexk Exp $
+/*  $Id: python.c 6250 2003-03-03 15:32:13Z alexk $
 **
 **  python.c: Embed Python in the style of nnrpd's TCL and Perl stuff
 **            (authentication and authorization hooks only at this point).
diff -ruNp inn-2.4.2/nnrpd/track.c inn-2.4.3/nnrpd/track.c
--- inn-2.4.2/nnrpd/track.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/nnrpd/track.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Revision: 1.12 $
+/*  $Revision: 6124 $
 **
 **  User and post tracking database.
 */
diff -ruNp inn-2.4.2/samples/Makefile inn-2.4.3/samples/Makefile
--- inn-2.4.2/samples/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.13 2003/04/20 19:04:14 vinocur Exp $
+##  $Id: Makefile 6299 2003-04-20 19:04:14Z vinocur $
 ##
 ##  All the actual installation work of any files in the samples directory
 ##  is done via the site directory, so that one can maintain one's news
diff -ruNp inn-2.4.2/samples/actsync.cfg inn-2.4.3/samples/actsync.cfg
--- inn-2.4.2/samples/actsync.cfg	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/actsync.cfg	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-# $Id: actsync.cfg,v 1.5.2.1 2004/12/22 04:20:47 rra Exp $
+# $Id: actsync.cfg 7081 2004-12-22 04:20:47Z rra $
 
 host=ftp.isc.org
 ftppath=/pub/usenet/CONFIG/active.gz
diff -ruNp inn-2.4.2/samples/actsync.ign inn-2.4.3/samples/actsync.ign
--- inn-2.4.2/samples/actsync.ign	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/actsync.ign	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-# $Id: actsync.ign,v 1.1.1.1.8.1 2004/12/22 04:20:14 rra Exp $
+# $Id: actsync.ign 7079 2004-12-22 04:20:14Z rra $
 #
 # Sample actsync ignore_file.
 
diff -ruNp inn-2.4.2/samples/control.ctl inn-2.4.3/samples/control.ctl
--- inn-2.4.2/samples/control.ctl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/control.ctl	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 ##  control.ctl - Access control for control messages.
-##  Last modified: 2004-11-28
+##  Last modified: 2006-03-19
 ##
 ##  Based on rone's unified control.ctl file.
 ##
@@ -129,19 +129,6 @@ rmgroup:*:*:mail
 newgroup:*:a.bsu.*:mail
 rmgroup:*:a.bsu.*:doit
 
-## ABG (Augsburg, Germany)
-# Contact: abgadmin@abg.news-kiste.de
-# URL: http://abg.news-kiste.de/
-# Admin group: abg.admin
-# Key URL: http://abg.news-kiste.de/abgadmin.asc
-# Key fingerprint = 17 04 9C 48 D7 D7 9C B9  56 9E 5F 64 3D F0 A2 4B
-# *PGP*   See comment at top of file.
-newgroup:*:abg.*:drop
-rmgroup:*:abg.*:drop
-checkgroups:abgadmin@abg.news-kiste.de:abg.*:verify-abgadmin@abg.news-kiste.de
-newgroup:abgadmin@abg.news-kiste.de:abg.*:verify-abgadmin@abg.news-kiste.de
-rmgroup:abgadmin@abg.news-kiste.de:abg.*:verify-abgadmin@abg.news-kiste.de
-
 ## ACS & OSU (*LOCAL* -- Ohio State University, USA)
 # Contact: Albert J. School <school.1@osu.edu>
 # Contact: Harpal Chohan <chohan+@osu.edu>
@@ -547,6 +534,8 @@ newgroup:*:cmu.*:mail
 rmgroup:*:cmu.*:doit
 
 ## CN (China)
+# Admin group: cn.announce
+# Key fingerprint = 62 97 EE 33 F7 16 25 C1  A4 9E 47 BA C5 3E 5E 9E
 # *PGP*   See comment at top of file.
 newgroup:*:cn.*:drop
 rmgroup:*:cn.*:drop
@@ -557,7 +546,6 @@ rmgroup:control@bentium.com:cn.*:verify-
 ## CN.BBS (China)
 # URL: http://bbs.cn.news-admin.org/
 # Admin group: cn.bbs.admin.announce
-# Key URL: http://www.cn-bbs.org/pubkey-cn.bbs.admin.announce
 # *PGP*   See comment at top of file.
 newgroup:*:cn.bbs.*:drop
 rmgroup:*:cn.bbs.*:drop
@@ -726,9 +714,7 @@ rmgroup:news@doc.dpc.ehime-u.ac.jp:ehime
 
 ## ENGLAND (England)
 # Contact: admin@england.news-admin.org
-# URL: http://www.england.news-admin.org/newsadminsfaq.html
 # Admin group: england.news.policy
-# Key URL: http://www.england.news-admin.org/pgpkey.html
 # Key fingerprint = DA 3E C2 01 46 E5 61 CB  A2 43 09 CA 13 6D 31 1F
 # *PGP*   See comment at top of file.
 newgroup:*:england.*:drop
@@ -806,7 +792,6 @@ newgroup:root@mbh.org:fido.*:doit
 rmgroup:root@mbh.org:fido.*:doit
 
 ## FIDO.BELG (FidoNet)
-# URL: http://www.z2.fidonet.org/news/fido.belg.news/
 # Admin group: fido.belg.news
 # *PGP*   See comment at top of file.
 newgroup:*:fido.belg.*:drop
@@ -851,7 +836,6 @@ rmgroup:scheidell@fdma.fdma.com:fl.*:doi
 
 ## FLORA (FLORA Community WEB, Canada)
 # Contact: russell@flora.org
-# URL: http://news.flora.org/
 # Admin group: flora.general
 # *PGP*   See comment at top of file.
 newgroup:*:flora.*:drop
@@ -938,9 +922,7 @@ rmgroup:news@*dcss.mcmaster.ca:hamilton.
 
 ## HAMSTER (Hamster, a Win32 news and mail proxy server)
 # Contact: hamster-contact@snafu.de
-# URL: http://www.nethamster.org
 # Admin group: hamster.de.config
-# Key URL: http://www.nethamster.org/control/hamster.asc
 # Key fingerprint = 12 75 A9 42 8A D6 1F 77  6A CF B4 0C 79 15 5F 93
 # *PGP*   See comment at top of file.
 newgroup:*:hamster.*:drop
@@ -970,6 +952,11 @@ checkgroups:news@lava.net:hawaii.*:doit
 newgroup:news@lava.net:hawaii.*:doit
 rmgroup:news@lava.net:hawaii.*:doit
 
+## HFX (Halifax, Nova Scotia)
+checkgroups:stevemackie@gmail.com:hfx.*:doit
+newgroup:stevemackie@gmail.com:hfx.*:doit
+rmgroup:stevemackie@gmail.com:hfx.*:doit
+
 ## HIV (HIVNET Foundation, for HIV+/AIDS information)
 # Contact: news@hivnet.org
 # Admin group: hiv.config
@@ -1043,7 +1030,6 @@ rmgroup:support@idoctra.com:idoctra.*:do
 
 ## IE (Ireland)
 # Contact: control@usenet.ie
-# URL: http://www.usenet.ie/
 # Admin group: ie.news.group
 # *PGP*   See comment at top of file.
 newgroup:*:ie.*:drop
@@ -1085,6 +1071,18 @@ rmgroup:news@sally.isc.chubu.ac.jp:isc.*
 newgroup:news@news.biu.ac.il:israel.*:doit
 rmgroup:news@news.biu.ac.il:israel.*|il.*:doit
 
+## ISU (I-Shou University, Taiwan)
+# Contact: news@news.isu.edu.tw
+# URL: http://news.isu.edu.tw/
+# Admin group: isu.newgroups
+# Key URL: http://news.isu.edu.tw/isu.asc
+# *PGP*   See comment at top of file.
+newgroup:*:isu.*:drop
+rmgroup:*:isu.*:drop
+checkgroups:news@news.isu.edu.tw:isu.*:verify-news@news.isu.edu.tw
+newgroup:news@news.isu.edu.tw:isu.*:verify-news@news.isu.edu.tw
+rmgroup:news@news.isu.edu.tw:isu.*:verify-news@news.isu.edu.tw
+
 ## IT (Italian)
 # Contact: gcn@news.nic.it
 # URL: http://www.news.nic.it/
@@ -1187,9 +1185,10 @@ newgroup:dan@sky.net:kc.*:doit
 rmgroup:dan@sky.net:kc.*:doit
 
 ## KIEL (Kiel, Germany)
-checkgroups:kris@white.schulung.netuse.de:kiel.*:doit
-newgroup:kris@white.schulung.netuse.de:kiel.*:doit
-rmgroup:kris@white.schulung.netuse.de:kiel.*:doit
+# URL: http://news.koehntopp.de/kiel/
+checkgroups:kris@koehntopp.de:kiel.*:doit
+newgroup:kris@koehntopp.de:kiel.*:doit
+rmgroup:kris@koehntopp.de:kiel.*:doit
 
 ## KRST (*LOCAL* -- University of Oslo, Norway)
 # Contact: jani@ifi.uio.no
@@ -1324,7 +1323,6 @@ rmgroup:scs@lokkur.dexter.mi.us:mi.*:doi
 
 ## MICROSOFT (Microsoft Corporation, USA)
 # Contact: usenet@microsoft.com
-# URL: http://www.microsoft.com/usenetadmin
 # Key URL: http://www.microsoft.com/usenetadmin/pgpkey.txt
 # Key fingerprint = 1C 3B EB AF 7C 5C 8A B0  CD 5F 5C B0 AB 74 4F B1
 # *PGP*   See comment at top of file.
@@ -1336,7 +1334,6 @@ rmgroup:usenet@microsoft.com:microsoft.*
 
 ## MICROSOFT.PRIVATE (*PRIVATE* -- Microsoft Corporation, USA)
 # Contact: usenet@microsoft.com
-# URL: http://www.microsoft.com/usenetadmin
 # For private use only, contact the above address for information.
 newgroup:usenet@microsoft.com:microsoft.private.*:mail
 rmgroup:usenet@microsoft.com:microsoft.private.*:doit
@@ -1470,9 +1467,8 @@ rmgroup:ktomita@jade.dti.ne.jp:nihon.*:d
 
 ## NL (Netherlands)
 # Contact: nl-admin@nic.surfnet.nl
-# URL: http://www.kinkhorst.com/usenet/nladmin.en.html (English)
+# URL: http://nl.news-admin.org/info/nladmin.html
 # Admin group: nl.newsgroups
-# Key URL: http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x23E9B3A9
 # Key fingerprint = 45 20 0B D5 A1 21 EA 7C  EF B2 95 6C 25 75 4D 27
 # *PGP*   See comment at top of file.
 newgroup:*:nl.*:drop
@@ -1489,11 +1485,6 @@ 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
 
-## NLNET (Netherlands ISP)
-checkgroups:beheer@nl.net:nlnet.*:doit
-newgroup:beheer@nl.net:nlnet.*:doit
-rmgroup:beheer@nl.net:nlnet.*:doit
-
 ## NLO (Open Source / Free Software, hosted by nl.linux.org)
 # URL: http://news.nl.linux.org/doc/nlo.html
 # Key URL: http://news.nl.linux.org/doc/nlo-3.html#ss3.1
@@ -1642,6 +1633,15 @@ checkgroups:fxp@epix.net:pa.*:doit
 newgroup:fxp@epix.net:pa.*:doit
 rmgroup:fxp@epix.net:pa.*:doit
 
+## PBINFO (Paderborn, Germany)
+# Contact: news@uni-paderborn.de
+# *PGP*   See comment at top of file.
+newgroup:*:pbinfo.*:drop
+rmgroup:*:pbinfo.*:drop
+checkgroups:postmaster@upb.de:pbinfo.*:verify-news@uni-paderborn.de
+newgroup:postmaster@upb.de:pbinfo.*:verify-news@uni-paderborn.de
+rmgroup:postmaster@upb.de:pbinfo.*:verify-news@uni-paderborn.de
+
 ## PGH (Pittsburgh, Pennsylvania, USA)
 # Admin group: pgh.config
 # *PGP*   See comment at top of file.
@@ -1770,9 +1770,7 @@ rmgroup:root@lusatia.de:sachsnet.*:doit
 
 ## SAT (San Antonio, Texas, USA)
 # Contact: satgroup@endicor.com
-# URL: http://www.endicor.com/~satgroup/
 # Admin group: sat.usenet.config
-# Key URL: http://www.endicor.com/~satgroup/pubkey.asc
 # *PGP*   See comment at top of file.
 newgroup:*:sat.*:drop
 rmgroup:*:sat.*:drop
@@ -1835,9 +1833,16 @@ rmgroup:billmcc@akita.com:seattle.*:doit
 rmgroup:graham@ee.washington.edu:seattle.*:doit
 
 ## SFNET (Finland)
-checkgroups:sfnet@*.cs.tut.fi:sfnet.*:doit
-newgroup:sfnet@*.cs.tut.fi:sfnet.*:doit
-rmgroup:sfnet@*.cs.tut.fi:sfnet.*:doit
+# Contact: sfnet@cs.tut.fi
+# URL: http://www.cs.tut.fi/sfnet/
+# Admin group: sfnet.ryhmat+listat
+# Key fingerprint = DE79 33C2 D359 D128 44E5  6A0C B6E3 0E53 6933 A636
+# *PGP*   See comment at top of file.
+newgroup:*:sfnet.*:drop
+rmgroup:*:sfnet.*:drop
+checkgroups:sfnet@*cs.tut.fi:sfnet.*:verify-sfnet@cs.tut.fi
+newgroup:sfnet@*cs.tut.fi:sfnet.*:verify-sfnet@cs.tut.fi
+rmgroup:sfnet@*cs.tut.fi:sfnet.*:verify-sfnet@cs.tut.fi
 
 ## SHAMASH (Jewish)
 checkgroups:archives@israel.nysernet.org:shamash.*:doit
diff -ruNp inn-2.4.2/samples/distrib.pats inn-2.4.3/samples/distrib.pats
--- inn-2.4.2/samples/distrib.pats	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/distrib.pats	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Revision: 1.1.1.1 $
+##  $Revision: 6312 $
 ##  distrib.pats -- specify default Distribution header for newsgroups
 ##  Format:
 ##	<weight>:<pattern>:<value>
diff -ruNp inn-2.4.2/samples/expire.ctl inn-2.4.3/samples/expire.ctl
--- inn-2.4.2/samples/expire.ctl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/expire.ctl	Mon Mar 20 04:14:57 2006
@@ -1,18 +1,18 @@
-##  $Revision: 1.4 $
+##  $Revision: 7143 $
 ##  expire.ctl - expire control file
 ##  Format:
 ##	/remember/:<keep>
-##	<class>:<keep>:<default>:<purge>
-##	<wildmat>:<flag>:<keep>:<default>:<purge>
+##	<class>:<min>:<default>:<max>
+##	<wildmat>:<flag>:<min>:<default>:<max>
 ##  First line gives history retention; second line specifies expiration
 ##  for classes; third line specifies expiration for group if groupbaseexpiry
 ##  is true
 ##	<class>		class specified in storage.conf
 ##	<wildmat>	wildmat-style patterns for the newsgroups
-##	<keep>		Mininum number of days to keep article
+##	<min>		Mininum number of days to keep article
 ##	<default>	Default number of days to keep the article
-##	<purge>		Flush article after this many days
-##  <keep>, <default>, and <purge> can be floating-point numbers or the
+##	<max>		Flush article after this many days
+##  <min>, <default>, and <max> can be floating-point numbers or the
 ##  word "never."  Times are based on when received unless -p is used;
 ##  see expire.8
 
diff -ruNp inn-2.4.2/samples/filter.tcl inn-2.4.3/samples/filter.tcl
--- inn-2.4.2/samples/filter.tcl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/filter.tcl	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 # -*- tcl -*-
 #
-# $Revision: 1.2 $
+# $Revision: 4171 $
 #
 # A TCL procedure that will be run over every article. See doc/hook-tcl
 # for more details.
diff -ruNp inn-2.4.2/samples/filter_innd.pl inn-2.4.3/samples/filter_innd.pl
--- inn-2.4.2/samples/filter_innd.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/filter_innd.pl	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #
-# $Id: filter_innd.pl,v 1.4 2000/04/04 23:40:09 rra Exp $
+# $Id: filter_innd.pl 3048 2000-04-04 23:40:09Z rra $
 #
 # Sample Perl filtering file for the innd hooks.
 # 
diff -ruNp inn-2.4.2/samples/filter_innd.py inn-2.4.3/samples/filter_innd.py
--- inn-2.4.2/samples/filter_innd.py	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/filter_innd.py	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #
-# $Id: filter_innd.py,v 1.3 2000/11/07 12:58:18 rra Exp $
+# $Id: filter_innd.py 4171 2000-11-07 12:58:18Z rra $
 #
 # This is a sample filter for the Python innd hook.
 #
diff -ruNp inn-2.4.2/samples/filter_nnrpd.pl inn-2.4.3/samples/filter_nnrpd.pl
--- inn-2.4.2/samples/filter_nnrpd.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/filter_nnrpd.pl	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #
-# $Id: filter_nnrpd.pl,v 1.2 2002/12/12 05:01:42 vinocur Exp $
+# $Id: filter_nnrpd.pl 5981 2002-12-12 05:01:42Z vinocur $
 #
 # Sample perl filtering code for nnrpd hook.
 #
diff -ruNp inn-2.4.2/samples/incoming.conf inn-2.4.3/samples/incoming.conf
--- inn-2.4.2/samples/incoming.conf	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/incoming.conf	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Revision: 1.6 $
+##  $Revision: 2372 $
 ##  incoming.conf - names and addresses that feed us news
 ##      
 ##  This file consists of three types of entries: key/value, peer and group.
diff -ruNp inn-2.4.2/samples/inn.conf.in inn-2.4.3/samples/inn.conf.in
--- inn-2.4.2/samples/inn.conf.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/inn.conf.in	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: inn.conf.in,v 1.57 2003/02/03 00:58:26 rra Exp $
+##  $Id: inn.conf.in 6201 2003-02-03 00:58:26Z rra $
 ##
 ##  inn.conf -- INN configuration data
 ##
diff -ruNp inn-2.4.2/samples/innfeed.conf inn-2.4.3/samples/innfeed.conf
--- inn-2.4.2/samples/innfeed.conf	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/innfeed.conf	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-# $Revision: 1.5 $
+# $Revision: 6211 $
 #
 # Sample innfeed config file. See the comment block at the
 # end for a fuller description of the format, and innfeed.conf(5) for a
diff -ruNp inn-2.4.2/samples/innreport.conf.in inn-2.4.3/samples/innreport.conf.in
--- inn-2.4.2/samples/innreport.conf.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/innreport.conf.in	Mon Mar 20 04:14:57 2006
@@ -980,7 +980,7 @@ section inn_unwanted_path {
 };
 
 section innd_perl {
-        title   "INND perl filter:";
+        title   "INND Perl filter:";
 	top     20;
 	data    "%innd_filter_perl";
 	sort    "$innd_filter_perl{$b} <=> $innd_filter_perl{$a}";
@@ -997,6 +997,27 @@ section innd_perl {
                 format        "%7d";
 		value         "$innd_filter_perl{$key}";
 		total         "total(%innd_filter_perl)";
+        };
+};
+
+section innd_python {
+        title   "INND Python filter:";
+	top     20;
+	data    "%innd_filter_python";
+	sort    "$innd_filter_python{$b} <=> $innd_filter_python{$a}";
+        column {
+                name          "Reason";
+                format        "%-71.71s";
+		value         "$key";
+		format_total  "TOTAL: %-64.64s";
+		total         "$num";
+        };
+        column {
+                name          "Count";
+                format_name   "%7s";
+                format        "%7d";
+		value         "$innd_filter_python{$key}";
+		total         "total(%innd_filter_python)";
         };
 };
 
diff -ruNp inn-2.4.2/samples/innwatch.ctl inn-2.4.3/samples/innwatch.ctl
--- inn-2.4.2/samples/innwatch.ctl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/innwatch.ctl	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Revision: 1.6 $
+##  $Revision: 4351 $
 ##  innwatch.ctl -- control file for innwatch.
 ##  Indicates what to run to test the state of the news system, and what
 ##  to do about it.  Format:
diff -ruNp inn-2.4.2/samples/moderators inn-2.4.3/samples/moderators
--- inn-2.4.2/samples/moderators	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/moderators	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: moderators,v 1.6.2.1 2003/05/06 06:12:31 rra Exp $
+##  $Id: moderators 7448 2005-12-11 22:21:06Z eagle $
 ##
 ##  moderators - Mailing addresses for moderators.
 ##
@@ -25,7 +25,7 @@ fido7.*:%s@fido7.ru
 ffm.*:%s@moderators.arcornews.de
 fj.*:%s@moderators.fj-news.org
 medlux.*:%s@news.medlux.ru
-nl.*:%s@nl.net
+nl.*:%s@nl.news-admin.org
 relcom.*:%s@moderators.relcom.ru
 ukr.*:%s@sita.kiev.ua
 
diff -ruNp inn-2.4.2/samples/newsfeeds.in inn-2.4.3/samples/newsfeeds.in
--- inn-2.4.2/samples/newsfeeds.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/newsfeeds.in	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: newsfeeds.in,v 1.19 2002/11/25 17:56:46 rra Exp $
+##  $Id: newsfeeds.in 5855 2002-11-25 17:56:46Z rra $
 ##
 ##  newsfeeds - determine where Usenet articles get sent
 ##
diff -ruNp inn-2.4.2/samples/nnrpd.track inn-2.4.3/samples/nnrpd.track
--- inn-2.4.2/samples/nnrpd.track	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/nnrpd.track	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Revision: 1.2 $    
+##  $Revision: 513 $    
 ##  nnrpd.track - file to specify which hosts to be tracked by nnrpd
 ##  Format:
 ##      <host>:<identity>
diff -ruNp inn-2.4.2/samples/nntpsend.ctl inn-2.4.3/samples/nntpsend.ctl
--- inn-2.4.2/samples/nntpsend.ctl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/nntpsend.ctl	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Revision: 1.2 $
+##  $Revision: 1165 $
 ##  Control file for nntpsend.
 ## Format:
 ##	site:fqdn:max_size:[<args...>]
diff -ruNp inn-2.4.2/samples/overview.fmt inn-2.4.3/samples/overview.fmt
--- inn-2.4.2/samples/overview.fmt	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/overview.fmt	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Revision: 1.3 $
+##  $Revision: 573 $
 ##  overview.fmt - format of news overview database
 ##  Format
 ##	<header>
diff -ruNp inn-2.4.2/samples/passwd.nntp inn-2.4.3/samples/passwd.nntp
--- inn-2.4.2/samples/passwd.nntp	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/passwd.nntp	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Revision: 1.2 $
+##  $Revision: 1165 $
 ##  passwd.nntp - passwords for connecting to remote NNTP servers
 ##  Format:
 ##	<host>:<name>:<pass>[:<style>]
diff -ruNp inn-2.4.2/samples/radius.conf inn-2.4.3/samples/radius.conf
--- inn-2.4.2/samples/radius.conf	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/radius.conf	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-# $Id: radius.conf,v 1.3 2002/12/01 20:31:23 rra Exp $
+# $Id: radius.conf 5895 2002-12-01 20:31:23Z rra $
 #
 # Sample RADIUS configuration file for the RADIUS readers.conf
 # authenticator.  If you're not using that authenticator, this file is not
diff -ruNp inn-2.4.2/samples/readers.conf inn-2.4.3/samples/readers.conf
--- inn-2.4.2/samples/readers.conf	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/readers.conf	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: readers.conf,v 1.5 2001/01/16 15:35:38 rra Exp $
+##  $Id: readers.conf 4371 2001-01-16 15:35:38Z rra $
 ##
 ##  readers.conf - Access control and configuration for nnrpd
 ##
diff -ruNp inn-2.4.2/samples/sasl.conf.in inn-2.4.3/samples/sasl.conf.in
--- inn-2.4.2/samples/sasl.conf.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/sasl.conf.in	Mon Mar 20 04:14:57 2006
@@ -1,3 +1,3 @@
 tls_ca_path:		@prefix@/lib
 tls_cert_file:		@prefix@/lib/cert.pem
-tls_key_file:		@prefix@/lib/key.pem
+tls_key_file:		@prefix@/lib/cert.pem
diff -ruNp inn-2.4.2/samples/startup.tcl inn-2.4.3/samples/startup.tcl
--- inn-2.4.2/samples/startup.tcl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/startup.tcl	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: startup.tcl,v 1.5 2001/01/15 13:32:40 rra Exp $
+##  $Id: startup.tcl 4353 2001-01-15 13:32:40Z rra $
 ##
 ##  Tcl filter initialization code
 ##
diff -ruNp inn-2.4.2/samples/startup_innd.pl inn-2.4.3/samples/startup_innd.pl
--- inn-2.4.2/samples/startup_innd.pl	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/startup_innd.pl	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 # 
-# RCSId:        $Id: startup_innd.pl,v 1.1.1.1 1997/08/04 04:03:49 gpalmer Exp $
+# RCSId:        $Id: startup_innd.pl 6312 2003-05-04 21:40:11Z rra $
 # Description:	Sample startup code for Perl hooks in INN. This file, after
 #		it's installed in the right spot, will be loaded when
 #		innd starts up. The following functions should be defined
diff -ruNp inn-2.4.2/samples/storage.conf inn-2.4.3/samples/storage.conf
--- inn-2.4.2/samples/storage.conf	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/samples/storage.conf	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: storage.conf,v 1.1.6.1 2003/12/27 04:18:33 rra Exp $
+##  $Id: storage.conf 6567 2003-12-27 04:18:33Z rra $
 ##
 ##  Rules for where INN should store incoming articles.
 ##
diff -ruNp inn-2.4.2/scripts/Makefile inn-2.4.3/scripts/Makefile
--- inn-2.4.2/scripts/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.13.2.1 2004/05/18 01:18:56 rra Exp $
+##  $Id: Makefile 6806 2004-05-18 01:18:57Z rra $
 ##
 ##  Files that can be handled by fixscript (and need to be so handled) need
 ##  a rule to build them from the .in version, and then all files need an
diff -ruNp inn-2.4.2/scripts/inncheck.in inn-2.4.3/scripts/inncheck.in
--- inn-2.4.2/scripts/inncheck.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/inncheck.in	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #!@_PATH_PERL@ --
-##  $Revision: 1.21 $
+##  $Revision: 7137 $
 ##  Sanity-check the configuration of an INN system
 ##  by Brendan Kehoe <brendan@cygnus.com> and Rich $alz.
 
@@ -398,6 +398,13 @@ newsfeeds
 	next input if /^#/;
 	print "$file:$line: ends with whitespace\n"
 	    if /\s+$/;
+
+        # Catch a variable setting.
+        if ( /^\$([A-Za-z0-9]+)=/ ) {
+            print "$file:$line: variable name too long\n"
+                if length ($1) > 31;
+            next input;
+        }
 
 	unless ( ($site, $pats, $flags, $param) =
 		    /^([^:]+):([^:]*):([^:]*):(.*)$/ ) {
diff -ruNp inn-2.4.2/scripts/innmail.in inn-2.4.3/scripts/innmail.in
--- inn-2.4.2/scripts/innmail.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/innmail.in	Mon Mar 20 04:14:57 2006
@@ -5,7 +5,7 @@
 # Start Date:   Fri, 25 Apr 1997 14:11:23 +0200
 # Project:      INN
 # File:         innmail.pl
-# RCSId:        $Id: innmail.in,v 1.2 1999/11/15 06:33:10 rra Exp $
+# RCSId:        $Id: innmail.in 2677 1999-11-15 06:33:13Z rra $
 # Description:  A simple replacement for UCB Mail to avoid nasty security
 #		problems. 
 # 
diff -ruNp inn-2.4.2/scripts/innreport.in inn-2.4.3/scripts/innreport.in
--- inn-2.4.2/scripts/innreport.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/innreport.in	Mon Mar 20 04:14:57 2006
@@ -72,17 +72,21 @@
 #            or, if you want to change some options:
 #    ${PATHETC}/innreport -f ${PATHETC}/innreport.conf options ${OLD_SYSLOG}
 #
-# Report: please report bugs (preferably) to the innreport mailing list
-#         (see below) or directly to the author (do not forget to
+# Report: please report bugs (preferably) to the INN mailing list
+#         (see README) or directly to the author (do not forget to
 #         include the result of the "-config" switch, the parameters
 #         passed on the command line and the INN version).
 #         Please also report unknown entries.
 #         Be sure your are using the latest version of this script before
 #         any report.
-#         (check <URL:ftp://ftp.sofaraway.org/pub/innreport/>)
 #
 ##########################################################################
 
+# Note: References to <ftp://ftp.sofaraway.org/pub/innreport/> have been
+# removed from the output because this site appears to no longer exist.  It
+# used to be the upstream source for innreport.  If there is a new site for
+# innreport releases, please notify the INN maintainers.
+
 # remember to add '-w' on the first line and to uncomment the 'use strict'
 # below before doing any changes to this file.
 
@@ -870,8 +874,7 @@ EOF
     $i++;
   }
   $result .= "</TABLE>\n</CENTER>\n<P><HR>";
-  $result .= "<A HREF=\"ftp://ftp.sofaraway.org/pub/innreport/\">innreport";
-  $result .= "</A> $version (c) 1996-1999 ";
+  $result .= "innreport $version (c) 1996-1999 ";
   $result .= "by Fabien Tassin &lt;<A HREF=\"mailto:fta\@sofaraway.org\">";
   $result .= "fta\@sofaraway.org</A>&gt;.\n";
   if (defined ($output{'default'}{'footer'})) {
@@ -1813,8 +1816,7 @@ sub Write_all_results {
   if ($HTML) {
     open (HTML, ">> $HTML_output") || die "Error: cant open $HTML_output\n";
     print HTML <<EOT;
-<A HREF="ftp://ftp.sofaraway.org/pub/innreport/">innreport</A>
-$version (c) 1996-1999 by Fabien Tassin
+innreport $version (c) 1996-1999 by Fabien Tassin
 &lt;<A HREF="mailto:fta\@sofaraway.org">fta\@sofaraway.org</A>&gt;.
 EOT
     if (defined $$h{'default'}{'footer'}) {
diff -ruNp inn-2.4.2/scripts/innreport_inn.pm inn-2.4.3/scripts/innreport_inn.pm
--- inn-2.4.2/scripts/innreport_inn.pm	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/innreport_inn.pm	Mon Mar 20 04:14:57 2006
@@ -249,8 +249,21 @@ sub collect {
       $innd_filter_perl{$1}++;
       return 1;
     }
+    # rejecting[python]
+    if ($left =~ /^rejecting\[python\] <[^>]+> \d+ (.*)/o) {
+      $innd_filter_python{$1}++;
+      return 1;
+    }
     # closed lost
     return 1 if $left =~ /^\S+ closed lost \d+/o;
+    # new control command
+    if ($left =~ /^ctlinnd command (\w)(:.*)?/o) {
+      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"}++;
+    }
     # control command (by letter)
     if ($left =~ /^(\w)$/o) {
       my $command = $1;
@@ -326,7 +339,7 @@ sub collect {
       return 1;
     }
     # closed (with times)
-    if ($left =~ /(\S+):\d+ closed seconds (\d+) accepted (\d+) refused (\d+) rejected (\d+) duplicate (\d+) accepted size (\d+) duplicate size (\d+)$/o) {
+    if ($left =~ /(\S+):\d+ closed seconds (\d+) accepted (\d+) refused (\d+) rejected (\d+) duplicate (\d+) accepted size (\d+) duplicate size (\d+)(?: rejected size (\d+))?$/o) {
       my ($server, $seconds, $accepted, $refused, $rejected, $duplicate, $accptsize, $dupsize) =
 	($1, $2, $3, $4, $5, $6, $7, $8);
       $server = lc $server unless $CASE_SENSITIVE;
diff -ruNp inn-2.4.2/scripts/innshellvars.in inn-2.4.3/scripts/innshellvars.in
--- inn-2.4.2/scripts/innshellvars.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/innshellvars.in	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #!@_PATH_SH@
-##  $Revision: 1.8 $
+##  $Revision: 7466 $
 ##  Set up any and all shell variables that an INN shell script
 ##  might need.  Also sets umask.
 
@@ -76,6 +76,8 @@ GPGV=@PATH_GPGV@
 PGP=@_PATH_PGP@
 SORT="@_PATH_SORT@"
 GETFTP="@GETFTP@"
+UUX=@_PATH_UUX@
+
 COMPRESS=@COMPRESS@
 GZIP=@GZIP@
 UNCOMPRESS="@UNCOMPRESS@"
@@ -107,3 +109,6 @@ umask @NEWSUMASK@
 
 PATH=${NEWSLBIN}:${NEWSBIN}:${PATH}:/bin:/usr/bin:/usr/ucb
 export PATH
+
+HOME=$PATHNEWS
+export HOME
diff -ruNp inn-2.4.2/scripts/innshellvars.pl.in inn-2.4.3/scripts/innshellvars.pl.in
--- inn-2.4.2/scripts/innshellvars.pl.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/innshellvars.pl.in	Mon Mar 20 04:14:57 2006
@@ -3,7 +3,7 @@
 # Start Date:   Sat, 24 Aug 1996 22:08:19 +0200
 # Project:      INN 
 # File:         innshellvars.pl
-# RCSId:        $Id: innshellvars.pl.in,v 1.9 2002/09/16 17:38:03 rra Exp $
+# RCSId:        $Id: innshellvars.pl.in 7466 2005-12-12 03:04:08Z eagle $
 # Description:  Set up any and all variables that an INN perl script
 #               might need.
 
@@ -78,6 +78,8 @@ $perl = "@_PATH_PERL@" ;
 $pgp = "@_PATH_PGP@" ;
 $sort = "@_PATH_SORT@" ;
 $getftp = "@GETFTP@" ;
+$uux = "@_PATH_UUX@" ;
+
 $compress = "@COMPRESS@" ;
 $gzip = "@GZIP@" ;
 $uncompress = "@UNCOMPRESS@" ;
@@ -106,6 +108,9 @@ $umask = @NEWSUMASK@ ;
 $syslog_facility = lc("@SYSLOG_FACILITY@");
 $syslog_facility =~ s/log_//;
 
+$ENV{'PATH'} ||= '';
 $ENV{'PATH'} = "${newslbin}:${newsbin}:$ENV{'PATH'}:/bin:/usr/bin:/usr/ucb" ;
+
+$ENV{'HOME'} = ${pathnews};
 
 1 ;
diff -ruNp inn-2.4.2/scripts/innshellvars.tcl.in inn-2.4.3/scripts/innshellvars.tcl.in
--- inn-2.4.2/scripts/innshellvars.tcl.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/innshellvars.tcl.in	Mon Mar 20 04:14:57 2006
@@ -4,7 +4,7 @@
 # Start Date:   Sat, 24 Aug 1996 23:45:34 +0200
 # Project:      INN
 # File:         innshellvars.tcl
-# RCSId:        $Id: innshellvars.tcl.in,v 1.6 2002/09/16 17:38:03 rra Exp $
+# RCSId:        $Id: innshellvars.tcl.in 7466 2005-12-12 03:04:08Z eagle $
 # Description:  Set up any and all variables that an INN tcl script
 #               might need.
 
@@ -77,6 +77,8 @@ set inn_inndf "${inn_newsbin}/inndf"
 set inn_egrep "@_PATH_EGREP@"
 set inn_sort "@_PATH_SORT@"
 set inn_getftp "@GETFTP@"
+set inn_uux "@_PATH_UUX@"
+
 set inn_compress "@COMPRESS@"
 set inn_gzip "@GZIP@"
 set inn_uncompress "@UNCOMPRESS@"
@@ -99,3 +101,5 @@ set inn_spooltemp "$inn_pathtmp"
 scan "@NEWSUMASK@" "%o" inn_umask
 
 set env(PATH) "$inn_newslbin:$inn_newsbin:$env(PATH):/bin:/usr/bin:/usr/ucb"
+
+set env(HOME) "$inn_pathnews"
diff -ruNp inn-2.4.2/scripts/innstat.in inn-2.4.3/scripts/innstat.in
--- inn-2.4.2/scripts/innstat.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/innstat.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-##  $Revision: 1.3.2.1 $
+##  $Revision: 6994 $
 ##  Display status of INN.
 ##  Written by Landon Curt Noll <chongo@toad.com>.
 
diff -ruNp inn-2.4.2/scripts/innupgrade.in inn-2.4.3/scripts/innupgrade.in
--- inn-2.4.2/scripts/innupgrade.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/innupgrade.in	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-##  $Id: innupgrade.in,v 1.8.2.2 2003/09/03 02:58:51 rra Exp $
+##  $Id: innupgrade.in 6458 2003-09-03 02:58:51Z rra $
 ##
 ##  Convert INN configuration files to the current syntax.
 ##
diff -ruNp inn-2.4.2/scripts/innwatch.in inn-2.4.3/scripts/innwatch.in
--- inn-2.4.2/scripts/innwatch.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/innwatch.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-##  $Revision: 1.2 $
+##  $Revision: 2677 $
 ##  Watch the state of the system relative to the news subsystem.
 ##  As controlled by the control file, when space or inodes are almost
 ##  exhausted innd is throttled, or paused, similarly if the load is
diff -ruNp inn-2.4.2/scripts/news.daily.in inn-2.4.3/scripts/news.daily.in
--- inn-2.4.2/scripts/news.daily.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/news.daily.in	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #!@_PATH_SH@
-##  $Revision: 1.11 $
+##  $Revision: 5999 $
 ##  Daily news maintenance.
 ##  Optional arguments:
 ##	expdir=xxx	Directory in which to build new history file
diff -ruNp inn-2.4.2/scripts/rc.news.in inn-2.4.3/scripts/rc.news.in
--- inn-2.4.2/scripts/rc.news.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/rc.news.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-##  $Revision: 1.10.2.3 $
+##  $Revision: 7435 $
 ##  News boot script.  Runs as "news" user.  Requires inndstart be
 ##  setuid root.  Run from rc.whatever as:
 ##     su news -c /path/to/rc.news >/dev/console
@@ -37,6 +37,7 @@ Xstop)
     fi
 
     printf "Stopping innd: "
+    ${PATHBIN}/ctlinnd throttle 'rc.news stop'
     ${PATHBIN}/ctlinnd shutdown 'rc.news stop'
 
     # wait for innd to exit (up to 60 sec)
diff -ruNp inn-2.4.2/scripts/scanlogs.in inn-2.4.3/scripts/scanlogs.in
--- inn-2.4.2/scripts/scanlogs.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/scanlogs.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-##  $Revision: 1.6 $
+##  $Revision: 5826 $
 ##  Summarize INN log files.
 ##  Optional arguments:
 ##	norotate	Do not rotate logfiles
diff -ruNp inn-2.4.2/scripts/tally.control.in inn-2.4.3/scripts/tally.control.in
--- inn-2.4.2/scripts/tally.control.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/tally.control.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-##  $Revision: 1.2 $
+##  $Revision: 2677 $
 ##  Tally/update the newgroup/rmgroup control log.
 ##  Merge in a log that contains newgroup/rmgroup control messages so that
 ##  the "control.log" file is updated to contain the new counts of how
diff -ruNp inn-2.4.2/scripts/writelog.in inn-2.4.3/scripts/writelog.in
--- inn-2.4.2/scripts/writelog.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/scripts/writelog.in	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,7 @@
 #! /bin/sh
 # fixscript will replace this line with code to load innshellvars
 
-##  $Revision: 1.2 $
+##  $Revision: 2677 $
 ##  Write a log file entry, by either mailing it or writing it safely.
 ##  Usage:
 ##	writelog name text... <input
diff -ruNp inn-2.4.2/site/Makefile inn-2.4.3/site/Makefile
--- inn-2.4.2/site/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/site/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Revision: 1.74.2.3 $
+##  $Revision: 6980 $
 include ../Makefile.global
 top = ..
 
diff -ruNp inn-2.4.2/site/getsafe.sh inn-2.4.3/site/getsafe.sh
--- inn-2.4.2/site/getsafe.sh	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/site/getsafe.sh	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #! /bin/sh 
-##  $Revision: 1.4 $
+##  $Revision: 847 $
 ##
 ##  Safely get a file from the samples directory.  Usage:
 ##	getsafe <sample> <localfile>
diff -ruNp inn-2.4.2/storage/Makefile inn-2.4.3/storage/Makefile
--- inn-2.4.2/storage/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.68.2.2 2004/05/18 01:18:56 rra Exp $
+##  $Id: Makefile 6806 2004-05-18 01:18:57Z rra $
 
 include ../Makefile.global
 
diff -ruNp inn-2.4.2/storage/buffindexed/buffindexed.c inn-2.4.3/storage/buffindexed/buffindexed.c
--- inn-2.4.2/storage/buffindexed/buffindexed.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/buffindexed/buffindexed.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: buffindexed.c,v 1.76.2.2 2004/05/20 22:23:28 rra Exp $
+/*  $Id: buffindexed.c 6854 2004-05-20 22:23:28Z rra $
 **
 **  Overview buffer and index method.
 */
diff -ruNp inn-2.4.2/storage/buildconfig.in inn-2.4.3/storage/buildconfig.in
--- inn-2.4.2/storage/buildconfig.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/buildconfig.in	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 
-##  $Id: buildconfig.in,v 1.17.2.1 2004/05/18 01:18:56 rra Exp $
+##  $Id: buildconfig.in 6806 2004-05-18 01:18:57Z rra $
 ##
 ##  Generate linkage code and makefiles for storage and overview methods.
 ##
diff -ruNp inn-2.4.2/storage/cnfs/cnfs-private.h inn-2.4.3/storage/cnfs/cnfs-private.h
--- inn-2.4.2/storage/cnfs/cnfs-private.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/cnfs/cnfs-private.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: cnfs-private.h,v 1.17 2002/12/11 04:51:42 rra Exp $
+/*  $Id: cnfs-private.h 5975 2002-12-11 04:51:43Z rra $
 **
 **  CNFS disk/file mode header file.
 */
diff -ruNp inn-2.4.2/storage/cnfs/cnfs.c inn-2.4.3/storage/cnfs/cnfs.c
--- inn-2.4.2/storage/cnfs/cnfs.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/cnfs/cnfs.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: cnfs.c,v 1.111.2.7 2004/12/20 03:33:57 rra Exp $
+/*  $Id: cnfs.c 7412 2005-10-09 03:44:35Z eagle $
 **
 **  Cyclic News File System.
 */
@@ -1062,6 +1062,7 @@ TOKEN cnfs_store(const ARTHANDLE article
     METACYCBUFF		*metacycbuff = NULL;
     int			i;
     static char		buf[1024];
+    static char		alignbuf[CNFS_BLOCKSIZE];
     char		*artcycbuffname;
     off_t               artoffset, middle;
     uint32_t		artcyclenum;
@@ -1071,6 +1072,7 @@ TOKEN cnfs_store(const ARTHANDLE article
     int			tonextblock;
     CNFSEXPIRERULES	*metaexprule;
     off_t		left;
+    size_t		totlen;
 
     for (metaexprule = metaexprulestab; metaexprule != (CNFSEXPIRERULES *)NULL; metaexprule = metaexprule->next) {
 	if (metaexprule->class == class)
@@ -1097,6 +1099,13 @@ TOKEN cnfs_store(const ARTHANDLE article
 	token.type = TOKEN_EMPTY;
 	return token;
     }
+
+    /* cycbuff->free should have already been aligned by the last write, but
+       realign it just to be sure. */
+    tonextblock = CNFS_BLOCKSIZE - (cycbuff->free & (CNFS_BLOCKSIZE - 1));
+    if (tonextblock != CNFS_BLOCKSIZE)
+	cycbuff->free += tonextblock;
+
     /* Article too big? */
     if (cycbuff->len - cycbuff->free < CNFS_BLOCKSIZE + 1)
         left = 0;
@@ -1139,6 +1148,7 @@ TOKEN cnfs_store(const ARTHANDLE article
 	  CNFSflushhead(cycbuff);		/* Flush, just for giggles */
 	}
     }
+
     /* Ah, at least we know all three important data */
     artcycbuffname = cycbuff->name;
     artoffset = cycbuff->free;
@@ -1161,19 +1171,28 @@ TOKEN cnfs_store(const ARTHANDLE article
 	return token;
     }
     if (iovcnt == 0) {
-	iov = xmalloc((article.iovcnt + 1) * sizeof(struct iovec));
-	iovcnt = article.iovcnt + 1;
-    } else if (iovcnt < article.iovcnt + 1) {
-        iov = xrealloc(iov, (article.iovcnt + 1) * sizeof(struct iovec));
-	iovcnt = article.iovcnt + 1;
+	iov = xmalloc((article.iovcnt + 2) * sizeof(struct iovec));
+	iovcnt = article.iovcnt + 2;
+    } else if (iovcnt < article.iovcnt + 2) {
+        iov = xrealloc(iov, (article.iovcnt + 2) * sizeof(struct iovec));
+	iovcnt = article.iovcnt + 2;
     }
     iov[0].iov_base = (char *) &cah;
     iov[0].iov_len = sizeof(cah);
-    for (i = 1 ; i <= article.iovcnt ; i++) {
+    totlen = iov[0].iov_len;
+    for (i = 1; i <= article.iovcnt; i++) {
         iov[i].iov_base = article.iov[i-1].iov_base;
         iov[i].iov_len = article.iov[i-1].iov_len;
+	totlen += iov[i].iov_len;
     }
-    if (xwritev(cycbuff->fd, iov, article.iovcnt + 1) < 0) {
+    if ((totlen & (CNFS_BLOCKSIZE - 1)) != 0) {
+	/* Want to xwritev an exact multiple of CNFS_BLOCKSIZE */
+	iov[i].iov_base = alignbuf;
+	iov[i].iov_len = CNFS_BLOCKSIZE - (totlen & (CNFS_BLOCKSIZE - 1));
+	totlen += iov[i].iov_len;
+	i++;
+    }
+    if (xwritev(cycbuff->fd, iov, i) < 0) {
 	SMseterror(SMERR_INTERNAL, "cnfs_store() xwritev() failed");
 	syslog(L_ERROR,
 	       "%s: cnfs_store xwritev failed for '%s' offset 0x%s: %m",
@@ -1185,9 +1204,8 @@ TOKEN cnfs_store(const ARTHANDLE article
     cycbuff->needflush = true;
 
     /* Now that the article is written, advance the free pointer & flush */
-    cycbuff->free += (off_t) article.len + sizeof(cah);
-    tonextblock = CNFS_BLOCKSIZE - (cycbuff->free & (CNFS_BLOCKSIZE - 1));
-    cycbuff->free += (off_t) tonextblock;
+    cycbuff->free += totlen;
+
     /*
     ** If cycbuff->free > cycbuff->len, don't worry.  The next cnfs_store()
     ** will detect the situation & wrap around correctly.
@@ -1349,7 +1367,10 @@ ARTHANDLE *cnfs_retrieve(const TOKEN tok
 	    return NULL;
 	}
 	mmap_invalidate(private->base, private->len);
-	madvise(private->base, private->len, MADV_SEQUENTIAL);
+        if (amount == RETR_ALL)
+	    madvise(private->base, private->len, MADV_WILLNEED);
+        else
+	    madvise(private->base, private->len, MADV_SEQUENTIAL);
     } else {
 	private->base = xmalloc(ntohl(cah.size));
 	pagefudge = 0;
diff -ruNp inn-2.4.2/storage/cnfs/cnfs.h inn-2.4.3/storage/cnfs/cnfs.h
--- inn-2.4.2/storage/cnfs/cnfs.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/cnfs/cnfs.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: cnfs.h,v 1.9 2001/01/04 06:01:35 rra Exp $
+/*  $Id: cnfs.h 4266 2001-01-04 06:01:36Z rra $
 **
 **  cyclic news file system header
 */
diff -ruNp inn-2.4.2/storage/expire.c inn-2.4.3/storage/expire.c
--- inn-2.4.2/storage/expire.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/expire.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: expire.c,v 1.16.2.1 2004/05/17 06:23:42 rra Exp $
+/*  $Id: expire.c 6775 2004-05-17 06:23:42Z rra $
 **
 **  Code for overview-driven expiration.
 **
diff -ruNp inn-2.4.2/storage/interface.c inn-2.4.3/storage/interface.c
--- inn-2.4.2/storage/interface.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/interface.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: interface.c,v 1.70 2003/03/27 23:56:00 rra Exp $
+/*  $Id: interface.c 7277 2005-06-07 04:40:16Z eagle $
 **
 **  Storage Manager interface
 */
@@ -450,6 +450,12 @@ SMreadconfig(void)
 		    break;
 		  case SMclass:
 		    class = atoi(p);
+                    if (class > NUM_STORAGE_CLASSES) {
+                        SMseterror(SMERR_CONFIG, "Storage class too large");
+                        warn("SM: storage class larger than %d, line %d",
+                             NUM_STORAGE_CLASSES, f->lineno);
+                        return false;
+                    }
 		    break;
 		  case SMexpire:
 		    q = strchr(p, ',');
diff -ruNp inn-2.4.2/storage/interface.h inn-2.4.3/storage/interface.h
--- inn-2.4.2/storage/interface.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/interface.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: interface.h,v 1.22 2002/12/07 09:47:16 rra Exp $
+/*  $Id: interface.h 5933 2002-12-07 09:47:17Z rra $
 **
 **  Storage Manager interface header
 */
diff -ruNp inn-2.4.2/storage/ov.c inn-2.4.3/storage/ov.c
--- inn-2.4.2/storage/ov.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/ov.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: ov.c,v 1.42 2003/01/19 01:15:36 rra Exp $
+/*  $Id: ov.c 6135 2003-01-19 01:15:40Z rra $
 **
 **  The implementation of the overview API.
 **
diff -ruNp inn-2.4.2/storage/overdata.c inn-2.4.3/storage/overdata.c
--- inn-2.4.2/storage/overdata.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/overdata.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: overdata.c,v 1.12.2.2 2004/05/16 20:26:55 rra Exp $
+/*  $Id: overdata.c 7477 2005-12-24 21:34:38Z eagle $
 **
 **  Overview data processing.
 **
@@ -56,7 +56,8 @@ overview_fields(void)
 struct vector *
 overview_extra_fields(void)
 {
-    struct vector *list;
+    struct vector *list = NULL;
+    struct vector *result = NULL;
     char *schema = NULL;
     char *line, *p;
     QIOSTATE *qp = NULL;
@@ -67,7 +68,7 @@ overview_extra_fields(void)
     qp = QIOopen(schema);
     if (qp == NULL) {
         syswarn("cannot open %s", schema);
-        goto fail;
+        goto done;
     }
     list = vector_new();
     for (field = 0, line = QIOread(qp); line != NULL; line = QIOread(qp)) {
@@ -104,14 +105,16 @@ overview_extra_fields(void)
             syswarn("error while reading %s", schema);
         }
     }
-    return list;
+    result = list;
 
- fail:
+done:
     if (schema != NULL)
         free(schema);
     if (qp != NULL)
         QIOclose(qp);
-    return NULL;
+    if (result == NULL && list != NULL)
+        vector_free(list);
+    return result;
 }
 
 
@@ -135,6 +138,24 @@ build_header(const char *article, size_t
     end = wire_endheader(data, article + length - 1);
     if (end == NULL)
         return;
+
+    /* Someone managed to break their server so that they were appending
+       multiple Xref headers, and INN had a bug where it wouldn't notice this
+       and reject the article.  Just in case, see if there are multiple Xref
+       headers and use the last one. */
+    if (strcasecmp(header, "xref") == 0) {
+        const char *next = end + 1;
+
+        while (next != NULL) {
+            next = wire_findheader(next, length - (next - article), header);
+            if (next != NULL) {
+                data = next;
+                end = wire_endheader(data, article + length - 1);
+                if (end == NULL)
+                    return;
+            }
+        }
+    }
 
     size = end - data + 1;
     offset = overview->used + overview->left;
diff -ruNp inn-2.4.2/storage/ovinterface.h inn-2.4.3/storage/ovinterface.h
--- inn-2.4.2/storage/ovinterface.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/ovinterface.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: ovinterface.h,v 1.20 2003/01/04 16:29:56 kondou Exp $
+/*  $Id: ovinterface.h 6113 2003-01-04 16:29:56Z kondou $
 **
 **  Overview interface header
 */
diff -ruNp inn-2.4.2/storage/timecaf/caf.c inn-2.4.3/storage/timecaf/caf.c
--- inn-2.4.2/storage/timecaf/caf.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/timecaf/caf.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: caf.c,v 1.16.2.2 2004/05/16 21:12:53 rra Exp $
+/*  $Id: caf.c 6723 2004-05-16 21:12:53Z rra $
 **
 **  Library routines needed for handling CAF (Crunched Article Files)
 **  Written by Richard Todd (rmtodd@mailhost.ecn.uoknor.edu) 3/24/96,
diff -ruNp inn-2.4.2/storage/timecaf/caf.h inn-2.4.3/storage/timecaf/caf.h
--- inn-2.4.2/storage/timecaf/caf.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/timecaf/caf.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Revision: 1.4 $
+/* $Revision: 5558 $
 ** Declarations needed for handling CAF (Crunched Article Files)
 ** Written by Richard Todd (rmtodd@mailhost.ecn.uoknor.edu) 3/24/96
 */
diff -ruNp inn-2.4.2/storage/timecaf/timecaf.c inn-2.4.3/storage/timecaf/timecaf.c
--- inn-2.4.2/storage/timecaf/timecaf.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/timecaf/timecaf.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: timecaf.c,v 1.27 2003/01/19 01:15:40 rra Exp $
+/*  $Id: timecaf.c 7412 2005-10-09 03:44:35Z eagle $
 **
 **  Like the timehash storage method (and heavily inspired by it), but uses
 **  the CAF library to store multiple articles in a single file.
@@ -468,6 +468,10 @@ static ARTHANDLE *OpenArticle(const char
 	    return NULL;
 	}
 	mmap_invalidate(private->mmapbase, private->mmaplen);
+        if (amount == RETR_ALL)
+            madvise(private->mmapbase, private->mmaplen, MADV_WILLNEED);
+        else
+            madvise(private->mmapbase, private->mmaplen, MADV_SEQUENTIAL);
 	private->artdata = private->mmapbase + delta;
     } else {
         private->artdata = xmalloc(private->artlen);
diff -ruNp inn-2.4.2/storage/timecaf/timecaf.h inn-2.4.3/storage/timecaf/timecaf.h
--- inn-2.4.2/storage/timecaf/timecaf.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/timecaf/timecaf.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: timecaf.h,v 1.7 2001/01/04 06:01:36 rra Exp $
+/*  $Id: timecaf.h 4266 2001-01-04 06:01:36Z rra $
 **
 **  timecaf -- like the timehash storage method (and heavily inspired
 **  by it), but uses the CAF library to store multiple articles in a
diff -ruNp inn-2.4.2/storage/timehash/timehash.c inn-2.4.3/storage/timehash/timehash.c
--- inn-2.4.2/storage/timehash/timehash.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/timehash/timehash.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: timehash.c,v 1.48.2.1 2003/05/31 19:48:28 rra Exp $
+/*  $Id: timehash.c 7412 2005-10-09 03:44:35Z eagle $
 **
 **  Timehash based storage method.
 */
@@ -225,6 +225,10 @@ static ARTHANDLE *OpenArticle(const char
 	    free(art);
 	    return NULL;
 	}
+        if (amount == RETR_ALL)
+            madvise(private->base, sb.st_size, MADV_WILLNEED);
+        else
+            madvise(private->base, sb.st_size, MADV_SEQUENTIAL);
     } else {
 	private->base = xmalloc(private->len);
 	if (read(fd, private->base, private->len) < 0) {
diff -ruNp inn-2.4.2/storage/timehash/timehash.h inn-2.4.3/storage/timehash/timehash.h
--- inn-2.4.2/storage/timehash/timehash.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/timehash/timehash.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: timehash.h,v 1.12 2001/01/04 06:02:50 rra Exp $
+/*  $Id: timehash.h 4268 2001-01-04 06:02:50Z rra $
 **
 **  timehash based storing method header
 */
diff -ruNp inn-2.4.2/storage/tradindexed/tdx-cache.c inn-2.4.3/storage/tradindexed/tdx-cache.c
--- inn-2.4.2/storage/tradindexed/tdx-cache.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/tradindexed/tdx-cache.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tdx-cache.c,v 1.2 2002/04/04 22:55:24 rra Exp $
+/*  $Id: tdx-cache.c 5394 2002-04-04 22:55:24Z rra $
 **
 **  Cache functions for open overview data files.
 **
diff -ruNp inn-2.4.2/storage/tradindexed/tdx-data.c inn-2.4.3/storage/tradindexed/tdx-data.c
--- inn-2.4.2/storage/tradindexed/tdx-data.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/tradindexed/tdx-data.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tdx-data.c,v 1.27.2.1 2003/07/12 19:07:16 rra Exp $
+/*  $Id: tdx-data.c 6387 2003-07-12 19:07:16Z rra $
 **
 **  Overview data file handling for the tradindexed overview method.
 **
diff -ruNp inn-2.4.2/storage/tradindexed/tdx-group.c inn-2.4.3/storage/tradindexed/tdx-group.c
--- inn-2.4.2/storage/tradindexed/tdx-group.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/tradindexed/tdx-group.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tdx-group.c,v 1.22.2.4 2004/01/05 21:40:07 rra Exp $
+/*  $Id: tdx-group.c 6593 2004-01-05 21:40:07Z rra $
 **
 **  Group index handling for the tradindexed overview method.
 **
diff -ruNp inn-2.4.2/storage/tradindexed/tdx-private.h inn-2.4.3/storage/tradindexed/tdx-private.h
--- inn-2.4.2/storage/tradindexed/tdx-private.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/tradindexed/tdx-private.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tdx-private.h,v 1.10 2002/05/06 05:46:15 rra Exp $
+/*  $Id: tdx-private.h 5465 2002-05-06 05:46:15Z rra $
 **
 **  Private APIs for the tradindexed overview method.
 */
diff -ruNp inn-2.4.2/storage/tradindexed/tdx-structure.h inn-2.4.3/storage/tradindexed/tdx-structure.h
--- inn-2.4.2/storage/tradindexed/tdx-structure.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/tradindexed/tdx-structure.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tdx-structure.h,v 1.4 2002/03/16 00:33:55 rra Exp $
+/*  $Id: tdx-structure.h 5327 2002-03-16 00:33:55Z rra $
 **
 **  Data structures for the tradindexed overview method.
 **
diff -ruNp inn-2.4.2/storage/tradindexed/tdx-util.c inn-2.4.3/storage/tradindexed/tdx-util.c
--- inn-2.4.2/storage/tradindexed/tdx-util.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/tradindexed/tdx-util.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tdx-util.c,v 1.16 2003/04/09 04:16:16 rra Exp $
+/*  $Id: tdx-util.c 6289 2003-04-09 04:16:16Z rra $
 **
 **  Utility for managing a tradindexed overview spool.
 **
diff -ruNp inn-2.4.2/storage/tradindexed/tradindexed.c inn-2.4.3/storage/tradindexed/tradindexed.c
--- inn-2.4.2/storage/tradindexed/tradindexed.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/tradindexed/tradindexed.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tradindexed.c,v 1.8 2003/01/14 06:03:28 rra Exp $
+/*  $Id: tradindexed.c 7138 2005-03-16 18:15:51Z hkehoe $
 **
 **  Interface implementation for the tradindexed overview method.
 **
@@ -188,7 +188,7 @@ tradindexed_add(char *group, ARTNUM artn
        the article number is lower than the low water mark for the group. */
     entry = tdx_index_entry(tradindexed->index, group);
     if (entry == NULL)
-        return false;
+        return true;
     if (tradindexed->cutoff && entry->low > artnum)
         return true;
 
diff -ruNp inn-2.4.2/storage/tradindexed/tradindexed.h inn-2.4.3/storage/tradindexed/tradindexed.h
--- inn-2.4.2/storage/tradindexed/tradindexed.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/tradindexed/tradindexed.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tradindexed.h,v 1.1 2002/03/15 21:09:33 rra Exp $
+/*  $Id: tradindexed.h 5324 2002-03-15 21:09:33Z rra $
 **
 **  Public interface for the tradindexed overview method.
 **
diff -ruNp inn-2.4.2/storage/tradspool/tradspool.c inn-2.4.3/storage/tradspool/tradspool.c
--- inn-2.4.2/storage/tradspool/tradspool.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/tradspool/tradspool.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: tradspool.c,v 1.50.2.2 2004/12/19 08:19:48 rra Exp $
+/*  $Id: tradspool.c 7412 2005-10-09 03:44:35Z eagle $
 **
 **  Storage manager module for traditional spool format.
 */
@@ -776,6 +776,11 @@ OpenArticle(const char *path, RETRTYPE a
 	    close(fd);
 	    return NULL;
 	}
+        if (amount == RETR_ALL)
+            madvise(private->artbase, sb.st_size, MADV_WILLNEED);
+        else
+            madvise(private->artbase, sb.st_size, MADV_SEQUENTIAL);
+
 	/* consider coexisting both wireformatted and nonwireformatted */
 	p = memchr(private->artbase, '\n', private->artlen);
 	if (p == NULL || p == private->artbase) {
diff -ruNp inn-2.4.2/storage/tradspool/tradspool.h inn-2.4.3/storage/tradspool/tradspool.h
--- inn-2.4.2/storage/tradspool/tradspool.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/tradspool/tradspool.h	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 /*
-** $Id: tradspool.h,v 1.7 2001/01/04 06:04:10 rra Exp $
+** $Id: tradspool.h 4269 2001-01-04 06:04:10Z rra $
 ** tradspool -- storage manager for traditional spool format.
 */
 
diff -ruNp inn-2.4.2/storage/trash/trash.c inn-2.4.3/storage/trash/trash.c
--- inn-2.4.2/storage/trash/trash.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/trash/trash.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: trash.c,v 1.15 2003/01/14 06:03:29 rra Exp $
+/*  $Id: trash.c 6124 2003-01-14 06:03:29Z rra $
 **
 **  Trashing articles method
 */
diff -ruNp inn-2.4.2/storage/trash/trash.h inn-2.4.3/storage/trash/trash.h
--- inn-2.4.2/storage/trash/trash.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/storage/trash/trash.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: trash.h,v 1.9 2001/01/04 06:02:02 rra Exp $
+/*  $Id: trash.h 4267 2001-01-04 06:02:02Z rra $
 **
 **  trashing articles method header
 */
diff -ruNp inn-2.4.2/support/config.guess inn-2.4.3/support/config.guess
--- inn-2.4.2/support/config.guess	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/support/config.guess	Mon Mar 20 04:14:57 2006
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-08-13'
+timestamp='2005-08-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@ timestamp='2004-08-13'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -53,7 +55,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -66,11 +68,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -123,7 +125,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -196,55 +198,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -297,37 +264,43 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -335,32 +308,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -369,10 +342,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -384,10 +357,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -398,40 +371,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -455,32 +428,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -496,29 +470,29 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -526,7 +500,7 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -541,14 +515,18 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -562,28 +540,28 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -645,9 +623,19 @@ EOF
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -655,11 +643,11 @@ EOF
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -687,152 +675,166 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
+	exit ;;
     x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
-	exit 0 ;;
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -850,7 +852,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -869,14 +871,17 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -890,7 +895,7 @@ EOF
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -898,25 +903,25 @@ EOF
 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -934,15 +939,15 @@ EOF
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
+		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
+		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -970,15 +975,18 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -986,27 +994,27 @@ EOF
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
+	exit ;;
+    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1014,15 +1022,16 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1040,73 +1049,73 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
+	exit ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1114,61 +1123,65 @@ EOF
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
@@ -1176,7 +1189,7 @@ EOF
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1184,22 +1197,25 @@ EOF
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1210,38 +1226,44 @@ EOF
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
-	esac
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1273,7 +1295,7 @@ main ()
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1362,11 +1384,12 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1375,22 +1398,22 @@ then
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1401,7 +1424,9 @@ This script, last modified $timestamp, h
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff -ruNp inn-2.4.2/support/config.sub inn-2.4.3/support/config.sub
--- inn-2.4.2/support/config.sub	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/support/config.sub	Mon Mar 20 04:14:57 2006
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2004-06-24'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@ timestamp='2004-06-24'
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -70,7 +71,7 @@ Report bugs and patches to <config-patch
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -83,11 +84,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +100,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -231,13 +232,14 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -246,6 +248,7 @@ case $basic_machine in
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -254,23 +257,28 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -298,7 +306,7 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -310,7 +318,7 @@ case $basic_machine in
 	| ip2k-* | iq2000-* \
 	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -319,6 +327,7 @@ case $basic_machine in
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -327,6 +336,7 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -334,20 +344,23 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -457,6 +470,9 @@ case $basic_machine in
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
@@ -486,6 +502,10 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -751,9 +771,8 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -1026,6 +1045,10 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
@@ -1075,12 +1098,9 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1167,7 +1187,8 @@ case $os in
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1185,7 +1206,7 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1294,6 +1315,9 @@ case $os in
 	-kaos*)
 		os=-kaos
 		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
 	-none)
 		;;
 	*)
@@ -1371,6 +1395,9 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1542,7 +1569,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff -ruNp inn-2.4.2/support/fixlog inn-2.4.3/support/fixlog
--- inn-2.4.2/support/fixlog	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/support/fixlog	Thu Jan  1 00:00:00 1970
@@ -1,87 +0,0 @@
-#! /usr/bin/perl -w
-
-##  $Id: fixlog,v 1.3 2002/12/12 23:43:59 rra Exp $
-##
-##  Filter cvs log output for cvs2cl.
-##
-##  Filter the output of cvs log, eliminating entries for files that do not
-##  have the tag of the branch that we're filtering for.  Also do some
-##  reformatting to deal with some of the CVS commit conventions used by
-##  people working on INN, so as to generate nice ChangeLog output.
-
-$| = 1;
-my ($file, @data);
-my $tag = shift;
-sub discard {
-    while (<>) {
-        last if /^={70}/;
-    }
-}
-while (<>) {
-    if (/^Working file: (.*)/) {
-        $file = $1;
-    } elsif (/^symbolic names:/) {
-        push (@data, $_);
-        my $found = 0;
-        $_ = <>;
-        while (defined && /^\s/) {
-            my ($checktag) = split /:/;
-            $checktag =~ s/^\s+//;
-            $found = 1 if (!$tag || $checktag eq $tag);
-            push (@data, $_);
-            $_ = <>;
-        }
-        unless ($found) {
-            discard;
-            undef @data;
-            next;
-        }
-    } elsif (/^-{20}/) {
-        print @data;
-        undef @data;
-        while (defined && !/^={70}/) {
-            print;
-            print scalar <>;
-            print scalar <>;
-            $_ = <>;
-            my $found = 0;
-            my $indent = 0;
-            while (defined && !/^-{20}/ && !/^={70}/) {
-                if (/^(\S+):\s*$/) {
-                    my $check = $1;
-                    print, next if $indent == -1;
-                    $found = 0 if $found > 1;
-                    $indent = 1;
-                    $found = 1 if ($check eq $file || $check =~ /\*/);
-                    push (@data, $_);
-                } elsif (/^\s*- /) {
-                    next if ($indent > 0 && !$found);
-                    $found++;
-                    $indent = 1;
-                    undef @data;
-                    s/^\s*-\s*//;
-                    print "\n$_";
-                } elsif (/^\s+/) {
-                    next if ($indent > 0 && !$found);
-                    if ($indent > 0) {
-                        s/^\s+//;
-                    } else {
-                        print @data;
-                        undef @data;
-                        $indent = -1;
-                    }
-                    print;
-                } else {
-                    $indent = -1;
-                    print @data, $_;
-                    undef @data;
-                }
-            } continue {
-                $_ = <>;
-            }
-        }
-        print;
-        next;
-    }
-    push (@data, $_);
-}
diff -ruNp inn-2.4.2/support/fixscript.in inn-2.4.3/support/fixscript.in
--- inn-2.4.2/support/fixscript.in	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/support/fixscript.in	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #! @_PATH_SH@
 
-##  $Id: fixscript.in,v 1.3 1999/11/27 07:23:49 rra Exp $
+##  $Id: fixscript.in 2805 1999-11-27 07:23:49Z rra $
 ##
 ##  Fix interpretor paths and INN variable load paths.
 ##
diff -ruNp inn-2.4.2/support/indent inn-2.4.3/support/indent
--- inn-2.4.2/support/indent	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/support/indent	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-##  $Id: indent,v 1.1 2002/03/02 01:43:53 rra Exp $
+##  $Id: indent 5165 2002-03-02 01:43:53Z rra $
 ##
 ##  Run indent on source files with INN options.
 ##
diff -ruNp inn-2.4.2/support/makedepend inn-2.4.3/support/makedepend
--- inn-2.4.2/support/makedepend	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/support/makedepend	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-##  $Id: makedepend,v 1.3 2002/09/29 23:32:52 rra Exp $
+##  $Id: makedepend 5787 2002-09-29 23:32:52Z rra $
 ##
 ##  Generate dependencies for INN makefiles
 ##
diff -ruNp inn-2.4.2/support/mkchangelog inn-2.4.3/support/mkchangelog
--- inn-2.4.2/support/mkchangelog	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/support/mkchangelog	Mon Mar 20 04:14:57 2006
@@ -1,33 +1,23 @@
 #! /usr/bin/perl -w
 
-##  $Id: mkchangelog,v 1.3 2002/12/12 23:52:29 rra Exp $
+##  $Id: mkchangelog 7473 2005-12-24 21:29:22Z eagle $
 ##
-##  Generate a ChangeLog from cvs log using cvs2cl and fixlog.
+##  Generate a ChangeLog from svn log using svn2cl.
 ##
-##  This script prompts the user for a date from which to pull log entries,
-##  a tag to select what files one wants log information for, and the path
-##  to cvs2cl and generates a ChangeLog file from that information and by
-##  running cvs log.
+##  This script prompts the user for a date from which to pull log entries
+##  and the prefix to strip from file names and generates a ChangeLog file
+##  by running svn2cl.
 
 $| = 1;
 
-print "Enter tag of release branch: ";
-my $tag = <STDIN>;
-chomp $tag;
+print "Enter prefix to strip from file names: ";
+my $prefix = <STDIN>;
+chomp $prefix;
 
 print "Enter date to start log at (YYYY-MM-DD): ";
 my $date = <STDIN>;
 chomp $date;
 
-print "Enter path to cvs2cl: ";
-my $cvs2cl = <STDIN>;
-chomp $cvs2cl;
-unless (-x $cvs2cl) { die "$cvs2cl not found\n" }
-
-print "\nRunning cvs log recursively....\n";
-system ("cvs log '-d>$date' | perl support/fixlog > CHANGES") == 0
-    or die "cvs log exited with status " . ($? >> 8) . "\n";
-
-print "\nRunning cvs2cl....\n";
-system ("$cvs2cl --stdin -F $tag --utc < CHANGES") == 0
-    or die "cvs2cl exited with status " . ($? >> 8) . "\n";
+print "\nRunning svn2cl....\n";
+system ("svn2cl --strip-prefix=$prefix --group-by-day -r 'HEAD:{$date}'") == 0
+    or die "svn2cl exited with status " . ($? >> 8) . "\n";
diff -ruNp inn-2.4.2/support/mkmanifest inn-2.4.3/support/mkmanifest
--- inn-2.4.2/support/mkmanifest	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/support/mkmanifest	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 
-##  $Id: mkmanifest,v 1.4 2002/12/18 11:13:51 alexk Exp $
+##  $Id: mkmanifest 7307 2005-06-11 08:38:15Z eagle $
 ##
 ##  Generate a filename-only manifest from an INN tree.
 ##
@@ -22,7 +22,7 @@ use File::Find qw(find);
 # in releases.
 @IGNORE = (qr%(\A|/)\.cvsignore\Z%, qr/\.[ao]\Z/, qr%(\A|/)CVS(/|\Z)%,
            qr%(\A|/)\.?\#%, qr/\.(old|bak|orig|rej)$/, qr%(\A|/)core\Z%,
-           qr/~$/, qr%(\A|/)\.pure%);
+           qr/~$/, qr%(\A|/)\.pure%, qr%(\A|/)\.svn(/|\Z)%);
 
 # Build a list of all the files ignored by rules in .cvsignore files.  Meant
 # to be run as the wanted sub of a call to File::Find.  Stuff in .cvsignore
diff -ruNp inn-2.4.2/support/mksnapshot inn-2.4.3/support/mksnapshot
--- inn-2.4.2/support/mksnapshot	Thu Jan  1 00:00:00 1970
+++ inn-2.4.3/support/mksnapshot	Mon Mar 20 04:14:57 2006
@@ -0,0 +1,50 @@
+#! /bin/sh
+
+##  $Id: mksnapshot 7308 2005-06-11 08:39:54Z eagle $
+##
+##  Build a snapshot of the current tree.
+##
+##  Meant to be run on a fresh Subversion checkout, this script does the
+##  necessary work to generate a snapshot.  It expects to be invoked from the
+##  top level of the source tree and leaves the generated snapshot in that
+##  same directory as a .tar.gz file.
+##
+##  Snapshot generation will fail if the tree will not compile or if make test
+##  fails.  In either case, the output is left in snapshot.log.
+##
+##  This script takes one argument, a string representing what tree the
+##  snapshot is being taken from.  Generally this string is either CURRENT or
+##  STABLE.
+
+set -e
+
+date=`date -u +%Y%m%d`
+tree="$1"
+if [ -z "$tree" ] ; then
+    echo "$0: no tree name specified" >&2
+    exit 1
+fi
+
+exec > snapshot.log 2>&1
+
+./configure
+make warnings
+make test
+make check-manifest
+
+cat > README.snapshot <<EOF
+This is a snapshot of the current development version of INN, pulled
+automatically from the Subversion repository.  It was made on:
+
+    `date -u +"%B %e, %Y @ %I:%M %p %Z"`
+
+This code should be considered experimental.  Only a default compile and
+automated testing is done before it is made available.  If it breaks, we'd
+like to know at inn-bugs@isc.org, but if it causes your system to explode,
+don't blame us.
+
+If you are using this code, it's highly recommended that you be on the
+inn-workers@isc.org mailing list.  See README for more information.
+EOF
+
+make snapshot SNAPSHOT="$tree" SNAPDATE="$date"
diff -ruNp inn-2.4.2/support/mksystem inn-2.4.3/support/mksystem
--- inn-2.4.2/support/mksystem	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/support/mksystem	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-##  $Id: mksystem,v 1.3.2.1 2003/07/12 19:14:58 rra Exp $
+##  $Id: mksystem 6397 2003-07-12 19:14:58Z rra $
 ##
 ##  Create include/inn/system.h from include/config.h.
 ##
diff -ruNp inn-2.4.2/support/mkversion inn-2.4.3/support/mkversion
--- inn-2.4.2/support/mkversion	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/support/mkversion	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-##  $Id: mkversion,v 1.1 2001/02/24 07:58:19 rra Exp $
+##  $Id: mkversion 7345 2005-07-02 05:04:05Z eagle $
 ##
 ##  Create version.h from INN version information.
 ##
@@ -12,7 +12,7 @@
 version="$1"
 extra="$2"
 string="INN $version"
-if [ x"$extra" = x"CVS prerelease" ] ; then
+if [ x"$extra" = x"prerelease" ] ; then
     date=`date +%Y%m%d`
     extra="$date $extra"
 fi
diff -ruNp inn-2.4.2/tests/Makefile inn-2.4.3/tests/Makefile
--- inn-2.4.2/tests/Makefile	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/Makefile	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-##  $Id: Makefile,v 1.33 2003/01/21 06:25:45 alexk Exp $
+##  $Id: Makefile 7494 2006-03-19 23:19:30Z eagle $
 
 include ../Makefile.global
 
@@ -61,7 +61,7 @@ lib/hash.t: lib/hash-t.o libtest.o $(LIB
 lib/hashtab.t: lib/hashtab-t.o libtest.o $(LIBINN)
 	$(LINK) lib/hashtab-t.o libtest.o $(LIBINN)
 
-lib/hstrerror.o: ../lib/hstrerror.o
+lib/hstrerror.o: ../lib/hstrerror.c
 	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/hstrerror.c
 
 lib/hstrerror.t: lib/hstrerror.o lib/hstrerror-t.o libtest.o
diff -ruNp inn-2.4.2/tests/authprogs/ckpasswd.t inn-2.4.3/tests/authprogs/ckpasswd.t
--- inn-2.4.2/tests/authprogs/ckpasswd.t	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/authprogs/ckpasswd.t	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: ckpasswd.t,v 1.2 2002/08/12 06:01:09 rra Exp $
+# $Id: ckpasswd.t 5572 2002-08-12 06:01:09Z rra $
 #
 # Test suite for ckpasswd.
 
diff -ruNp inn-2.4.2/tests/authprogs/domain.t inn-2.4.3/tests/authprogs/domain.t
--- inn-2.4.2/tests/authprogs/domain.t	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/authprogs/domain.t	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: domain.t,v 1.2 2002/12/08 04:20:46 rra Exp $
+# $Id: domain.t 5948 2002-12-08 04:20:46Z rra $
 #
 # Test suite for domain.
 
diff -ruNp inn-2.4.2/tests/lib/buffer-t.c inn-2.4.3/tests/lib/buffer-t.c
--- inn-2.4.2/tests/lib/buffer-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/buffer-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: buffer-t.c,v 1.3 2002/05/20 12:50:57 alexk Exp $ */
+/* $Id: buffer-t.c 5469 2002-05-20 12:50:57Z alexk $ */
 /* buffer test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/concat-t.c inn-2.4.3/tests/lib/concat-t.c
--- inn-2.4.2/tests/lib/concat-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/concat-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: concat-t.c,v 1.5 2001/12/12 09:15:24 rra Exp $ */
+/* $Id: concat-t.c 5054 2001-12-12 09:15:24Z rra $ */
 /* concat test suite. */
 
 #include <stdio.h>
diff -ruNp inn-2.4.2/tests/lib/config/errors inn-2.4.3/tests/lib/config/errors
--- inn-2.4.2/tests/lib/config/errors	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/config/errors	Mon Mar 20 04:14:57 2006
@@ -45,7 +45,8 @@ parameter: value # this is a comment
 ===
 config/tmp:1: parse error: saw string, expecting semicolon or newline
 ===
-parameter: "value
value"
+parameter: "value
+value"
 ===
 config/tmp:1: no close quote seen for quoted string
 ===
diff -ruNp inn-2.4.2/tests/lib/config/line-endings inn-2.4.3/tests/lib/config/line-endings
--- inn-2.4.2/tests/lib/config/line-endings	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/config/line-endings	Mon Mar 20 04:14:57 2006
@@ -1,7 +1,10 @@
-# This is a leading comment.
-param1: on
param2:  true
-param3: yes
# this is a comment \
-param4: off
+# This is a leading comment.
+param1: on
+param2:  true
+param3: yes
+# this is a comment \
+param4: off
   # this is another
-int1: 0

-int2: -3
\ No newline at end of file
+int1: 0
+
+int2: -3
diff -ruNp inn-2.4.2/tests/lib/config/warnings inn-2.4.3/tests/lib/config/warnings
--- inn-2.4.2/tests/lib/config/warnings	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/config/warnings	Mon Mar 20 04:14:57 2006
@@ -4,13 +4,15 @@ parameter: value
 ===
 config/tmp:3: duplicate parameter parameter
 ===
-# Line numbering and Macs.
parameter: value
parameter: value
+# Line numbering and Macs.
+parameter: value
+parameter: value
 ===
 config/tmp:3: duplicate parameter parameter
 ===
-# Line numbering and Windows.
-parameter: value
-parameter: value
+# Line numbering and Windows.
+parameter: value
+parameter: value
 ===
 config/tmp:3: duplicate parameter parameter
 ===
diff -ruNp inn-2.4.2/tests/lib/confparse-t.c inn-2.4.3/tests/lib/confparse-t.c
--- inn-2.4.2/tests/lib/confparse-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/confparse-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: confparse-t.c,v 1.12 2002/12/08 09:28:32 rra Exp $ */
+/* $Id: confparse-t.c 5955 2002-12-08 09:28:32Z rra $ */
 /* confparse test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/date-t.c inn-2.4.3/tests/lib/date-t.c
--- inn-2.4.2/tests/lib/date-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/date-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: date-t.c,v 1.10 2003/01/18 22:26:49 rra Exp $ */
+/* $Id: date-t.c 7495 2006-03-19 23:21:38Z eagle $ */
 /* makedate test suite */
 
 #include "config.h"
@@ -23,8 +23,6 @@ static const time_t test_times[] = {
     954669599UL,                /* Sun,  2 Apr 2000 01:59:59 -0800 (PST) */
     954669600UL,                /* Sun,  2 Apr 2000 03:00:00 -0700 (PDT) */
     967707668UL,                /* Thu, 31 Aug 2000 07:41:08 +0000 (UTC) */
-    972808200UL,                /* Sun, 29 Oct 2000 01:30:00 -0700 (PDT) */
-    972809999UL,                /* Sun, 29 Oct 2000 01:59:59 -0700 (PDT) */
     972813600UL                 /* Sun, 29 Oct 2000 02:00:00 -0800 (PST) */
 };
 
@@ -78,7 +76,7 @@ main(void)
     char PST8PDT[] = "TZ=PST8PDT";
     char Newfoundland[] = "TZ=Canada/Newfoundland";
 
-    printf("%d\n", 40 + ARRAY_SIZE(test_times) * 3 + 3);
+    printf("%d\n", 44 + ARRAY_SIZE(test_times) * 3 + 3);
 
     now = time(NULL);
     status = makedate(-1, false, buff, sizeof(buff));
@@ -125,7 +123,10 @@ main(void)
 
     status = makedate(900000045UL, true, buff, sizeof(buff));
     ok(16, status);
-    ok_string(17, "Thu, 9 Jul 1998 13:30:45 -0230 (NDT)", buff);
+    if (memcmp(buff, "Thu, 9 Jul 1998 16:00:45 +0000", 30) == 0)
+        printf("ok 17 # skip - Newfoundland time zone not installed\n");
+    else
+        ok_string(17, "Thu, 9 Jul 1998 13:30:45 -0230 (NDT)", buff);
 
     putenv(PST8PDT);
     tzset();
@@ -159,8 +160,16 @@ main(void)
     ok(39, result == 972806400UL || result == 972810000UL);
     result = parsedate_nntp("001029", "013000", true);
     ok(40, result == 972808200UL || result == 972811800UL);
+    result = parsedate_nntp("20001029", "013000", true);
+    ok(41, result == 972808200UL || result == 972811800UL);
+    result = parsedate_nntp("001029", "013000", true);
+    ok(42, result == 972808200UL || result == 972811800UL);
+    result = parsedate_nntp("20001029", "015959", true);
+    ok(43, result == 972809999UL || result == 972813599UL);
+    result = parsedate_nntp("001029", "015959", true);
+    ok(44, result == 972809999UL || result == 972813599UL);
 
-    n = 41;
+    n = 45;
     for (i = 0; i < ARRAY_SIZE(test_times); i++)
         check_nntp(&n, test_times[i]);
     check_nntp(&n, time(NULL));
diff -ruNp inn-2.4.2/tests/lib/fakewrite.c inn-2.4.3/tests/lib/fakewrite.c
--- inn-2.4.2/tests/lib/fakewrite.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/fakewrite.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: fakewrite.c,v 1.6 2002/04/15 08:40:20 rra Exp $ */
+/* $Id: fakewrite.c 5417 2002-04-15 08:40:20Z rra $ */
 /* Fake write and writev functions for testing xwrite and xwritev. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/hash-t.c inn-2.4.3/tests/lib/hash-t.c
--- inn-2.4.2/tests/lib/hash-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/hash-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: hash-t.c,v 1.1 2002/08/21 19:35:37 alexk Exp $ */
+/* $Id: hash-t.c 5623 2002-08-21 19:35:37Z alexk $ */
 /* hash test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/hashtab-t.c inn-2.4.3/tests/lib/hashtab-t.c
--- inn-2.4.2/tests/lib/hashtab-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/hashtab-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: hashtab-t.c,v 1.8 2002/12/24 05:02:51 rra Exp $ */
+/* $Id: hashtab-t.c 6026 2002-12-24 05:02:51Z rra $ */
 /* Test suite for lib/hashtab.c. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/hstrerror-t.c inn-2.4.3/tests/lib/hstrerror-t.c
--- inn-2.4.2/tests/lib/hstrerror-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/hstrerror-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: hstrerror-t.c,v 1.3 2001/12/12 09:20:10 rra Exp $ */
+/* $Id: hstrerror-t.c 5060 2001-12-12 09:20:10Z rra $ */
 /* hstrerror test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/inet_aton-t.c inn-2.4.3/tests/lib/inet_aton-t.c
--- inn-2.4.2/tests/lib/inet_aton-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/inet_aton-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: inet_aton-t.c,v 1.4 2001/12/12 09:21:17 rra Exp $ */
+/* $Id: inet_aton-t.c 5061 2001-12-12 09:21:17Z rra $ */
 /* inet_aton test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/inet_ntoa-t.c inn-2.4.3/tests/lib/inet_ntoa-t.c
--- inn-2.4.2/tests/lib/inet_ntoa-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/inet_ntoa-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: inet_ntoa-t.c,v 1.3 2001/12/12 09:21:17 rra Exp $ */
+/* $Id: inet_ntoa-t.c 5061 2001-12-12 09:21:17Z rra $ */
 /* inet_ntoa test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/innconf-t.c inn-2.4.3/tests/lib/innconf-t.c
--- inn-2.4.2/tests/lib/innconf-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/innconf-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: innconf-t.c,v 1.4 2002/12/27 07:24:55 rra Exp $ */
+/* $Id: innconf-t.c 6084 2002-12-27 07:24:55Z rra $ */
 /* innconf test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/list-t.c inn-2.4.3/tests/lib/list-t.c
--- inn-2.4.2/tests/lib/list-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/list-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: list-t.c,v 1.2 2003/04/15 03:43:45 rra Exp $ */
+/* $Id: list-t.c 6294 2003-04-15 03:43:45Z rra $ */
 /* Test suite for list routines. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/md5-t.c inn-2.4.3/tests/lib/md5-t.c
--- inn-2.4.2/tests/lib/md5-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/md5-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: md5-t.c,v 1.5 2003/01/18 22:26:49 rra Exp $ */
+/* $Id: md5-t.c 6128 2003-01-18 22:26:49Z rra $ */
 /* MD5 hashing test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/memcmp-t.c inn-2.4.3/tests/lib/memcmp-t.c
--- inn-2.4.2/tests/lib/memcmp-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/memcmp-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: memcmp-t.c,v 1.2 2001/12/12 09:15:24 rra Exp $ */
+/* $Id: memcmp-t.c 5054 2001-12-12 09:15:24Z rra $ */
 /* memcmp test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/messages-t.c inn-2.4.3/tests/lib/messages-t.c
--- inn-2.4.2/tests/lib/messages-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/messages-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: messages-t.c,v 1.2 2002/08/23 22:52:53 rra Exp $ */
+/* $Id: messages-t.c 5638 2002-08-23 22:52:53Z rra $ */
 /* Test suite for error handling routines. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/mkstemp-t.c inn-2.4.3/tests/lib/mkstemp-t.c
--- inn-2.4.2/tests/lib/mkstemp-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/mkstemp-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: mkstemp-t.c,v 1.1 2002/03/17 07:39:14 rra Exp $ */
+/* $Id: mkstemp-t.c 5329 2002-03-17 07:39:14Z rra $ */
 /* mkstemp test suite */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/pread-t.c inn-2.4.3/tests/lib/pread-t.c
--- inn-2.4.2/tests/lib/pread-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/pread-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: pread-t.c,v 1.4 2002/03/31 21:45:11 rra Exp $ */
+/* $Id: pread-t.c 5379 2002-03-31 21:45:12Z rra $ */
 /* pread test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/pwrite-t.c inn-2.4.3/tests/lib/pwrite-t.c
--- inn-2.4.2/tests/lib/pwrite-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/pwrite-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: pwrite-t.c,v 1.4 2002/03/31 21:45:11 rra Exp $ */
+/* $Id: pwrite-t.c 5379 2002-03-31 21:45:12Z rra $ */
 /* pwrite test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/qio-t.c inn-2.4.3/tests/lib/qio-t.c
--- inn-2.4.2/tests/lib/qio-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/qio-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: qio-t.c,v 1.4.2.1 2004/06/10 22:04:58 hkehoe Exp $ */
+/* $Id: qio-t.c 6939 2004-06-10 22:04:58Z hkehoe $ */
 /* Test suite for the Quick I/O library */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/setenv-t.c inn-2.4.3/tests/lib/setenv-t.c
--- inn-2.4.2/tests/lib/setenv-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/setenv-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: setenv-t.c,v 1.5 2002/03/31 21:45:11 rra Exp $ */
+/* $Id: setenv-t.c 7492 2006-03-19 23:07:34Z eagle $ */
 /* setenv test suite. */
 
 #include "config.h"
@@ -41,9 +41,9 @@ main(void)
        that we can allocate one string of this size but not two.  Note that
        Linux doesn't support data limits, so skip if we get an unexpected
        success here. */
-    value = xmalloc(50 * 1024);
-    memset(value, 'A', 50 * 1024 - 1);
-    value[50 * 1024 - 1] = 0;
+    value = xmalloc(100 * 1024);
+    memset(value, 'A', 100 * 1024 - 1);
+    value[100 * 1024 - 1] = 0;
     ok(9, test_setenv(test_var, value, 0) == 0);
     ok_string(10, "", getenv(test_var));
     status = test_setenv(test_var, value, 1);
diff -ruNp inn-2.4.2/tests/lib/setenv.t inn-2.4.3/tests/lib/setenv.t
--- inn-2.4.2/tests/lib/setenv.t	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/setenv.t	Mon Mar 20 04:14:57 2006
@@ -1,8 +1,8 @@
 #! /bin/sh
-# $Id: setenv.t,v 1.2 2000/08/11 05:29:43 rra Exp $
+# $Id: setenv.t 7492 2006-03-19 23:07:34Z eagle $
 #
 # Wrapper around the setenv test suite to set a resource limit low enough
-# that two strings over 50KB can't both be allocated, allowing the memory
+# that two strings over 100KB can't both be allocated, allowing the memory
 # allocation failure code in setenv to be exercised.  Done with this
 # wrapper because ulimit is more easily portable than the corresponding C
 # code.
@@ -13,5 +13,5 @@ for file in ./setenv.tr lib/setenv.tr te
     [ -x $file ] && setenv=$file
 done
 
-ulimit -d 90
+ulimit -d 150
 exec $setenv
diff -ruNp inn-2.4.2/tests/lib/snprintf-t.c inn-2.4.3/tests/lib/snprintf-t.c
--- inn-2.4.2/tests/lib/snprintf-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/snprintf-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: snprintf-t.c,v 1.6 2003/01/18 22:26:49 rra Exp $ */
+/* $Id: snprintf-t.c 6128 2003-01-18 22:26:49Z rra $ */
 /* snprintf test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/strerror-t.c inn-2.4.3/tests/lib/strerror-t.c
--- inn-2.4.2/tests/lib/strerror-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/strerror-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: strerror-t.c,v 1.5 2002/08/11 23:43:48 rra Exp $ */
+/* $Id: strerror-t.c 5559 2002-08-11 23:43:48Z rra $ */
 /* strerror test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/strlcat-t.c inn-2.4.3/tests/lib/strlcat-t.c
--- inn-2.4.2/tests/lib/strlcat-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/strlcat-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: strlcat-t.c,v 1.2 2002/08/25 21:54:57 rra Exp $ */
+/* $Id: strlcat-t.c 5656 2002-08-25 21:54:57Z rra $ */
 /* strlcat test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/strlcpy-t.c inn-2.4.3/tests/lib/strlcpy-t.c
--- inn-2.4.2/tests/lib/strlcpy-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/strlcpy-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: strlcpy-t.c,v 1.1 2002/08/12 02:06:44 rra Exp $ */
+/* $Id: strlcpy-t.c 5568 2002-08-12 02:06:44Z rra $ */
 /* strlcpy test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/tst-t.c inn-2.4.3/tests/lib/tst-t.c
--- inn-2.4.2/tests/lib/tst-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/tst-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: tst-t.c,v 1.5 2002/12/27 07:24:36 rra Exp $ */
+/* $Id: tst-t.c 7262 2005-06-06 04:45:48Z eagle $ */
 /* Test suite for ternary search tries. */
 
 #include "config.h"
@@ -88,6 +88,8 @@ main(void)
     else {
         while (fgets((char *) buffer, sizeof(buffer), words)) {
             buffer[ustrlen(buffer) - 1] = '\0';
+            if (buffer[0] == '\0')
+                continue;
             word = (unsigned char *) xstrdup((char *) buffer);
             if (tst_insert(tst, buffer, word, 0, NULL) != TST_OK) {
                 if (!reported)
@@ -106,6 +108,8 @@ main(void)
     else {
         while (fgets((char *) buffer, sizeof(buffer), words)) {
             buffer[ustrlen(buffer) - 1] = '\0';
+            if (buffer[0] == '\0')
+                continue;
             word = tst_search(tst, buffer);
             if (word == NULL || strcmp((char *) word, buffer) != 0) {
                 if (!reported)
diff -ruNp inn-2.4.2/tests/lib/uwildmat-t.c inn-2.4.3/tests/lib/uwildmat-t.c
--- inn-2.4.2/tests/lib/uwildmat-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/uwildmat-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: uwildmat-t.c,v 1.1 2002/08/10 18:51:37 rra Exp $
+/*  $Id: uwildmat-t.c 7262 2005-06-06 04:45:48Z eagle $
 **
 **  wildmat test suite.
 **
@@ -174,7 +174,7 @@ main(void)
     test_r(107, "\303\303",       "??",                true);
     test_r(108, "\200",           "[\177-\201]",       true);
     test_r(109, "abc\206d",       "*\206d",            true);
-    test_r(110, "\303\206",       "*\206",             true);
+    test_r(110, "\303\206",       "*\206",             false);
     test_r(111, "\40",            "\240",              false);
     test_r(112, "\323",           "[a-\377]",          true);
     test_r(113, "\376\277\277\277\277\277", "?",       false);
diff -ruNp inn-2.4.2/tests/lib/vector-t.c inn-2.4.3/tests/lib/vector-t.c
--- inn-2.4.2/tests/lib/vector-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/vector-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: vector-t.c,v 1.7 2002/08/28 23:21:32 rra Exp $ */
+/* $Id: vector-t.c 5678 2002-08-28 23:21:32Z rra $ */
 /* vector test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/wire-t.c inn-2.4.3/tests/lib/wire-t.c
--- inn-2.4.2/tests/lib/wire-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/wire-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: wire-t.c,v 1.3 2002/12/27 07:24:55 rra Exp $ */
+/* $Id: wire-t.c 6084 2002-12-27 07:24:55Z rra $ */
 /* wire test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/xmalloc.c inn-2.4.3/tests/lib/xmalloc.c
--- inn-2.4.2/tests/lib/xmalloc.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/xmalloc.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: xmalloc.c,v 1.5 2002/03/31 21:45:11 rra Exp $ */
+/* $Id: xmalloc.c 5379 2002-03-31 21:45:12Z rra $ */
 /* Test suite for xmalloc and family. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/lib/xmalloc.t inn-2.4.3/tests/lib/xmalloc.t
--- inn-2.4.2/tests/lib/xmalloc.t	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/xmalloc.t	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: xmalloc.t,v 1.6 2002/03/31 21:45:12 rra Exp $
+# $Id: xmalloc.t 5379 2002-03-31 21:45:12Z rra $
 #
 # Test suite for xmalloc and friends.
 
diff -ruNp inn-2.4.2/tests/lib/xwrite-t.c inn-2.4.3/tests/lib/xwrite-t.c
--- inn-2.4.2/tests/lib/xwrite-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/lib/xwrite-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: xwrite-t.c,v 1.5 2002/09/30 01:05:09 rra Exp $ */
+/* $Id: xwrite-t.c 5790 2002-09-30 01:05:09Z rra $ */
 /* Test suite for xwrite and xwritev. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/libtest.c inn-2.4.3/tests/libtest.c
--- inn-2.4.2/tests/libtest.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/libtest.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: libtest.c,v 1.3 2002/12/08 09:28:31 rra Exp $
+/*  $Id: libtest.c 5955 2002-12-08 09:28:32Z rra $
 **
 **  Some utility routines for writing tests.
 **
diff -ruNp inn-2.4.2/tests/libtest.h inn-2.4.3/tests/libtest.h
--- inn-2.4.2/tests/libtest.h	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/libtest.h	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/*  $Id: libtest.h,v 1.3 2002/12/08 09:28:31 rra Exp $
+/*  $Id: libtest.h 5955 2002-12-08 09:28:32Z rra $
 **
 **  Some utility routines for writing tests.
 */
diff -ruNp inn-2.4.2/tests/overview/munge-data inn-2.4.3/tests/overview/munge-data
--- inn-2.4.2/tests/overview/munge-data	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/overview/munge-data	Mon Mar 20 04:14:57 2006
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-##  $Id: munge-data,v 1.1 2002/02/24 06:24:55 rra Exp $
+##  $Id: munge-data 5144 2002-02-24 06:24:55Z rra $
 ##
 ##  Munge .overview data into something suitable for test data.
 ##
diff -ruNp inn-2.4.2/tests/overview/tradindexed-t.c inn-2.4.3/tests/overview/tradindexed-t.c
--- inn-2.4.2/tests/overview/tradindexed-t.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/overview/tradindexed-t.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: tradindexed-t.c,v 1.9.2.1 2003/07/12 19:07:56 rra Exp $ */
+/* $Id: tradindexed-t.c 6388 2003-07-12 19:07:56Z rra $ */
 /* tradindexed test suite. */
 
 #include "config.h"
diff -ruNp inn-2.4.2/tests/runtests.c inn-2.4.3/tests/runtests.c
--- inn-2.4.2/tests/runtests.c	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/runtests.c	Mon Mar 20 04:14:57 2006
@@ -1,4 +1,4 @@
-/* $Id: runtests.c,v 1.5 2002/04/09 07:23:50 rra Exp $
+/* $Id: runtests.c 5399 2002-04-09 07:23:50Z rra $
 
    Run a set of tests, reporting results.
 
diff -ruNp inn-2.4.2/tests/util/convdate.t inn-2.4.3/tests/util/convdate.t
--- inn-2.4.2/tests/util/convdate.t	Wed Dec 22 04:21:19 2004
+++ inn-2.4.3/tests/util/convdate.t	Mon Mar 20 04:14:57 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: convdate.t,v 1.1 2002/09/09 00:48:21 rra Exp $
+# $Id: convdate.t 5754 2002-09-09 00:48:21Z rra $
 #
 # Test suite for convdate.