INN commit: trunk/lib (perl.c)
INN Commit
Russ_Allbery at isc.org
Wed May 6 18:02:48 UTC 2009
Date: Wednesday, May 6, 2009 @ 11:02:47
Author: iulius
Revision: 8449
Log a message in news.notice if INN believes filter_innd.pl
and filter_nnrpd.pl have been mixed up.
Modified:
trunk/lib/perl.c
--------+
perl.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
Modified: perl.c
===================================================================
--- perl.c 2009-05-06 17:55:42 UTC (rev 8448)
+++ perl.c 2009-05-06 18:02:47 UTC (rev 8449)
@@ -170,10 +170,10 @@
dSP ;
char *argv[] = { NULL };
char *evalfile = NULL;
-
+
ENTER ;
SAVETMPS ;
-
+
if (perl_get_cv("filter_before_reload", false) != NULL) {
perl_call_argv("filter_before_reload", G_EVAL|G_DISCARD|G_NOARGS, argv);
if (SvTRUE(ERRSV)) /* check $@ */ {
@@ -211,7 +211,7 @@
} else if ((perl_filter_cv = perl_get_cv(function, false)) == NULL) {
PerlFilter (false) ;
}
-
+
if (perl_get_cv("filter_after_reload", false) != NULL) {
perl_call_argv("filter_after_reload", G_EVAL|G_DISCARD|G_NOARGS, argv);
if (SvTRUE(ERRSV)) /* check $@ */ {
@@ -222,6 +222,21 @@
}
}
+ /* We try to find an inversion between filter_innd.pl
+ * and filter_nnrpd.pl. */
+ if (function != NULL) {
+ if ((strncmp(function, "filter_art", 10) == 0)
+ && (perl_get_cv("filter_post", false) != NULL)) {
+ syslog(L_NOTICE, "filter_innd.pl defines a filter_post function"
+ " -- maybe a confusion with filter_nnrpd.pl?");
+ }
+ if ((strncmp(function, "filter_post", 11) == 0)
+ && (perl_get_cv("filter_art", false) != NULL)) {
+ syslog(L_NOTICE, "filter_nnrpd.pl defines a filter_art function"
+ " -- maybe a confusion with filter_innd.pl?");
+ }
+ }
+
FREETMPS ;
LEAVE ;
More information about the inn-committers
mailing list