INN commit: branches/2.5 (3 files)

INN Commit rra at isc.org
Sat Aug 6 20:43:45 UTC 2011


    Date: Saturday, August 6, 2011 @ 13:43:45
  Author: iulius
Revision: 9321

remove inncheck warning about an empty newsfeeds ME entry

INN works without problems when the newsfeeds ME entry is empty.  inncheck no
longer warns about an empty ME entry.

Thanks to Florian Schlichting for the patch.

Modified:
  branches/2.5/doc/pod/newsfeeds.pod
  branches/2.5/samples/newsfeeds.in
  branches/2.5/scripts/inncheck.in

-----------------------+
 doc/pod/newsfeeds.pod |    3 +++
 samples/newsfeeds.in  |    4 ++++
 scripts/inncheck.in   |    8 +++-----
 3 files changed, 10 insertions(+), 5 deletions(-)

Modified: doc/pod/newsfeeds.pod
===================================================================
--- doc/pod/newsfeeds.pod	2011-08-06 20:43:03 UTC (rev 9320)
+++ doc/pod/newsfeeds.pod	2011-08-06 20:43:45 UTC (rev 9321)
@@ -194,6 +194,9 @@
 A common use for this is to put something like C</!local> in the C<ME>
 entry to reject local postings from other misconfigured sites.
 
+An empty C<ME> entry is possible, in which case no exclusion patterns will
+be defined.
+
 Finally, it is also possible to set variables in F<newsfeeds> and use them
 later in the file.  A line starting with C<$> sets a variable.  For
 example:

Modified: samples/newsfeeds.in
===================================================================
--- samples/newsfeeds.in	2011-08-06 20:43:03 UTC (rev 9320)
+++ samples/newsfeeds.in	2011-08-06 20:43:45 UTC (rev 9321)
@@ -47,6 +47,10 @@
 # news.example.com in the path (posts passing through that site).
 #ME/news.example.com:!*/!local,!collabra-internal::
 
+# An empty ME entry is possible, in which case no exclusion patterns
+# will be defined.
+#ME:::
+
 # The special feed that handles all newsgroup control messages.  Only
 # disable this if you want to ignore all newsgroup control messages; INN
 # no longer handles any control messages except cancel internally.

Modified: scripts/inncheck.in
===================================================================
--- scripts/inncheck.in	2011-08-06 20:43:03 UTC (rev 9320)
+++ scripts/inncheck.in	2011-08-06 20:43:45 UTC (rev 9321)
@@ -694,7 +694,7 @@
 sub
 newsfeeds
 {
-    my ($next, $start, $me_empty, @muxes, %sites);
+    my ($next, $start, @muxes, %sites);
     my ($site, $pats, $dists, $flags, $param, $type, $k, $v, $defsub);
     my ($bang, $nobang, $prog, $dir);
     my (%variables, $key);
@@ -769,8 +769,6 @@
 		if $flags ne "";
 	    eprint "$file:$start: ME param should be empty\n"
 		if $param ne "";
-	    $me_empty = 1
-		if $pats !~ "/.+";
 	}
 
 	##  If we don't have !junk,!control, give a helpful warning.
@@ -846,8 +844,8 @@
 	eprint "$file:$_\n"
 	    if /`(.*)'/ && !defined $sites{$1};
     }
-    eprint "$file:0: warning you accept all incoming article distributions\n"
-	if !defined $sites{"ME"} || $me_empty;
+    eprint "$file:0: documentation says there must be exactly one ME entry\n"
+	if !defined $sites{"ME"};
 
     print "done.\n"
 	if $verbose > 0;




More information about the inn-committers mailing list