INN commit: branches/2.5 (doc/pod/news.pod innd/art.c)

[INN Commit]

    Date: Sunday, January 17, 2010 @ 05:09:42
  Author: iulius
Revision: 8896

Fixed a bug to control-only feeds:  junked non-control articles were being
fed down control-only feeds.  Thanks to Andrew Gierth for the patch.

Modified:
  branches/2.5/doc/pod/news.pod
  branches/2.5/innd/art.c

------------------+
 doc/pod/news.pod |    5 +++++
 innd/art.c       |   18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod	2010-01-17 13:08:06 UTC (rev 8895)
+++ doc/pod/news.pod	2010-01-17 13:09:42 UTC (rev 8896)
@@ -154,6 +154,11 @@
 
 =item *
 
+Fixed a bug to control-only feeds:  junked non-control articles were being
+fed down control-only feeds.  Thanks to Andrew Gierth for the patch.
+
+=item *
+
 Fixed a bug in B<innreport> which was not correctly summing B<innd>
 stats when I<hostname> was set as an IPv6 address instead of a fully
 qualified domain name.  Thanks to Petr Novopashenniy for the bug report.

Modified: innd/art.c
===================================================================
--- innd/art.c	2010-01-17 13:08:06 UTC (rev 8895)
+++ innd/art.c	2010-01-17 13:09:42 UTC (rev 8896)
@@ -2311,13 +2311,6 @@
     ngp->PostCount = 0;
   }
 
-  /* Loop over sites to find Poisons/ControlOnly and undo Sendit flags. */
-  for (i = nSites, sp = Sites; --i >= 0; sp++) {
-    if (sp->Poison || (sp->ControlOnly && !IsControl)
-      || (sp->DontWantNonExist && NonExist))
-      sp->Sendit = false;		
-  }
-
   /* Control messages not filed in "to" get filed only in control.name
    * or control. */
   if (IsControl && Accepted && !ToGroup) {
@@ -2401,16 +2394,23 @@
   }
   *ngptr = NULL;
 
+  /* Loop over sites to find Poisons/ControlOnly and undo Sendit flags. */
+  for (i = nSites, sp = Sites; --i >= 0; sp++) {
+    if (sp->Poison || (sp->ControlOnly && !IsControl)
+        || (sp->DontWantNonExist && NonExist))
+      sp->Sendit = false;
+  }
+
   if (innconf->xrefslave) {
     if (ARTxrefslave(data) == false) {
       if (HDR_FOUND(HDR__XREF)) {
 	snprintf(cp->Error, sizeof(cp->Error),
-                 "%d Xref header \"%s\" invalid in xrefslave mode",
+                 "%d Xref: header \"%s\" invalid in xrefslave mode",
                  ihave ? NNTP_FAIL_IHAVE_REJECT : NNTP_FAIL_TAKETHIS_REJECT,
                  MaxLength(HDR(HDR__XREF), HDR(HDR__XREF)));
       } else {
 	snprintf(cp->Error, sizeof(cp->Error),
-                 "%d Xref header required in xrefslave mode",
+                 "%d Xref: header required in xrefslave mode",
                  ihave ? NNTP_FAIL_IHAVE_REJECT : NNTP_FAIL_TAKETHIS_REJECT);
       }
       ARTlog(data, ART_REJECT, cp->Error);