INN commit: trunk (nnrpd/perm.c scripts/innreport_inn.pm)

[INN Commit]

    Date: Sunday, January 25, 2015 @ 13:14:48
  Author: iulius
Revision: 9791

innreport:  add a new recognized entry

When using the reject_with: keyword in an access block of readers.conf,
a log is generated in news.notice for readers matching the corresponding
access block.

This log was reported as an unknown line in daily Usenet reports.  It is
now filtered, and also considered as a notice level instead of an error.

Modified:
  trunk/nnrpd/perm.c
  trunk/scripts/innreport_inn.pm

--------------------------+
 nnrpd/perm.c             |    2 +-
 scripts/innreport_inn.pm |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Modified: nnrpd/perm.c
===================================================================
--- nnrpd/perm.c	2015-01-21 18:49:11 UTC (rev 9790)
+++ nnrpd/perm.c	2015-01-25 21:14:48 UTC (rev 9791)
@@ -1711,7 +1711,7 @@
     if (i >= 0) {
 	/* Found the right access group. */
 	if (access_realms[i]->rejectwith) {
-	    syslog(L_ERROR, "%s rejected by rule (%s)",
+	    syslog(L_NOTICE, "%s rejected by rule (%s)",
 		Client.host, access_realms[i]->rejectwith);
 	    Reply("%d Permission denied:  %s\r\n",
 		NNTP_FAIL_TERMINATING, access_realms[i]->rejectwith);

Modified: scripts/innreport_inn.pm
===================================================================
--- scripts/innreport_inn.pm	2015-01-21 18:49:11 UTC (rev 9790)
+++ scripts/innreport_inn.pm	2015-01-25 21:14:48 UTC (rev 9791)
@@ -1507,6 +1507,7 @@
     # other logs that should not be reported as errors
     return 1 if $left =~ /^\S+ auth also-log: /o;
     return 1 if $left =~ /^\S+ res also-log: /o;
+    return 1 if $left =~ /^\S+ rejected by rule /o;
     # connect
     if ($left =~ /(\S+) (\([0-9a-fA-F:.]*\) )?connect(?: - port \d+)?$/o) {
       my $cust = $1;