INN commit: trunk (3 files)

[INN Commit]

    Date: Friday, May 1, 2009 @ 01:59:23
  Author: iulius
Revision: 8435

Clarify how the newsfeeds "ME" entry works against local distributions
and local postings via nnrpd.

Thanks to D. Stussy for having pointed out that potential problem.

Modified:
  trunk/doc/pod/distrib.pats.pod
  trunk/samples/distrib.pats
  trunk/samples/newsfeeds.in

--------------------------+
 doc/pod/distrib.pats.pod |    5 +++--
 samples/distrib.pats     |   26 +++++++++++++++++---------
 samples/newsfeeds.in     |    7 ++++---
 3 files changed, 24 insertions(+), 14 deletions(-)

Modified: doc/pod/distrib.pats.pod
===================================================================
--- doc/pod/distrib.pats.pod	2009-04-28 17:05:34 UTC (rev 8434)
+++ doc/pod/distrib.pats.pod	2009-05-01 08:59:23 UTC (rev 8435)
@@ -30,7 +30,8 @@
 checked against this file in turn, and the matching line with the highest
 weight will be used as the value of the Distribution: header.  If no lines
 match, or if the matching line has an empty string for its third field, no
-header will be added.
+header will be added.  In case a distribution is added by B<nnrpd>, make
+sure it is not rejected by the F<newsfeeds> C<ME> entry.
 
 A list of recommended distributions can be specified in distributions(5).
 
@@ -43,6 +44,6 @@
 
 =head1 SEE ALSO
 
-distributions(5), inn.conf(5), nnrpd(8), uwildmat(3).
+distributions(5), inn.conf(5), newsfeeds(5), nnrpd(8), uwildmat(3).
 
 =cut

Modified: samples/distrib.pats
===================================================================
--- samples/distrib.pats	2009-04-28 17:05:34 UTC (rev 8434)
+++ samples/distrib.pats	2009-05-01 08:59:23 UTC (rev 8435)
@@ -1,13 +1,21 @@
-##  $Revision$
-##  distrib.pats -- specify default Distribution header for newsgroups
+##  $Id$
+##
+##  Sample distrib.pats file.
+##
+##  It specifies the default Distribution: header for newsgroups.
+##
 ##  Format:
-##	<weight>:<pattern>:<value>
-##  All articles are matched against all patterns, value to be used is the
-##  one with the highest weight.
-##	<weight>	The weight assigned to this match, integer
-##	<pattern>	Newsgroup name or single wildmat(3) pattern
-##	<value>		Value of Distribution header.
+##      <weight>:<pattern>:<value>
 ##
+##  All articles are matched against all patterns.  The value to be used is
+##  the one with the highest weight.
+##      <weight>        The weight assigned to this match, integer.
+##      <pattern>       Newsgroup name or single wildmat(3) pattern.
+##      <value>         Value of Distribution: header.
 ##
-## Uncomment to default all local.* groups to a distribution of local.
+##  See the distrib.pats man page for more information.
+
+##  Uncomment to default all local.* groups to a distribution of local.
+##  If used, make sure the newsfeeds "ME" entry does not reject this
+##  distribution.
 #10:local.*:local

Modified: samples/newsfeeds.in
===================================================================
--- samples/newsfeeds.in	2009-04-28 17:05:34 UTC (rev 8434)
+++ samples/newsfeeds.in	2009-05-01 08:59:23 UTC (rev 8435)
@@ -36,10 +36,11 @@
 ##  will only accept articles without those distributions.
 ##
 ##  For the ME line (and the ME line *only*), patterns affect *outgoing*
-##  feeds and distributions affect *incoming* feeds.
+##  feeds and distributions affect *incoming* feeds (including local posts).
 
-# Empty default subscription list, reject all incoming articles with a
-# distribution of "local" or "collabra-internal," accept all others.
+# Empty default subscription list, reject all incoming articles (including
+# locally posted articles) with a distribution of "local" or
+# "collabra-internal", accept all others.
 ME:!*/!local,!collabra-internal::
 
 # The same as the above, but would reject all posts that have