Send inn-committers mailing list submissions to
inn-committers@lists.isc.org
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.isc.org/mailman/listinfo/inn-committers
or, via email, send a message with subject or body 'help' to
inn-committers-requ...@lists.isc.org
You can reach the person managing the list at
inn-committers-ow...@lists.isc.org
When replying, please edit your Subject line so it is more specific
than "Re: Contents of inn-committers digest..."
Today's Topics:
1. INN commit: trunk/doc/pod (news.daily.pod) (INN Commit)
2. INN commit: trunk/samples (innwatch.ctl) (INN Commit)
3. INN commit: trunk (innd/nc.c nnrpd/nnrpd.c) (INN Commit)
4. INN commit: trunk (4 files) (INN Commit)
5. INN commit: trunk/innfeed (connection.c) (INN Commit)
6. INN commit: trunk (3 files) (INN Commit)
7. INN commit: branches/2.5/doc/pod (news.daily.pod) (INN Commit)
8. INN commit: branches/2.5/samples (innwatch.ctl) (INN Commit)
9. INN commit: branches/2.5 (4 files) (INN Commit)
----------------------------------------------------------------------
Message: 1
Date: Wed, 14 May 2014 10:22:01 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/doc/pod (news.daily.pod)
Message-ID: <20140514172201.dfe1e67...@hope.eyrie.org>
Date: Wednesday, May 14, 2014 @ 10:22:01
Author: iulius
Revision: 9628
Mention in news.daily documentation that lowmark requires expireover
Thanks to John F. Morse for the report.
Modified:
trunk/doc/pod/news.daily.pod
----------------+
news.daily.pod | 4 ++++
1 file changed, 4 insertions(+)
Modified: news.daily.pod
===================================================================
--- news.daily.pod 2014-04-13 10:54:36 UTC (rev 9627)
+++ news.daily.pod 2014-05-14 17:22:01 UTC (rev 9628)
@@ -140,6 +140,10 @@
keyword is used, the B<norenumber> keyword is not needed since B<news.daily>
specifies
it implicitly.
+If the B<lowmark> keyword is given to B<news.daily>, then the
+B<expireover> keyword must also be given; otherwise, that kind of
+renumbering will not be taken into account.
+
=item B<mailto>=I<address>
By default, B<news.daily> mails the report to the newsmaster address specified
------------------------------
Message: 2
Date: Wed, 14 May 2014 10:23:39 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/samples (innwatch.ctl)
Message-ID: <20140514172339.8efdc67...@hope.eyrie.org>
Date: Wednesday, May 14, 2014 @ 10:23:39
Author: iulius
Revision: 9629
Prevent innwatch from throttling innd when no overview directory exists
Thanks to John F. Morse for the report.
Modified:
trunk/samples/innwatch.ctl
--------------+
innwatch.ctl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: innwatch.ctl
===================================================================
--- innwatch.ctl 2014-05-14 17:22:01 UTC (rev 9628)
+++ innwatch.ctl 2014-05-14 17:23:39 UTC (rev 9629)
@@ -40,4 +40,4 @@
!!! ${INNDF} ${BATCH} ! lt ! ${INNWATCHBATCHSPACE} ! throttle ! No space
(newsq)
!!! ${INNDF} ${PATHDB} ! lt ! ${INNWATCHLIBSPACE} ! throttle ! No space
(newslib)
!!! ${INNDF} -i . ! lt ! ${INNWATCHSPOOLNODES} ! throttle ! No space (spool
inodes)
-!!! ${INNDF} ${OVERVIEWDIR} ! lt ! ${INNWATCHSPOOLSPACE} ! throttle ! No space
(overview)
+!!! test -d ${OVERVIEWDIR} && ${INNDF} ${OVERVIEWDIR} ! lt !
${INNWATCHSPOOLSPACE} ! throttle ! No space (overview)
------------------------------
Message: 3
Date: Wed, 14 May 2014 10:39:56 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (innd/nc.c nnrpd/nnrpd.c)
Message-ID: <20140514173956.8123c67...@hope.eyrie.org>
Date: Wednesday, May 14, 2014 @ 10:39:56
Author: iulius
Revision: 9630
Recognize the no-op XYZZY keyword
Yep, nothing new happens with that patch.
Modified:
trunk/innd/nc.c
trunk/nnrpd/nnrpd.c
---------------+
innd/nc.c | 7 ++++++-
nnrpd/nnrpd.c | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
Modified: innd/nc.c
===================================================================
--- innd/nc.c 2014-05-14 17:23:39 UTC (rev 9629)
+++ innd/nc.c 2014-05-14 17:39:56 UTC (rev 9630)
@@ -1267,7 +1267,12 @@
NCwritereply(cp, buff);
break;
}
- snprintf(buff, sizeof(buff), "%d What?", NNTP_ERR_COMMAND);
+ if (strcasecmp(cp->av[0], "XYZZY") == 0) {
+ /* Acknowledge the magic word from the Colossal Cave Adventure
computer game. */
+ snprintf(buff, sizeof(buff), "%d Nothing happens",
NNTP_ERR_COMMAND);
+ } else {
+ snprintf(buff, sizeof(buff), "%d What?", NNTP_ERR_COMMAND);
+ }
NCwritereply(cp, buff);
cp->Start = cp->Next;
Modified: nnrpd/nnrpd.c
===================================================================
--- nnrpd/nnrpd.c 2014-05-14 17:23:39 UTC (rev 9629)
+++ nnrpd/nnrpd.c 2014-05-14 17:39:56 UTC (rev 9630)
@@ -1410,7 +1410,12 @@
syslog(L_NOTICE, "%s unrecognized %.40s...", Client.host, buff);
else
syslog(L_NOTICE, "%s unrecognized %s", Client.host, buff);
- Reply("%d What?\r\n", NNTP_ERR_COMMAND);
+ if (strcasecmp(av[0], "XYZZY") == 0) {
+ /* Acknowledge the magic word from the Colossal Cave Adventure
computer game. */
+ Reply("%d Nothing happens\r\n", NNTP_ERR_COMMAND);
+ } else {
+ Reply("%d What?\r\n", NNTP_ERR_COMMAND);
+ }
continue;
}
------------------------------
Message: 4
Date: Wed, 14 May 2014 10:52:15 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (4 files)
Message-ID: <20140514175215.37a8167...@hope.eyrie.org>
Date: Wednesday, May 14, 2014 @ 10:52:14
Author: iulius
Revision: 9631
Document already existing res blocks functionality in readers.conf
* Document res blocks, their log: and program: keywords, and the include
directive in readers.conf man page.
* Recognize res blocks and their keywords in inncheck.
* Do not consider as errors in daily reports the lines logged in
news.notice by the log: keyword in readers.conf.
* Also teach other known lines to innreport (especially the use of
"ctlinnd xexec" and normal rejection of nnrpd connections during
news.daily operations).
* Typo in readers.conf man page (access instead of auth).
Modified:
trunk/doc/pod/news.pod
trunk/doc/pod/readers.conf.pod
trunk/scripts/inncheck.in
trunk/scripts/innreport_inn.pm
--------------------------+
doc/pod/news.pod | 10 +++++++++-
doc/pod/readers.conf.pod | 40 +++++++++++++++++++++++++++++++++++++++-
scripts/inncheck.in | 10 ++++++++--
scripts/innreport_inn.pm | 8 ++++++++
4 files changed, 64 insertions(+), 4 deletions(-)
Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod 2014-05-14 17:39:56 UTC (rev 9630)
+++ doc/pod/news.pod 2014-05-14 17:52:14 UTC (rev 9631)
@@ -182,6 +182,12 @@
=item *
+A test has been improved in F<innwatch.ctl> so that B<innwatch> no
+longer throttles B<innd> when no overview directory exists. You should
+manually update your F<innwatch.ctl> file to get this improvement.
+
+=item *
+
Fixed a long-standing limitation on how B<controlchan> and B<pgpverify>
were checking the signer of control messages. They now properly handle
the case of several UIDs being defined on a single PGP key, as well
@@ -293,7 +299,9 @@
=item *
-Other minor bug fixes and documentation improvements.
+Other minor bug fixes and documentation improvements (like the addition
+in the F<readers.conf> man page of the log: and program: parameters in
+res blocks, and the include directive).
=back
Modified: doc/pod/readers.conf.pod
===================================================================
--- doc/pod/readers.conf.pod 2014-05-14 17:39:56 UTC (rev 9630)
+++ doc/pod/readers.conf.pod 2014-05-14 17:52:14 UTC (rev 9631)
@@ -185,13 +185,21 @@
full e-mail address (including a domain), so you may want to set up your
system that way.
+Configuration files can be included in other configuration files via
+the syntax:
+
+ include <filename>
+
+The file named <filename> is then included. This syntax is allowed
+only at top-level.
+
Below is the full list of allowable parameters for auth groups and access
groups, and after that are some examples that may make this somewhat
clearer.
=head1 AUTH GROUP PARAMETERS
-An access group without at least one of the res:, auth:, perl_auth:,
+An auth group without at least one of the res:, auth:, perl_auth:,
python_auth:, or default: parameters makes no sense (and in practice will
just be ignored).
@@ -239,6 +247,36 @@
in the order they're listed. The results of the first successful one
will be used.
+Alternatively, a res block can be used instead of a res: paramater.
+The recognized parameters in such res blocks are:
+
+=over 3
+
+=item B<log:>
+
+A string to log in I<pathlog>/news.notice (with C<res also-log:>
+prepended) before the resolver is tried. One res group can have multiple
+log: parameters, and they will be logged in the order they're listed.
+
+=item B<program:>
+
+This parameter is mandatory in a res block. Its meaning is the same
+as the res: parameter used directly in an auth block.
+
+ auth <auth-name> {
+ res: <res-program>
+ }
+
+is therefore equivalent to:
+
+ auth <auth-name> {
+ res <res-name> {
+ program: <res-program>
+ }
+ }
+
+=back
+
=item B<auth:>
A simple command line for a user authenticator (shell metacharacters are
Modified: scripts/inncheck.in
===================================================================
--- scripts/inncheck.in 2014-05-14 17:39:56 UTC (rev 9630)
+++ scripts/inncheck.in 2014-05-14 17:52:14 UTC (rev 9631)
@@ -214,8 +214,9 @@
$parse_error = 0;
eprint "$file:$line: cannot nest $word in $group->{'type'}!\n"
- unless ($group->{'type'} eq 'group'
- || $group->{'type'} eq '<global scope>');
+ unless (($group->{'type'} eq 'group'
+ or $group->{'type'} eq '<global scope>')
+ or ($word eq 'res' and $group->{'type'} eq 'auth'));
push @groups, $group;
$group = { 'type' => $word, 'line' => $line };
@@ -975,11 +976,16 @@
'spoolfirst' => 'boolean',
'strippostcc' => 'boolean',
},
+ 'res' => {
+ 'log' => 'string',
+ 'program' => 'string',
+ },
'<multi>' => { # hack: "don't warn about duplicates for these
keys"
'res' => 1,
'auth' => 1,
'perl_auth' => 1,
'python_auth' => 1,
+ 'log' => 1,
},
'<include>' => { 'include' => 'ignore' },
}
Modified: scripts/innreport_inn.pm
===================================================================
--- scripts/innreport_inn.pm 2014-05-14 17:39:56 UTC (rev 9630)
+++ scripts/innreport_inn.pm 2014-05-14 17:52:14 UTC (rev 9631)
@@ -781,6 +781,8 @@
$innd_control{"shutdown"}++;
return 1;
}
+ # re-executed
+ return 1 if $left =~ m/^SERVER execv /o;
# SERVER servermode paused
return 1 if ($left =~ /(\S+) servermode paused$/o);
# SERVER servermode running
@@ -1499,6 +1501,12 @@
return 1 if $left =~ /^python: dynamic access module successfully hooked
into nnrpd$/o;
return 1 if $left =~ /^python: dynamic authorization access for read
access granted$/o;
return 1 if $left =~ /^python: dynamic authorization access type is not
known: /o;
+ # during scanlogs
+ return 1 if $left =~ /^\S+ rejected Flushing log and syslog files$/o;
+ return 1 if $left =~ /^\S+ rejected Snapshot log and syslog files$/o;
+ # 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;
# connect
if ($left =~ /(\S+) (\([0-9a-fA-F:.]*\) )?connect(?: - port \d+)?$/o) {
my $cust = $1;
------------------------------
Message: 5
Date: Wed, 14 May 2014 10:53:38 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/innfeed (connection.c)
Message-ID: <20140514175338.bd6f967...@hope.eyrie.org>
Date: Wednesday, May 14, 2014 @ 10:53:38
Author: iulius
Revision: 9632
Typo and useless new line logged in innfeed.debug
Modified:
trunk/innfeed/connection.c
--------------+
connection.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: connection.c
===================================================================
--- connection.c 2014-05-14 17:52:14 UTC (rev 9631)
+++ connection.c 2014-05-14 17:53:38 UTC (rev 9632)
@@ -1528,8 +1528,8 @@
p = bufferBase (modeBuffer) ;
/* now issue the MODE STREAM command */
- d_printf (1,"%s:%d Issuing the streaming command: %s\n",
- hostPeerName (cxn->myHost),cxn->ident,MODE_CMD) ;
+ d_printf (1, "%s:%d Issuing the streaming command\n",
+ hostPeerName (cxn->myHost), cxn->ident) ;
strlcpy (p, MODE_CMD, bufferSize (modeBuffer)) ;
@@ -2689,7 +2689,7 @@
issueQUIT (cxn) ;
}
else
- d_printf (2,"%s:%d no writes were needed....\n",
+ d_printf (2,"%s:%d no writes were needed...\n",
hostPeerName (cxn->myHost), cxn->ident) ;
}
------------------------------
Message: 6
Date: Wed, 14 May 2014 10:55:01 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk (3 files)
Message-ID: <20140514175501.921cc67...@hope.eyrie.org>
Date: Wednesday, May 14, 2014 @ 10:55:01
Author: iulius
Revision: 9633
Fix a few nits
Modified:
trunk/doc/pod/hacking.pod
trunk/innd/art.c
trunk/scripts/news.daily.in
-----------------------+
doc/pod/hacking.pod | 2 +-
innd/art.c | 2 +-
scripts/news.daily.in | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Modified: doc/pod/hacking.pod
===================================================================
--- doc/pod/hacking.pod 2014-05-14 17:53:38 UTC (rev 9632)
+++ doc/pod/hacking.pod 2014-05-14 17:55:01 UTC (rev 9633)
@@ -675,7 +675,7 @@
are available at L<http://www.eyrie.org/~eagle/software/rra-c-util/>
and can be easily synchronized with the script F<support/getrra-c-util>;
just run it, have a look at the resulting changes in INN source code and,
-if all looks right, commit these changes.
+if everything seems all right, commit these changes.
=item *
Modified: innd/art.c
===================================================================
--- innd/art.c 2014-05-14 17:53:38 UTC (rev 9632)
+++ innd/art.c 2014-05-14 17:55:01 UTC (rev 9633)
@@ -876,7 +876,7 @@
data->Body = i + 2;
cp->State = CSgetbody;
ARTparsebody(cp);
- return;
+ return;
}
} else {
data->CRwithoutLF++;
Modified: scripts/news.daily.in
===================================================================
--- scripts/news.daily.in 2014-05-14 17:53:38 UTC (rev 9632)
+++ scripts/news.daily.in 2014-05-14 17:55:01 UTC (rev 9633)
@@ -532,9 +532,9 @@
## Display expire log messages.
if ${DOMAIL} ; then
if [ -s ${EXPLOG} ] ; then
- echo Expire messages:
+ echo 'Expire messages:'
cat ${EXPLOG}
- echo ---------
+ echo '---------'
echo ''
fi
fi
------------------------------
Message: 7
Date: Wed, 14 May 2014 11:05:41 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5/doc/pod (news.daily.pod)
Message-ID: <20140514180541.9eb4867...@hope.eyrie.org>
Date: Wednesday, May 14, 2014 @ 11:05:41
Author: iulius
Revision: 9634
Mention in news.daily documentation that lowmark requires expireover
Thanks to John F. Morse for the report.
Modified:
branches/2.5/doc/pod/news.daily.pod
----------------+
news.daily.pod | 4 ++++
1 file changed, 4 insertions(+)
Modified: news.daily.pod
===================================================================
--- news.daily.pod 2014-05-14 17:55:01 UTC (rev 9633)
+++ news.daily.pod 2014-05-14 18:05:41 UTC (rev 9634)
@@ -140,6 +140,10 @@
keyword is used, the B<norenumber> keyword is not needed since B<news.daily>
specifies
it implicitly.
+If the B<lowmark> keyword is given to B<news.daily>, then the
+B<expireover> keyword must also be given; otherwise, that kind of
+renumbering will not be taken into account.
+
=item B<mailto>=I<address>
By default, B<news.daily> mails the report to the newsmaster address specified
------------------------------
Message: 8
Date: Wed, 14 May 2014 11:06:11 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5/samples (innwatch.ctl)
Message-ID: <20140514180611.ea80167...@hope.eyrie.org>
Date: Wednesday, May 14, 2014 @ 11:06:11
Author: iulius
Revision: 9635
Prevent innwatch from throttling innd when no overview directory exists
Thanks to John F. Morse for the report.
Modified:
branches/2.5/samples/innwatch.ctl
--------------+
innwatch.ctl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: innwatch.ctl
===================================================================
--- innwatch.ctl 2014-05-14 18:05:41 UTC (rev 9634)
+++ innwatch.ctl 2014-05-14 18:06:11 UTC (rev 9635)
@@ -40,4 +40,4 @@
!!! ${INNDF} ${BATCH} ! lt ! ${INNWATCHBATCHSPACE} ! throttle ! No space
(newsq)
!!! ${INNDF} ${PATHDB} ! lt ! ${INNWATCHLIBSPACE} ! throttle ! No space
(newslib)
!!! ${INNDF} -i . ! lt ! ${INNWATCHSPOOLNODES} ! throttle ! No space (spool
inodes)
-!!! ${INNDF} ${OVERVIEWDIR} ! lt ! ${INNWATCHSPOOLSPACE} ! throttle ! No space
(overview)
+!!! test -d ${OVERVIEWDIR} && ${INNDF} ${OVERVIEWDIR} ! lt !
${INNWATCHSPOOLSPACE} ! throttle ! No space (overview)
------------------------------
Message: 9
Date: Wed, 14 May 2014 11:06:53 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: branches/2.5 (4 files)
Message-ID: <20140514180653.418a467...@hope.eyrie.org>
Date: Wednesday, May 14, 2014 @ 11:06:52
Author: iulius
Revision: 9636
Document already existing res blocks functionality in readers.conf
* Document res blocks, their log: and program: keywords, and the include
directive in readers.conf man page.
* Recognize res blocks and their keywords in inncheck.
* Do not consider as errors in daily reports the lines logged in
news.notice by the log: keyword in readers.conf.
* Also teach other known lines to innreport (especially the use of
"ctlinnd xexec" and normal rejection of nnrpd connections during
news.daily operations).
* Typo in readers.conf man page (access instead of auth).
Modified:
branches/2.5/doc/pod/news.pod
branches/2.5/doc/pod/readers.conf.pod
branches/2.5/scripts/inncheck.in
branches/2.5/scripts/innreport_inn.pm
--------------------------+
doc/pod/news.pod | 10 +++++++++-
doc/pod/readers.conf.pod | 40 +++++++++++++++++++++++++++++++++++++++-
scripts/inncheck.in | 10 ++++++++--
scripts/innreport_inn.pm | 8 ++++++++
4 files changed, 64 insertions(+), 4 deletions(-)
Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod 2014-05-14 18:06:11 UTC (rev 9635)
+++ doc/pod/news.pod 2014-05-14 18:06:52 UTC (rev 9636)
@@ -10,6 +10,12 @@
=item *
+A test has been improved in F<innwatch.ctl> so that B<innwatch> no
+longer throttles B<innd> when no overview directory exists. You should
+manually update your F<innwatch.ctl> file to get this improvement.
+
+=item *
+
Fixed a long-standing limitation on how B<controlchan> and B<pgpverify>
were checking the signer of control messages. They now properly handle
the case of several UIDs being defined on a single PGP key, as well
@@ -121,7 +127,9 @@
=item *
-Other minor bug fixes and documentation improvements.
+Other minor bug fixes and documentation improvements (like the addition
+in the F<readers.conf> man page of the log: and program: parameters in
+res blocks, and the include directive).
=back
Modified: doc/pod/readers.conf.pod
===================================================================
--- doc/pod/readers.conf.pod 2014-05-14 18:06:11 UTC (rev 9635)
+++ doc/pod/readers.conf.pod 2014-05-14 18:06:52 UTC (rev 9636)
@@ -185,13 +185,21 @@
full e-mail address (including a domain), so you may want to set up your
system that way.
+Configuration files can be included in other configuration files via
+the syntax:
+
+ include <filename>
+
+The file named <filename> is then included. This syntax is allowed
+only at top-level.
+
Below is the full list of allowable parameters for auth groups and access
groups, and after that are some examples that may make this somewhat
clearer.
=head1 AUTH GROUP PARAMETERS
-An access group without at least one of the res:, auth:, perl_auth:,
+An auth group without at least one of the res:, auth:, perl_auth:,
python_auth:, or default: parameters makes no sense (and in practice will
just be ignored).
@@ -239,6 +247,36 @@
in the order they're listed. The results of the first successful one
will be used.
+Alternatively, a res block can be used instead of a res: paramater.
+The recognized parameters in such res blocks are:
+
+=over 3
+
+=item B<log:>
+
+A string to log in I<pathlog>/news.notice (with C<res also-log:>
+prepended) before the resolver is tried. One res group can have multiple
+log: parameters, and they will be logged in the order they're listed.
+
+=item B<program:>
+
+This parameter is mandatory in a res block. Its meaning is the same
+as the res: parameter used directly in an auth block.
+
+ auth <auth-name> {
+ res: <res-program>
+ }
+
+is therefore equivalent to:
+
+ auth <auth-name> {
+ res <res-name> {
+ program: <res-program>
+ }
+ }
+
+=back
+
=item B<auth:>
A simple command line for a user authenticator (shell metacharacters are
Modified: scripts/inncheck.in
===================================================================
--- scripts/inncheck.in 2014-05-14 18:06:11 UTC (rev 9635)
+++ scripts/inncheck.in 2014-05-14 18:06:52 UTC (rev 9636)
@@ -214,8 +214,9 @@
$parse_error = 0;
eprint "$file:$line: cannot nest $word in $group->{'type'}!\n"
- unless ($group->{'type'} eq 'group'
- || $group->{'type'} eq '<global scope>');
+ unless (($group->{'type'} eq 'group'
+ or $group->{'type'} eq '<global scope>')
+ or ($word eq 'res' and $group->{'type'} eq 'auth'));
push @groups, $group;
$group = { 'type' => $word, 'line' => $line };
@@ -975,11 +976,16 @@
'spoolfirst' => 'boolean',
'strippostcc' => 'boolean',
},
+ 'res' => {
+ 'log' => 'string',
+ 'program' => 'string',
+ },
'<multi>' => { # hack: "don't warn about duplicates for these
keys"
'res' => 1,
'auth' => 1,
'perl_auth' => 1,
'python_auth' => 1,
+ 'log' => 1,
},
'<include>' => { 'include' => 'ignore' },
}
Modified: scripts/innreport_inn.pm
===================================================================
--- scripts/innreport_inn.pm 2014-05-14 18:06:11 UTC (rev 9635)
+++ scripts/innreport_inn.pm 2014-05-14 18:06:52 UTC (rev 9636)
@@ -781,6 +781,8 @@
$innd_control{"shutdown"}++;
return 1;
}
+ # re-executed
+ return 1 if $left =~ m/^SERVER execv /o;
# SERVER servermode paused
return 1 if ($left =~ /(\S+) servermode paused$/o);
# SERVER servermode running
@@ -1499,6 +1501,12 @@
return 1 if $left =~ /^python: dynamic access module successfully hooked
into nnrpd$/o;
return 1 if $left =~ /^python: dynamic authorization access for read
access granted$/o;
return 1 if $left =~ /^python: dynamic authorization access type is not
known: /o;
+ # during scanlogs
+ return 1 if $left =~ /^\S+ rejected Flushing log and syslog files$/o;
+ return 1 if $left =~ /^\S+ rejected Snapshot log and syslog files$/o;
+ # 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;
# connect
if ($left =~ /(\S+) (\([0-9a-fA-F:.]*\) )?connect(?: - port \d+)?$/o) {
my $cust = $1;
------------------------------
_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers
End of inn-committers Digest, Vol 63, Issue 1
*********************************************
