INN commit: trunk (3 files)

[INN Commit]

    Date: Saturday, January 16, 2010 @ 07:39:15
  Author: iulius
Revision: 8884

Fixed a bug in the parsing of the ovgrouppat: wildmat in inn.conf
that prevented overview data from being generated when poisoned groups
were specified but a latter sub-pattern made the group wanted.

Thanks to D. Stussy for the bug report.

Also improve the documentation of the ovgrouppat: parameter.

Modified:
  trunk/doc/pod/inn.conf.pod
  trunk/doc/pod/news.pod
  trunk/storage/expire.c

----------------------+
 doc/pod/inn.conf.pod |    4 ++++
 doc/pod/news.pod     |    7 +++++++
 storage/expire.c     |    4 +---
 3 files changed, 12 insertions(+), 3 deletions(-)

Modified: doc/pod/inn.conf.pod
===================================================================
--- doc/pod/inn.conf.pod	2010-01-16 15:26:50 UTC (rev 8883)
+++ doc/pod/inn.conf.pod	2010-01-16 15:39:15 UTC (rev 8884)
@@ -551,6 +551,10 @@
 self-expire functionality, storing overview data will fail.
 The default is unset.
 
+Note that the use of C<!> in this wildmat expression has the same meaning as
+C<@>, that is to say it is a poisoned match and the overview data will not
+be generated if one of the newsgroups an article is posted to is unwanted.
+
 =item I<ovmethod>
 
 Which overview storage method to use.  Currently supported values are

Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod	2010-01-16 15:26:50 UTC (rev 8883)
+++ doc/pod/news.pod	2010-01-16 15:39:15 UTC (rev 8884)
@@ -230,6 +230,13 @@
 
 =item *
 
+Fixed a bug in the parsing of the I<ovgrouppat> wildmat in F<inn.conf>
+that prevented overview data from being generated when poisoned groups
+were specified but a latter sub-pattern made the group wanted.  Thanks
+to S<D. Stussy> for the bug report.
+
+=item *
+
 Fixed a bug when HDR, XHDR and XPAT were used when I<virtualhost> was set
 to true in F<readers.conf>.  The Xref: header of articles posted to only
 one newsgroup appeared empty.

Modified: storage/expire.c
===================================================================
--- storage/expire.c	2010-01-16 15:26:50 UTC (rev 8883)
+++ storage/expire.c	2010-01-16 15:39:15 UTC (rev 8884)
@@ -824,11 +824,9 @@
     for (i = 0; i < OVnumpatterns; i++) {
         switch (OVpatterns[i][0]) {
         case '!':
-            if (!wanted && uwildmat(group, &OVpatterns[i][1]))
-                break;
         case '@':
             if (uwildmat(group, &OVpatterns[i][1])) {
-                return false;
+                wanted = false;
             }
             break;
         default: